Build fix for wxrc in presence of an already installed (incompatible) wxGTK, bug...

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f26c8703240f62fabcb928fc691db079e49dc065..18cf7d5b4438d7ae89c2a4ec3e8f1cb1d1f3f21a 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.134 2007/01/06 02:11:30 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.135 2007/01/12 14:37:40 leio Exp $
+
+  12 Jan 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/wxGTK-2.6.3.3-wxrc_link_fix.patch, wxGTK-2.6.3.3.ebuild:
+  Build fix for wxrc in presence of an already installed (incompatible) wxGTK,
+  bug 150435
 
   06 Jan 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.4.2-r4.ebuild,
   wxGTK-2.6.2-r1.ebuild:

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index dfab1803604d5ada0c46a0e4153aeb68e8bd2e37..81297c3c2d548024db921ac9fc9b5dd3a17d4ba7 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX intl.cpp.diff 581 RMD160 75ac177252f70210f10e6cec937d1c3782fff861 SHA1 2fdada93bb8b8450f3959009b3803795a8957890 SHA256 c70d00558c976c51fb00e6b487c811cefae0abef5005384b3674998e9d730217
 MD5 b0a51d86a603a6aa6b8447cd7ad8cc9b files/intl.cpp.diff 581
 RMD160 75ac177252f70210f10e6cec937d1c3782fff861 files/intl.cpp.diff 581
@@ -42,6 +45,10 @@ AUX wxGTK-2.6.3.3-wxrc_build_fix.patch 1288 RMD160 0072a233b07e1cf3035daa85a1be2
 MD5 54f6bb3088e1a1b0499aad2f40ef6f10 files/wxGTK-2.6.3.3-wxrc_build_fix.patch 1288
 RMD160 0072a233b07e1cf3035daa85a1be2aa4e491a5bc files/wxGTK-2.6.3.3-wxrc_build_fix.patch 1288
 SHA256 9b40e8c8f4e101a27c14fadd8c2a0f597c7323f335ab2eecfbc4c450f4f55d4b files/wxGTK-2.6.3.3-wxrc_build_fix.patch 1288
+AUX wxGTK-2.6.3.3-wxrc_link_fix.patch 1127 RMD160 7ebd632e7811982d8128f0e4281e29ee25b76f9b SHA1 8b0e96560cd0cf8efff4ddec2869d65d6b882365 SHA256 e946d312dd609595e1c61782b0e9019ef361a7c0478380e8891d61d38a4d6233
+MD5 83b70046c421613c0a5df2802e8ad481 files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
+RMD160 7ebd632e7811982d8128f0e4281e29ee25b76f9b files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
+SHA256 e946d312dd609595e1c61782b0e9019ef361a7c0478380e8891d61d38a4d6233 files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
 AUX wxWidgets-2.6.2-gcc41.patch 559 RMD160 b8118789927ca6de5df4b05318b039edc49908e7 SHA1 f5e31a94069a30a4844a85f07801f40dd51c9102 SHA256 2427a07fa30b7bbe12fde4c76d2735cec3592b4b690ac86697355ae3a71fbd91
 MD5 a7173de92807f66492cda98731156932 files/wxWidgets-2.6.2-gcc41.patch 559
 RMD160 b8118789927ca6de5df4b05318b039edc49908e7 files/wxWidgets-2.6.2-gcc41.patch 559
@@ -59,14 +66,14 @@ EBUILD wxGTK-2.6.2-r1.ebuild 1551 RMD160 b69349824933f88d4a65a4f3d5c725bec91712d
 MD5 4b2c6d187d184dc0a5cfc2814fe03b45 wxGTK-2.6.2-r1.ebuild 1551
 RMD160 b69349824933f88d4a65a4f3d5c725bec91712da wxGTK-2.6.2-r1.ebuild 1551
 SHA256 b65c4bb2ec1806f180f35f2f95e0fc3bd3ea1cb52e32ad80a28ce9484bfa5da4 wxGTK-2.6.2-r1.ebuild 1551
