Fix compilation under gcc-4.6. Fixes bug #376799.

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

4 files changed, 24 insertions, 7 deletions

diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog
index b2fafb003e4c..a2306514801a 100644
--- a/media-gfx/graphite2/ChangeLog
+++ b/media-gfx/graphite2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphite2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.7 2011/07/29 10:14:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.8 2011/07/29 11:11:10 scarabeus Exp $
+
+  29 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/graphite2-fix_wrong_linker_opts.patch, graphite2-0.9.4-r1.ebuild:
+  Fix compilation under gcc-4.6. Fixes bug #376799.
 
   29 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/graphite2-fix-nostdlib.patch, graphite2-0.9.4-r1.ebuild:
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index d725dcc7f651..3bb7be99396e 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX graphite2-disablefonttest.patch 3239 RMD160 05de65868555648df40abd219f18855d24440ffe SHA1 4ae5238eaf376ac362e0e70c6f5ba5eded404b3f SHA256 4f216133001c45c0748f870fdfb2afce03be3369409ff63717edecec7b5f2e9d
 AUX graphite2-fix-nostdlib.patch 1712 RMD160 640485f64d16c199cc73e0be6d3fa96c8d74027f SHA1 3a6af85969dca25a6202fe6f3b3443a45e83729e SHA256 2b8844ccba51943d541acfd68c0bdb7f5836b470e775b4d92efbb59d362e1ef7
+AUX graphite2-fix_wrong_linker_opts.patch 780 RMD160 10f7e7f1823aae7d76216a8925964c2f9fd248b0 SHA1 5b7a0c965fcfe5a03d977ea35eaca49fab83a1f7 SHA256 11700f6e36e485fd0fcc98e1930fee79b14afaa0d31f614177639211ab35e1ae
 AUX graphite2-includes-libs-perl.patch 536 RMD160 ae964c2aacd8a8d6383b25c1f045fe4771558b09 SHA1 9209a91a11f3e9feb6fd3a449b85d8d1b185788f SHA256 84a1bff6793b9fd49268b9e5927ac249e960d34cac119fe17b8cf35032c9f11b
 AUX graphite2-multilib-strict.patch 1190 RMD160 09079fa143c030621ea2d013baa2491335c780ac SHA1 1f40393332628e3feaa473a238e5fc762f437d14 SHA256 c6a7eb3b6f500ef27808cb90287b4e183ac4acf13a47832da7d484bebca8a2a4
 DIST graphite2-0.9.4.tgz 3548861 RMD160 6181dd3ecc9741f36255cc431a630243fc7c90cb SHA1 bf7c359c5338b8e0ea54a72985c6c9adb16f6fb8 SHA256 75ea41360ddf0d84364a790c0494708a4e14643915ad517309d330ceb34b60ee
-EBUILD graphite2-0.9.4-r1.ebuild 1607 RMD160 cb5268699ff93ebe0712bca98d2846b364898ea0 SHA1 9cbefa9095e41231159e09d4e2537ccae7f1021f SHA256 10f731f200e4ef7bb83bde5fd1ec4217b40f8e796101613191a8851d04c4c9a2
-MISC ChangeLog 1486 RMD160 f75da39fcb6476d584f7ddfe297a662c3480b4d7 SHA1 4247cc0092d02fa64e3c8794fc00a297d4e4b8d8 SHA256 ef77cbfbe83236ee53293056c5c9a7a8cbce0d7b33f9dad1649e116d6de61488
+EBUILD graphite2-0.9.4-r1.ebuild 1656 RMD160 52052c25dbd1562fe36f9e66c2547452eb755086 SHA1 9b1bc0d093315d522fafb45009f780842a67fc77 SHA256 b08c7cef0e85256cf7b568020b61a9c77022176ef52ad4d0e9cae72b65ef28c2
+MISC ChangeLog 1669 RMD160 e61ece2720a6e4661815d1782f6d2bd332b39908 SHA1 2b0274e252dbc7f1a43adc6f47d6f9dec115c0f8 SHA256 0c2d1d1acd7f7afb3c79a0141fdae4e9ac589906cff217edb7a0c0f240e4ac67
 MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4yiCcACgkQHB6c3gNBRYdGOQCgy8t1dKDIioxNkv8nLGLfbgs3
-N0MAn3uLifEuorwZkyPiCyLMQTFHb8ZS
-=hvmk
+iEYEARECAAYFAk4ylUkACgkQHB6c3gNBRYdMdgCgpV6XaUc8ocTcjgYIbwOOuGdS
+HUAAn3PJC8dokqF92M90PJ+DrnqMVpRX
+=ukmi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
new file mode 100644
index 000000000000..233995647ce3
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
@@ -0,0 +1,11 @@
+diff -urN graphite2-0.9.4.old/src/CMakeLists.txt graphite2-0.9.4/src/CMakeLists.txt
+--- graphite2-0.9.4.old/src/CMakeLists.txt	2011-07-29 12:53:36.000000000 +0200
++++ graphite2-0.9.4/src/CMakeLists.txt	2011-07-29 13:06:18.000000000 +0200
+@@ -166,7 +166,6 @@
+      -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fdiagnostics-show-option
+      -fno-rtti -fno-exceptions -nodefaultlibs -nostdlib
+      -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector)
+-    set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlib -nodefaultlibs" LINKER_LANGUAGE C)
+     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+         target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc -luser32")
+     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
diff --git a/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild b/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild
index abaaea86894a..98dd8108efbf 100644
--- a/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild,v 1.4 2011/07/29 10:14:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild,v 1.5 2011/07/29 11:11:10 scarabeus Exp $
 
 EAPI=4
 
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-disablefonttest.patch"
 	"${FILESDIR}/${PN}-multilib-strict.patch"
 	"${FILESDIR}/${PN}-fix-nostdlib.patch"
+	"${FILESDIR}/${PN}-fix_wrong_linker_opts.patch"
 )
 
 pkg_setup() {