Update to TK to fix WM max size bug in KDE 3.2

6 files changed, 149 insertions, 3 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index eaa3ffc23304..ee8251b61686 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/tk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.38 2004/06/24 22:58:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.39 2004/08/07 06:59:08 cardoe Exp $
+
+*tk-8.4.6-r1 (07 Aug 2004)
+
+  07 Aug 2004; Doug Goldstein <cardoe@gentoo.org> tk-8.4.6-r1.ebuild
+  +files/tk-wm-maxsize.patch, +tk-8.4.6-r1.ebuild:
+  Fixed bug #56229. KDE 3.2 missing maximize button with tk apps.
+  http://bugs.kde.org/show_bug.cgi?id=67577
+  http://sourceforge.net/tracker/index.php?func=detail&aid=915350&group_id=12997
+  &atid=112997
 
   15 Jun 2004; Ferris McCormick <fmccor@gentoo.org> tk-8.4.6.ebuild:
   Marked stable for sparc.
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 93a261779fe4..780b86d97600 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,7 +1,11 @@
+MD5 a23f689fa279cbe8f9863284fc55c085 tk-8.4.6-r1.ebuild 2405
+MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
+MD5 c9d2feba431223d5d645c3fdd303d67e ChangeLog 5642
 MD5 c0b1f981d4f6585bafb4a21b5ba30df7 tk-8.3.4-r1.ebuild 2413
 MD5 2a8f59f5c53189b6b49b8aad9e03b2ec tk-8.4.6.ebuild 2388
-MD5 4a9d9c230e30325e583a6a7ffd8950c5 ChangeLog 5289
 MD5 0321d3bb5b70142a415de40ae2d5e3d4 files/digest-tk-8.3.4-r1 192
-MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6 64
+MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6-r1 64
+MD5 c1c1e9dfac0e70f21ef1a73e6dc76b8f files/tk-wm-maxsize.patch 896
 MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
+MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6 64
 MD5 e662e61449ea86b439ceb41463762cdc files/remove-control-v-8.4.diff 449
diff --git a/dev-lang/tk/files/digest-tk-8.4.6-r1 b/dev-lang/tk/files/digest-tk-8.4.6-r1
new file mode 100644
index 000000000000..e34b77208af1
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.6-r1
@@ -0,0 +1 @@
+MD5 24b7774d54c1c568cabe16f3498ddccd tk8.4.6-src.tar.gz 3230760
diff --git a/dev-lang/tk/files/tk-wm-maxsize.patch b/dev-lang/tk/files/tk-wm-maxsize.patch
new file mode 100644
index 000000000000..019f7b5a3136
--- /dev/null
+++ b/dev-lang/tk/files/tk-wm-maxsize.patch
@@ -0,0 +1,29 @@
+Date: Wed Mar 24 02:43:08 PM PST 2004
+Files: unix/tkUnixWm.c
+Bug-id: 915350
+
+--- unix/tkUnixWm.c.wm-maxsize.old	2004-01-31 12:27:52.000000000 -0800
++++ unix/tkUnixWm.c	2004-03-24 14:42:00.000000000 -0800
+@@ -2279,6 +2279,13 @@
+     wmPtr->maxWidth = width;
+     wmPtr->maxHeight = height;
+     wmPtr->flags |= WM_UPDATE_SIZE_HINTS;
++
++    if (width <= 0 && height <= 0) {
++	wmPtr->sizeHintsFlags &= ~PMaxSize;
++    } else {
++	wmPtr->sizeHintsFlags |= PMaxSize;
++    }
++
+     WmUpdateGeom(wmPtr, winPtr);
+     return TCL_OK;
+ }
+@@ -4269,7 +4276,7 @@
+     hintsPtr->max_aspect.x = wmPtr->maxAspect.x;
+     hintsPtr->max_aspect.y = wmPtr->maxAspect.y;
+     hintsPtr->win_gravity = wmPtr->gravity;
+-    hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize | PMaxSize;
++    hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize;
+ 
+     /*
+      * If the window isn't supposed to be resizable, then set the
diff --git a/dev-lang/tk/metadata.xml b/dev-lang/tk/metadata.xml
new file mode 100644
index 000000000000..173251e809e0
--- /dev/null
+++ b/dev-lang/tk/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tcltk</herd>
+</pkgmetadata>
+
diff --git a/dev-lang/tk/tk-8.4.6-r1.ebuild b/dev-lang/tk/tk-8.4.6-r1.ebuild
new file mode 100644
index 000000000000..addec4842518
--- /dev/null
+++ b/dev-lang/tk/tk-8.4.6-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.1 2004/08/07 06:59:08 cardoe Exp $
+
+inherit eutils
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="threads"
+
+DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-apps/portage-2.0.47-r10
+	virtual/x11
+	=dev-lang/tcl-${PV}*"
+
+S=${WORKDIR}/${PN}${PV}
+
+pkg_setup() {
+	if use threads
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		ewarn ""
+		sleep 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/library
+	epatch ${FILESDIR}/remove-control-v-8.4.diff || die
+
+	cd ${S}/unix
+	epatch ${FILESDIR}/tk-wm-maxsize.patch || die
+}
+
+src_compile() {
+	cd ${S}/unix
+
+	local local_config_use=""
+
+	if use threads
+	then
+		local_config_use="--enable-threads"
+	fi
+
+	econf \
+		--with-tcl=/usr/lib \
+		${local_config_use} || die
+
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+
+	cd ${S}/unix
+	make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	sed -i \
+		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
+		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/lib/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/lib," \
+		${D}/usr/lib/tkConfig.sh
+
+	# install private headers
+	dodir /usr/lib/tk${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tk${v1}/include/unix
+	dodir /usr/lib/tk${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tk${v1}/include/generic
+	rm -f ${D}/usr/lib/tk${v1}/include/generic/tk.h
+	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkDecls.h
+	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h
+
+	# install symlink for libraries
+	#dosym /usr/lib/libtk${v1}.a /usr/lib/libtk.a
+	dosym /usr/lib/libtk${v1}.so /usr/lib/libtk.so
+	dosym /usr/lib/libtkstub${v1}.a /usr/lib/libtkstub.a
+
+	ln -sf wish${v1} ${D}/usr/bin/wish
+
+	cd ${S}
+	dodoc README changes license.terms
+}