Fix build failure with libX11-1.4.0 where they added an "X11_" string to header guards to avoid possible collision (#345987)

Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64

4 files changed, 41 insertions, 5 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index 4cc205f4d59e..74d7370385ad 100644
--- a/dev-perl/perl-tk/ChangeLog
+++ b/dev-perl/perl-tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/perl-tk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.77 2010/11/07 21:25:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.78 2010/11/27 07:09:07 tove Exp $
+
+  27 Nov 2010; Torsten Veller <tove@gentoo.org>
+  +files/804.029-X11_XLIB_H.patch, perl-tk-804.029.ebuild:
+  Fix build failure with libX11-1.4.0 where they added an "X11_" string to
+  header guards to avoid possible collision (#345987)
 
   07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   perl-tk-804.028-r2.ebuild, perl-tk-804.029.ebuild:
diff --git a/dev-perl/perl-tk/Manifest b/dev-perl/perl-tk/Manifest
index 47f7a16c376a..c1ea362c61fd 100644
--- a/dev-perl/perl-tk/Manifest
+++ b/dev-perl/perl-tk/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 804.028-FBox.patch 383 RMD160 0c3ee7967941cb2172b143e62c02b132b33d33f5 SHA1 d926d1ff905d273e3761148022e6b9f874634360 SHA256 1ca5c2defa229f6b7d64b9d79feda0da6599d8910809f07f6cf2c5f6ffa7498a
 AUX 804.028-MouseWheel.patch 835 RMD160 27c038c282bb5ae78b3e7bc3bc1421522f6f0568 SHA1 4a8ba6e172503105fa0590cbbf0797397a814699 SHA256 3e49281367611c0c8dd28c15d1eefdb442b367dd60076992fcdeec90a64723e4
 AUX 804.028-path.patch 555 RMD160 d9950e90749c3e4ac4505b16f1652b6e29cde5fd SHA1 2366dfff98aa1e2cb80f504ba8962e695c1d462e SHA256 3b5466b95f1549886e25071d4609bba9bc8a2956a920cf727467c13614ee2563
+AUX 804.029-X11_XLIB_H.patch 830 RMD160 61419ffc592546922a5ab6dc95d31091aab1d396 SHA1 d26b997ce3293d52b9cb413cb8726f887544f955 SHA256 a4dbec5e8b61bab63dd875d580f1fbb7715ee034b6495cc1b55a774c4e670252
 AUX perl-tk-CVE-2008-0553.patch 516 RMD160 13b8cb1915b579b7283e5225bde8e7bf6cfd4734 SHA1 70d43c5f0a9e766d3481793f4ab7d83db21cbce7 SHA256 8fe14ac6bebf169d8c439ae64f44b928a4e4f6c366f599a69e9ac1d15df8e126
 AUX xorg.patch 1893 RMD160 17d6a59108c5ab150b5d71f9c3d147062c58d13a SHA1 487e0b4bf9e47e0de8e7a4bf4a3b1aaa88b37000 SHA256 f20d6f8c78b10f05cf02c02396cd699ddc66cd48de584eef6dc0b010894fea07
 DIST Tk-804.028.tar.gz 6927637 RMD160 8db5d3376f2374429ef71c38ddd268a73bac437e SHA1 075c751f1388741aa313e002578d2e802668f2e8 SHA256 4c387eb285b2b0581cdf762c7145ebaec6ba57f67d830e92ac26ea8dbecf6c77
 DIST Tk-804.029.tar.gz 6924235 RMD160 1feac57c5799c286a3e81258d3e7621b84b1cfc2 SHA1 1076d736e43fdf416c664bde0e4c3d035d6903e3 SHA256 41e31d393c29301918949d0f93d7d1a1f877777ac6e65cd92e11741c68a4bc7f
 EBUILD perl-tk-804.028-r2.ebuild 968 RMD160 51cf64f979ab86fd6335ff082fdc250d917ca906 SHA1 152afd1ae2a83e66ea543af053e7e5ed3f0d5614 SHA256 02049d4b804c4ffe52839c8134f354eb9304ec1d0f02fcaf6d5b162fdc51c457
-EBUILD perl-tk-804.029.ebuild 1019 RMD160 f574d5b91fda3dd0a5090b6bee580395d8b1244a SHA1 79f84391c6ed8b22dfa39196ab74b8834bf279d1 SHA256 ab038fc6710c9a9b5cd355e37c5d32833999d3fae042f5ee6c6fa6049e8a1cd8
-MISC ChangeLog 9436 RMD160 712d43aee33a2d6791dc4c9e8fbb0acb2c4d2613 SHA1 3d3163a2cd3360f45993cb80d6ac5c9f5a8cfadc SHA256 ca0ac7a14a6261929d5be1c88c2c5bfe61643caf4ec206f43e544e0741cd268c
+EBUILD perl-tk-804.029.ebuild 1055 RMD160 103dfe14a821331fa5fb48214fb8a25a150a2317 SHA1 8fb26f4bad2bda427fffd653d796ef3fa9f22971 SHA256 2aa8b8b1aff8d2fd06dfd2ce5d3d1024736bc54643ea652a2e8df1e97d169733
+MISC ChangeLog 9668 RMD160 2134d3603e796985d750fe0085b472d51ca2ab40 SHA1 902814780920ad6f9c6834285fe64c7d61193cdc SHA256 505eaa9218e867980727902e9bc20b52eb0783bf6699bd75b9e2a56d9fca5db9
 MISC metadata.xml 228 RMD160 885e1e511eca7842c5663a97f16debb33479c350 SHA1 5efb0a5f6af6867c647d59502fe50f6b3da42b3b SHA256 9cb7e2563cdbf5a3bdd4a6ff056b6711a5ec1815572962bc3b4408382a2e11b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzwrpgACgkQV3J2n04EauyPawCgizSpfq4Xm7V4LPLv8Kwe+ZOe
+DCcAnRwuzn10LaA7NBsnUcKZAkc5WSrH
+=UNRR
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch b/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch
new file mode 100644
index 000000000000..7a43a7ade866
--- /dev/null
+++ b/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/show_bug.cgi?id=345987
+--- Tk-804.029/pTk/Xlib.h
++++ Tk-804.029/pTk/Xlib.h
+@@ -1,6 +1,7 @@
+ #ifndef _XLIB
+ #define _XLIB
+ #ifndef _XLIB_H_
++#ifndef _X11_XLIB_H_
+ extern XFontStruct *XLoadQueryFont  _ANSI_ARGS_((Display *, const char *));
+ extern XModifierKeymap *XGetModifierMapping  _ANSI_ARGS_((Display *));
+ extern XImage *XCreateImage  _ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int));
+@@ -143,6 +144,7 @@
+ extern Window XGetSelectionOwner _ANSI_ARGS_((Display *, Atom));
+ extern int XRectInRegion _ANSI_ARGS_((Region,int,int,unsigned,unsigned));
+ extern int XSubtractRegion _ANSI_ARGS_((Region, Region, Region));
++#endif /* _X11_XLIB_H_ */
+ #endif /* _XLIB_H_ */
+ extern int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
+ #endif /* _XLIB */
diff --git a/dev-perl/perl-tk/perl-tk-804.029.ebuild b/dev-perl/perl-tk/perl-tk-804.029.ebuild
index 2a30055552ec..843405edd3d9 100644
--- a/dev-perl/perl-tk/perl-tk-804.029.ebuild
+++ b/dev-perl/perl-tk/perl-tk-804.029.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.029.ebuild,v 1.9 2010/11/07 21:25:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.029.ebuild,v 1.10 2010/11/27 07:09:07 tove Exp $
 
 EAPI=3
 
@@ -28,7 +28,8 @@ S=${WORKDIR}/${MY_P}
 SRC_TEST="skip"
 
 PATCHES=( "${FILESDIR}"/xorg.patch
-	"${FILESDIR}"/804.028-path.patch )
+	"${FILESDIR}"/804.028-path.patch
+	"${FILESDIR}"/804.029-X11_XLIB_H.patch )
 #	"${FILESDIR}"/${PN}-804.027-interix-x11.patch )
 
 myconf="X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir)"