adding patch 8.4-lastevent, fixes bug #225999

Package-Manager: portage-2.1.4.4

5 files changed, 164 insertions, 5 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 6982152e0e58..c1c3239d6484 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.111 2008/10/26 11:21:33 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.112 2008/10/27 20:27:07 mescalinum Exp $
+
+*tk-8.4.18-r1 (27 Oct 2008)
+
+  27 Oct 2008; Federico Ferri <mescalinum@gentoo.org>
+  +files/tk-8.4-lastevent.patch, +tk-8.4.18-r1.ebuild, tk-8.4.19.ebuild:
+  adding patch 8.4-lastevent, fixes bug #225999
 
 *tk-8.4.19 (26 Oct 2008)
 
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 14880d98d6b9..6b2e81effd5e 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,4 +1,5 @@
 AUX remove-control-v-8.4.9.diff 522 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d SHA1 e45327e49545a8ef6132bec7303ef0b19a06e794 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba
+AUX tk-8.4-lastevent.patch 1095 RMD160 5e03fcb59320898429a3c1d438916eb0a65eeefc SHA1 433e2718f8eaa124ae87f53a276bb2208602fd6d SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d
 AUX tk-8.4.11-multilib.patch 896 RMD160 29152dde424c41555e132c1b279ccc7ab279e27f SHA1 7f6e6d808e2016b1283d45fa001482c7a76a66a7 SHA256 1f15653e3f68fdd6b32b985514d6b2bae7a3a6c717a326c85082394095376636
 AUX tk-8.4.15-tclm4-soname.patch 533 RMD160 78caf459d2d06e769e01de5009cb63d8e1c19a62 SHA1 4c4614dc2a7f99ccdf1c1b0cfccd15ec74269333 SHA256 7b885a3307007613e32d15bd2ec144590079e291c0ee5315ed3425f066e784cc
 AUX tk-8.4.9-man.patch 800 RMD160 8d06c54ab7ae0edf584248a8f6f14f46e08eec97 SHA1 32513bf413dcd8387594da50be97e353d36eab49 SHA256 5e356b8d34fc6687af03f1aa93e2a05619e0df0bbef65a8bc76e0a9a3da56dfa
@@ -11,9 +12,10 @@ DIST tk8.4.19-src.tar.gz 3362694 RMD160 c963297655740ad4b29a99c489c35a64e5e817ce
 DIST tk8.5.1-src.tar.gz 3759545 RMD160 5e1196db5415771e5a7bf38425cacd7cb0ee1cd8 SHA1 3280ca4572f19c5dd379380e9a02d382127f3378 SHA256 d25126147f5fa8423de35cefd07b37583cf9c281a396f49450de42251e095fe7
 DIST tk8.5.5-src.tar.gz 3774605 RMD160 4dd1a2693e216e56a9a039397e8ba11d5f33c5a3 SHA1 6fd70e43a7ce19038321542c153df2fb2f448feb SHA256 f6b7a52056996ce6c0d2ad7438d36e6d36c92e0ab9b326c4a8f14be5dbe50b1a
 EBUILD tk-8.4.15-r1.ebuild 3282 RMD160 046af5794309296edb2e132e8fe58a27bd4ceb31 SHA1 c5967f59102ecfec481e3073ae8ba2202e9f8a8a SHA256 0dd4adff78b47783129e1d57973eaf371f0cf8cc61b1ae737176b149e6ddab7e
+EBUILD tk-8.4.18-r1.ebuild 3312 RMD160 98e54175f7e28fbb603db010f00e06de35a2c0a6 SHA1 d97208b2825c19898f62dcda6cb3d8ea64d4cf8c SHA256 e4a14ab72d4ff14f0c253213ef6fdc572963f068a7822d7294e880c0885ddca5
 EBUILD tk-8.4.18.ebuild 3226 RMD160 b83bab1ab6ebc102aeab35a8ba8a144a3c4fb428 SHA1 8b172d6b6fe7e082903635700d29844179a1accb SHA256 1610f4aac4a9d61c823075b61fa96a722236fc3b33d6c64ede8f0e95483095e2
-EBUILD tk-8.4.19.ebuild 3237 RMD160 c88b26e1d6b6fc94c06d80054f610e3c29c071ad SHA1 d8605b5c6b2c323d78f157f5cd3dbd646419e3bb SHA256 bee78ebfe96eb599daad660b352c2df20782f8c893653318246b5a805dbb8c08
+EBUILD tk-8.4.19.ebuild 3308 RMD160 1d5004af3a83943444ce3abed8f33a2dd1f2fad9 SHA1 3afb5f5baa891935b297782b6aa9f2fbdcf6097d SHA256 12e7487e7b10d9ba75c811c64e9f9855aba951796b2ffe264b7ad03e302a9d3a
 EBUILD tk-8.5.1.ebuild 2832 RMD160 a336782e53eecbcf7a3deea85ca9337be3efc8b9 SHA1 5b66b8931006d5decbe2839f82c95f7d5867236d SHA256 3cc7d680ffe4539e7766b1afd72fc4c5de33512553e9b8af075251a70156a296
 EBUILD tk-8.5.5.ebuild 2836 RMD160 28ce3198fa11930f45c3eb61e26be8031f5fd101 SHA1 956b7d4e8d7d6bc3ebfc7eda7506daade9dd4ba3 SHA256 61f29882d457600d16a071dc6a653d13a9a8cb03a9c54e4a3cd1463cfe7d0c3b