-EBUILD wxGTK-2.6.3.3.ebuild 5093 RMD160 4bd1fd9c7e1ee88882ff018b22582e468a0649bd SHA1 23a6e13dcf21d8a85b3f5549d8dfff1fe1849923 SHA256 b3961312eb68bd7e8cce7896fded7901893a7230212cd4d286145619be3431f1
-MD5 30ccfceaa66e4c756978a7494c0f3760 wxGTK-2.6.3.3.ebuild 5093
-RMD160 4bd1fd9c7e1ee88882ff018b22582e468a0649bd wxGTK-2.6.3.3.ebuild 5093
-SHA256 b3961312eb68bd7e8cce7896fded7901893a7230212cd4d286145619be3431f1 wxGTK-2.6.3.3.ebuild 5093
-MISC ChangeLog 20990 RMD160 ecb0171251dbdc78db8ee59308033995601125f2 SHA1 17364fdb13954652b467ebc007dcb15881143095 SHA256 f35fb05979f8267728bf8db279f3b8045dc8226d7d504721fdccb16703444aca
-MD5 191bb51263596c47e04bc4a160e3e5f4 ChangeLog 20990
-RMD160 ecb0171251dbdc78db8ee59308033995601125f2 ChangeLog 20990
-SHA256 f35fb05979f8267728bf8db279f3b8045dc8226d7d504721fdccb16703444aca ChangeLog 20990
+EBUILD wxGTK-2.6.3.3.ebuild 5135 RMD160 c0e52c5801a573a0e65f1709a4d5393fc512189b SHA1 72aa720420cdc0205fe0ed88814a68791e9196c7 SHA256 a931fd778e4589b0c534e9fb12426c3107216b71f99738a9eb676f8545527681
+MD5 0ac5f3f20ae49212f98ce4495cebcee1 wxGTK-2.6.3.3.ebuild 5135
+RMD160 c0e52c5801a573a0e65f1709a4d5393fc512189b wxGTK-2.6.3.3.ebuild 5135
+SHA256 a931fd778e4589b0c534e9fb12426c3107216b71f99738a9eb676f8545527681 wxGTK-2.6.3.3.ebuild 5135
+MISC ChangeLog 21191 RMD160 b97817f29b892dcc9b4f22a2ce464e997c355cf7 SHA1 61231f25c6eef2e68728cd323c7e24e0e1068753 SHA256 baeec5eedb1f1367666bc6a9bb76a3f5df794064defe7e5543e5f2fa6c7d8850
+MD5 ccd34d0a329b494ea83a0b7c3b86140a ChangeLog 21191
+RMD160 b97817f29b892dcc9b4f22a2ce464e997c355cf7 ChangeLog 21191
+SHA256 baeec5eedb1f1367666bc6a9bb76a3f5df794064defe7e5543e5f2fa6c7d8850 ChangeLog 21191
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -80,3 +87,10 @@ SHA256 5b793e6ce19b46528f537fd7e5ec07761b282ae7b4200dc04272315a9b8c709b files/di
 MD5 eb68af7b26b012c1917773f8e8ef72ac files/digest-wxGTK-2.6.3.3 536
 RMD160 df919a5e942c91fc9be13999d0b3db38d3880b3c files/digest-wxGTK-2.6.3.3 536
 SHA256 38f9f296e8a111b7459cdc57231520a7d0277574f8153cb2353c46534378695f files/digest-wxGTK-2.6.3.3 536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFp508keYb6olFHJcRAlWYAKD3CPC9RMGeIXIDBAAyVpxlkwTUwACePOm1
+HwsmM+Slskspc8q1a+n+L+s=
+=ezip
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_link_fix.patch
new file mode 100644 (file)
index 0000000..f5e05eb
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_link_fix.patch
@@ -0,0 +1,14 @@
+Fix bug 150435 - wxrc build fails because it tries to link against system wx libraries, if present,
+                 due to LDFLAGS containing -L to /usr/lib as a symlink - swap $LDFLAGS and $LIBDIRNAME
+
+--- utils/wxrc/Makefile.in.orig        2007-01-10 13:25:40.000000000 +0200
++++ utils/wxrc/Makefile.in     2007-01-10 13:27:56.000000000 +0200
+@@ -114,7 +114,7 @@
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+ 
+ @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
+-@COND_USE_XRC_1@      $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
++@COND_USE_XRC_1@      $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME)     $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE)
+ @COND_USE_XRC_1@      
+ @COND_USE_XRC_1@      $(__wxrc___mac_setfilecmd)
+ 

diff --git a/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild b/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild
index 5cc4d16d84085ea92358f37ffe03a82e2b93ecc9..ad04677a8a30f9f3aab340a0741839b8fc60925d 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild,v 1.6 2007/01/05 22:50:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild,v 1.7 2007/01/12 14:37:40 leio Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -122,6 +122,7 @@ src_unpack() {
        cd "${S}"
 
        epatch "${FILESDIR}/${P}-wxrc_build_fix.patch"
+       epatch "${FILESDIR}/${P}-wxrc_link_fix.patch"
        epatch "${FILESDIR}/${P}-dialog_focus.patch"
        epatch "${FILESDIR}/${P}-slider_linesize.patch"