Updated with Tk patch for xproto header changes (see bug #252700).

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 x86_64

4 files changed, 38 insertions, 15 deletions

diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index c47f50761c60..a7c022387800 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/sourcenav
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.21 2008/11/17 20:33:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.22 2008/12/29 23:24:26 nerdboy Exp $
+
+  29 Dec 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/sourcenav_tk-8.3-lastevent.patch, sourcenav-5.2_beta2.ebuild:
+  Updated with Tk patch for xproto header changes (see bug #252700).
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/sourcenav-5.1.1-gentoo.diff:
diff --git a/dev-util/sourcenav/Manifest b/dev-util/sourcenav/Manifest
index 2c14202e2245..3140b99c20a0 100644
--- a/dev-util/sourcenav/Manifest
+++ b/dev-util/sourcenav/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sourcenav-5.1.1-gentoo.diff 19868 RMD160 77b988b13fe3446bb994eb0079257c1f13154a07 SHA1 ace8818da46aa4e1473e997eb07cd944e9feac49 SHA256 0fbd879a9b2dff0c8a5132ad94c557ffcf7018626735d52978f4f2a05a0edddc
 AUX sourcenav-5.1.4-bash3.patch 1702 RMD160 806a10ea2c4381982cc14f89b427111ab01db001 SHA1 9b6bd33e827913fe0e256e97879154e10bbdfc75 SHA256 00aa9aefb03c9646d521e09bdc2131b36622709d30e5fd30fd129256bcfe9498
 AUX sourcenav-5.1.4-gcc4.patch 3474 RMD160 b271eea50cbad08c57a162b96be343329307cccc SHA1 803828103bdc19d936d1303a8c63a31e66f8b0b9 SHA256 2599e7e10bb56e4077cdeda4b2157278985de7549a4955fe72b0436840833075
 AUX sourcenav-5.2_beta2-gcc4.patch 2138 RMD160 1378b66a9300d23873c6e2e21a5ef395e0806e5e SHA1 2194d964a6e7b3f1bf61ef447b580c4b4e803c84 SHA256 a13f1d209cc452e9abdc1eb3292c41dcf212193ae6803f4037ed009dea713ecd
 AUX sourcenav-5.2_beta2-tk-size.patch 450 RMD160 d673c483ba759488069181895c66786bff01b147 SHA1 ce2ac4777cac9fc1f74bb8115a0f578eca741606 SHA256 4dbd88343b21e391181e65e0afd7cd042a65a735dafe805490c2d9777273eed8
 AUX sourcenav_destdir.patch 455 RMD160 d4ccf55b39869f2be931680c87fa7db05b9f5e34 SHA1 e8c62966b001317541c37ff38a6af804cdc65c57 SHA256 e62679456dfda54cf8268a813f0fa932b83c1cab0ea8467cae315180b8d281ca
+AUX sourcenav_tk-8.3-lastevent.patch 849 RMD160 dc499aa2d685580e9f2eb269f73ff17bd00670bc SHA1 692fcb45bacb588a633a7d4f99db53257ae3f9d8 SHA256 7ca74a5347145b17a685316bf89b188cf3d9e98da258a044a3767bf77fce2460
 DIST sourcenav-5.1.4-gentoo.diff.gz 4560 RMD160 ef800f88f9d878f83894bb1ff72b4b633c3a73f5 SHA1 80512b04dc00c516ba53dd0b6ad9e5d29001c624 SHA256 46429bf59d2aeafaf3db45e943c345eaab9f59378c4f0625226e3318d91f3662
 DIST sourcenav-5.1.4.tar.gz 11101823 RMD160 1e4fc7f4b3791e3e39e1b23b9d4d8453fb067493 SHA1 bc46a9280f1f85fb061dbd42a79b10fbc95f7e99 SHA256 338a583c044f2ca1db3850e13206ff205a9867b2cfdabd51f159f255bfd906c7
 DIST sourcenav-5.2b2.tar.gz 13486494 RMD160 84c4e8f208cbb3af4899a3a564a440018513dcbf SHA1 c84c264aecf4088c3358515561b22b357350c494 SHA256 c03cb65f875250c8a6cc48ecbd2934e5f90b65cf428fe561ec2a1705747f1355
 EBUILD sourcenav-5.1.4.ebuild 1617 RMD160 982a1d42a3d116a296d3f783fe07b7a0e1fe8203 SHA1 0fe5a71c981202b6a0770ddde58e46e1b0bc8c5a SHA256 5453dca994abfcf8d8afe4837c0017b1731051d56b41535e747745f9613c28f4
-EBUILD sourcenav-5.2_beta2.ebuild 2040 RMD160 92149cfcc5e2f553e073470a3b729d95bbbd93ea SHA1 1e5c4f00897489971343d276387646fde0ab769f SHA256 0b3e8afb6a4cecf29d0a999c130ad83cb65160b6c5a91477919ca1652698238c
-MISC ChangeLog 3979 RMD160 48dcdffa3b48aea065461d00ad30c081d3aacc9b SHA1 b9681f8d2793e75cea7004068defaf135b76c62f SHA256 0be95ece3214584365eddae7ea8ac6f6123804693607620e076c5138f32fa589
+EBUILD sourcenav-5.2_beta2.ebuild 2136 RMD160 be959120deea27d7d6e23801d43951db516d4beb SHA1 6d2be1538ab5c1eaa9b82e5ff7ff671b20a056f2 SHA256 cce511eb78a5563597c2fa429542078d56cb7aa3b0c6fd284be8cf4867fb37dc
+MISC ChangeLog 4167 RMD160 346380e5e893fa23be204fe5dd51c34b18a9b086 SHA1 cb4fcd280b73118a9cde5cd5d475538d710ff0d2 SHA256 524b2e732fbeb36f05172ce83751c4a353cc968ecca48cdfc33ff5f521cee323
 MISC metadata.xml 440 RMD160 1abe25221723d019af0ecb4ede17037d383e6e60 SHA1 2f565db452c1cc45b762927b4a0c6cebe2f8b6f1 SHA256 1ff54a7e138b26b1a4a02eb30c28843b47de2965a1f6375604367b554d62463f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh1QcACgkQAiZjviIA2XibFgCg6bNvroJp42/smnaj9kL1nUin
-kYgAn27fF2ajucmZUwkasH5r9TjcHFXJ
-=K0S4
------END PGP SIGNATURE-----
diff --git a/dev-util/sourcenav/files/sourcenav_tk-8.3-lastevent.patch b/dev-util/sourcenav/files/sourcenav_tk-8.3-lastevent.patch
new file mode 100644
index 000000000000..9517af92ccb1
--- /dev/null
+++ b/dev-util/sourcenav/files/sourcenav_tk-8.3-lastevent.patch
@@ -0,0 +1,25 @@
+--- tk/generic/tk.h.orig	2008-12-29 12:55:34.381918897 -0800
++++ tk/generic/tk.h	2008-12-29 13:02:19.255919795 -0800
+@@ -557,17 +557,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-util/sourcenav/sourcenav-5.2_beta2.ebuild b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
index 264520518466..9aa165f217ff 100644
--- a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.2_beta2.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-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.11 2008/02/10 23:54:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.12 2008/12/29 23:24:26 nerdboy Exp $
 
 inherit autotools flag-o-matic eutils toolchain-funcs fdo-mime
 
@@ -33,7 +33,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/sourcenav_destdir.patch
+	epatch "${FILESDIR}"/${PN}_destdir.patch
 	epatch "${FILESDIR}"/${P}-tk-size.patch
 	sed -i -e "s/relid'/relid/" tcl/unix/configure
 	sed -i -e "s/relid'/relid/" tk/unix/configure
@@ -41,6 +41,9 @@ src_unpack() {
 	if [ $(gcc-major-version) -ge 4 ]; then
 	    epatch "${FILESDIR}"/${P}-gcc4.patch
 	fi
+
+	# update internal tk (see bugs 225999 and 252700
+	epatch "${FILESDIR}"/${PN}_tk-8.3-lastevent.patch
 	eaclocal
 }