-MISC ChangeLog 15403 RMD160 8770011cf5c54f773080a11b6e124dc34e2f6518 SHA1 064c64088f45dd8aa90a46d8f8d51b86c905b6fe SHA256 4f2fdcc25fefd12d002399c01c70484538e87bc77b8d4dbe0e6357d70dbe77e2
+MISC ChangeLog 15608 RMD160 24a3d18f806cbb8f7ba2ae2cc860e0e29e7833e5 SHA1 43b23c5a080e4f5f0cbd1b1023ceea5f76bc332a SHA256 7d09418046c3f2fa29a035f25f5123a28d1f09eb02e8890c5ca0199eae77dad1
 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
diff --git a/dev-lang/tk/files/tk-8.4-lastevent.patch b/dev-lang/tk/files/tk-8.4-lastevent.patch
new file mode 100644
index 000000000000..f93d335bf964
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4-lastevent.patch
@@ -0,0 +1,28 @@
+Source: Jeffrey Gardner (je_fro) <jeffrey.e.gardner@comcast.net> - http://overlays.gentoo.org/dev/je_fro/browser/dev-lang/tk/files/tk-8.4-lastevent.patch
+Upstream: N/A
+Reason: Fix ABI incompatibility introduced by x11-proto/xproto-7.0.13 (bug #225999)
+--- generic/tk.h.orig	2008-02-06 16:31:40.000000000 +0100
++++ generic/tk.h	2008-07-24 08:21:46.000000000 +0200
+@@ -635,17 +635,15 @@
+  *
+  *---------------------------------------------------------------------------
+  */
+-#define VirtualEvent	    (LASTEvent)
+-#define ActivateNotify	    (LASTEvent + 1)
+-#define DeactivateNotify    (LASTEvent + 2)
+-#define MouseWheelEvent     (LASTEvent + 3)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
++#define VirtualEvent	    (MappingNotify + 1)
++#define ActivateNotify	    (MappingNotify + 2)
++#define DeactivateNotify    (MappingNotify + 3)
++#define MouseWheelEvent     (MappingNotify + 4)
++#define TK_LASTEVENT	    (MappingNotify + 5)
+ 
+ #define MouseWheelMask	    (1L << 28)
+-
+ #define ActivateMask	    (1L << 29)
+ #define VirtualEventMask    (1L << 30)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
+ 
+ 
+ /*
diff --git a/dev-lang/tk/tk-8.4.18-r1.ebuild b/dev-lang/tk/tk-8.4.18-r1.ebuild
new file mode 100644
index 000000000000..ea40525dc2ac
--- /dev/null
+++ b/dev-lang/tk/tk-8.4.18-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.18-r1.ebuild,v 1.1 2008/10/27 20:27:07 mescalinum Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit autotools eutils multilib toolchain-funcs
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug threads"
+
+RDEPEND="x11-libs/libX11
+	~dev-lang/tcl-${PV}"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	>=x11-proto/xproto-7.0.13"
+
+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 ""
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/remove-control-v-8.4.9.diff
+	epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
+	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
+
+	# Bug 225999
+	epatch "${FILESDIR}"/${PN}-8.4-lastevent.patch
+
+	local d
+	for d in */configure ; do
+		cd "${S}"/${d%%/*}
+		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
+		epatch "${FILESDIR}"/tk-configure-LANG.patch
+	done
+
+	cd "${S}"/unix
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC
+	cd "${S}"/unix
+
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+
+	econf \
+		--with-tcl=/usr/${mylibdir} \
+		$(use_enable threads) \
+		$(use_enable debug symbols) || die
+
+	emake || die
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+
+	cd "${S}"/unix
+	make DESTDIR="${D}" install || die
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
+		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
+		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
+		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
+		"${D}"/usr/${mylibdir}/tkConfig.sh || die
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/unix/*.h || die
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${S}"/generic/*.h || die
+	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
+	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
+	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
+
+	# install symlink for libraries
+	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
+	if use debug ; then
+		dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
+		dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
+		dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
+	fi
+	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	dosym wish${v1} /usr/bin/wish
+
+	cd "${S}"
+	dodoc ChangeLog README changes license.terms
+}
diff --git a/dev-lang/tk/tk-8.4.19.ebuild b/dev-lang/tk/tk-8.4.19.ebuild
index d6f01c46f8b7..3f199a194dd5 100644
--- a/dev-lang/tk/tk-8.4.19.ebuild
+++ b/dev-lang/tk/tk-8.4.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.19.ebuild,v 1.1 2008/10/26 11:21:33 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.19.ebuild,v 1.2 2008/10/27 20:27:07 mescalinum Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
 	~dev-lang/tcl-${PV}"
 DEPEND="${RDEPEND}
 	x11-libs/libXt
-	x11-proto/xproto"
+	>=x11-proto/xproto-7.0.3"
 
 S=${WORKDIR}/${PN}${PV}
 
@@ -47,6 +47,9 @@ src_unpack() {
 	# Bug 125971
 	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
 
+	# Bug 225999
+	epatch "${FILESDIR}"/${PN}-8.4-lastevent.patch
+
 	local d
 	for d in */configure ; do
 		cd "${S}"/${d%%/*}