Add patches from upstream to fix building cairo-fdr and cairo-sphinx on systems with dlopen functions in the libc, like FreeBSD.

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

5 files changed, 57 insertions, 17 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 95e81d55f653..8e10fe788a1c 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.307 2012/09/12 05:37:43 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.308 2012/10/14 15:39:24 aballier Exp $
+
+  14 Oct 2012; Alexis Ballier <aballier@gentoo.org> cairo-1.12.2-r4.ebuild,
+  +files/cairo-1.12.2-fdr-nodl.patch, +files/cairo-1.12.2-sphinx-nodl.patch:
+  Add patches from upstream to fix building cairo-fdr and cairo-sphinx on
+  systems with dlopen functions in the libc, like FreeBSD.
 
   12 Sep 2012; Matt Turner <mattst88@gentoo.org> cairo-1.12.2-r2.ebuild,
   cairo-1.12.2-r3.ebuild, cairo-1.12.2-r4.ebuild, cairo-9999.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 07573502b315..b55999f9312c 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -6,6 +6,8 @@ AUX cairo-1.10.2-export-symbols.patch 2072 SHA256 31df610ff96a9d04b51e9636c8566b
 AUX cairo-1.10.2-interix.patch 1235 SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea SHA512 fbc524c2f359b489dc337a2aa70fbfc21e4cea0e306d144f45f520875471a66b65cd7687730461bff16c47792a30d81ed2be48895e2809cc24996a2dc26c560e WHIRLPOOL d25a09cb9c53b553690e865385be90cd696ed6135734d4d2f3814bd30e386c5f0bff05e7cd4f34c737dd2db2e35f590023b4dd7a00e767abdad9acf60775d684
 AUX cairo-1.10.2-qt-surface.patch 2687 SHA256 fb96199ec7a4cf8527726be8d0333ed883183b56960832218eca1c9ef2e05dbd SHA512 1263f129f96ecf0277ba436cac0229b6245bed273594b2199d6b0f36711e323c966c43d9264e4cc8b69a299c8e9c1ec4af09ae2284bf5ca59a72486b31439c48 WHIRLPOOL 1ec6c56a6e1de3c838fb2dfa541e062e3f63630910a5609fe211bab8c8bbdb1968af021954020b4da208ba43cde18795e6114fccdd13ee0de2e0edd285d7996a
 AUX cairo-1.10.2-ubuntu.patch 1777 SHA256 150d5b9f7f842d574a6e10e579bc8f27ca7b2055af8e0dd455aa0832bc3f4dae SHA512 8d9144fe809c4135f0dbd271d580620da769e2f946386e345783cf2379db458ed5ef964785b66d70b4e44a007c85a9209c85366144ad057d3ac5b60ee80383bc WHIRLPOOL c0754ccdeacc91ee2d222a945d8787ae3379a2881c36d8f0f6c545262baeb8f9fc866dba657f5d706c0b658efd5834c06725c2b942473b8755af10662f8ec088
+AUX cairo-1.12.2-fdr-nodl.patch 651 SHA256 34d94cf51dcf90384421b4f0ada6ae8cde09b0cf91b1c2f0b0ed56c477ee7cf4 SHA512 f8f0a088d5f9bdbf6925bf69a336ba7bdaea08fbe491bf4eaf705c1a16899a40913e6bdeb8884891c37409ae3dcf2a89ca48f6bba65451680b6672a449dadd05 WHIRLPOOL 05a357ca9ac4b9ed49351adf508454e410d1047598531f5cbb427bd30445d38084a52f2f6030de1d38a5209aed008d7f58f260398d2efe2df20e6b31e6cdc465
+AUX cairo-1.12.2-sphinx-nodl.patch 786 SHA256 5dd5eb09bb596c43e363ddbfc2a87a9b709834f42732628f4d0d99e931cc1f36 SHA512 7a4b65ba7d5502d1532ceeecb8032a23f48f732e2823be16dc68b8858dbbe5795aa9a05a0bda97f287f624871633abbad4271bdea34b966f438fd74b6bfe602e WHIRLPOOL 88cb48c6b893a77d3ad056404ecb6b53d05936dbd8d2c17f2795b3a7d81ad671aa5df57c52f0dfeb1c3be899bc2312a467006c776da79102f477bd718319c0c9
 AUX cairo-1.12.2-surfaceless-extension.patch 1517 SHA256 9d138608c609499d68f1f1c1e48a7f68c39ffffa78cac3cb197776e0e353d05f SHA512 b3bce0d67813ae412d824ed93a4d97202c57c61748307a969a3b9ab499e3acdff1ccfb4c95a4559fe6a2b98bc29682ec088195aab491087acd742de942f34619 WHIRLPOOL d4cadbef80f17edcccdcaaf5528d221f024c4505440741152bdde69be66fbe2deb1ce600385fd81133fe0bb6c88356b6e32799ae347f91ec160b0f1ea4e57fce
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a SHA512 8f431963a0d952d44921087dc4f20ccf768f24e6fa892cd07b8f93f13778617dda7aa25a7624aa9d7477cbb8655353aa6499e6086131ea4a511593d0f91acee8 WHIRLPOOL 5f13bcc937451aeb72321c02340dca148568f725054b4e4ff4c01edb27c30b6b92ad415fdfcf12de3591c38cc529ae0369e8ca4a12dd2494fcebad2d4c39fa97
 AUX cairo-1.8.10-libpng14.patch 426 SHA256 b090f829d3b9fb69b83bfa094552335b8382988d60ce7e46558c4069b8bca532 SHA512 77f5558f0b740c09b5e2b8f603e0c10aca1289aea34eb9097e548bd8f9f67bdc72b7df01ae98a3f4398ddc1136a9b16cb31585fb8db22b32c8dbb75259f54fc5 WHIRLPOOL 29cc842601c1ac9b0f0455b34705301da22959f6c2cddff57b7468298d85babea5575d2796ca003d495df04a409a85cebd8dea1137311374cdc204f5c85f332a
@@ -19,25 +21,15 @@ EBUILD cairo-1.10.2-r2.ebuild 4269 SHA256 f563b262de85b4666c67e7fddf46ceb81404d7
 EBUILD cairo-1.10.2-r3.ebuild 4394 SHA256 b311e00a61be445cd8ce7477d1b142bd0248697cba9c2c3c500137189f068b41 SHA512 ed1c5f02fc830eeec26427bc01c46e1f1e63f153c2d223f6303ac921b1371d0bba601f5b081e03ec0d28de8ea227d53069a52356aa9d18fa4111a07e71cae3b8 WHIRLPOOL 3d9816cdc1c2e8c92d547448f3b6083e8e66aba8f42c1e85f06ba59a822543c700306f25ff091069eb93ff9817430b32356c5fe12b12b390ba32d9b052c5bbdd
 EBUILD cairo-1.12.2-r2.ebuild 3796 SHA256 896f6add61125b67ee7c300e6ec6367c583a49e16fbef16d46dcfe94b07dc770 SHA512 6461986cd3abd7634ae8d1086fd55605ed9675e7820e743a70792efcd0b4f197a50a6045495b69cfcbdce0ce2eede6430800f4dca0b0400e655e6c98f880bb6f WHIRLPOOL 48cc54a224e66c98a71d7cb4b8a50d43cde56bd9666d3f2bebc6dab12ff973c8ad716d430bde3ba07cad21d731d8293cb591b894a3ab98d123e953f40a5293e6
 EBUILD cairo-1.12.2-r3.ebuild 3853 SHA256 36b148a172d38d0a266564452869b2e4a5e3d4b94d525a07d80323a05e9d4d4e SHA512 6429ffbe0878bd4f083d78517cc0872736d58d789f21642b55b22e046d1fa279aa8860deff3db56f051fc52bf257fb58c61d46803b1ef35d89a2af44d8cf3a48 WHIRLPOOL 7f8b531eb754e06c8e07412e2309c5cae7836cb626c9b5a275c4cfc2b682ba6b7009dc6b2494a2f517623e80b8761d00aad529154b2672d7023095a216b34f93
-EBUILD cairo-1.12.2-r4.ebuild 3916 SHA256 a887c58e401610775e9c6bf6a4cc89ca4ee258c8f18503cb6485576567fbf50b SHA512 6cba10d55ac5e806f84bb258490207bbd09eff891c989e0b5ec98fa7cd60b86f8d1941f503581c541a9060ff31c6d77fe609f70ac1cf7ca2eed1f39457d2f9b5 WHIRLPOOL 0492721fede2d0790faae379f8898499f79b2716e1da298d7562b05cfaec0db711b44b788f7ebaaed921ef951132c9b2e77302293b12af9bebb064477bf07602
+EBUILD cairo-1.12.2-r4.ebuild 4019 SHA256 9f6ece685726163f1b8961775ed21f3c9a7f1e6bdf2913c596fe30cb7d3d889b SHA512 e5e053ca1422e8775adea3518a3856319f8eead2ed4333352f87e5e6874841b45af77d9ab774ab6710ba1ffe84c1a9d08182a461697c5660bdf4fd65417e8905 WHIRLPOOL 8aca240b37274dd94ba30bf7d36a127814428e1cf40ef8d8ba2706eb5e7c49cfe948477e1e8b7e871697177a7435959128e30a8416e6d4fbe8fc2972a7da1f1e
 EBUILD cairo-1.8.10.ebuild 3440 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f SHA512 fecfac9a9766877355eae58566fc162e6b927f81ffd34e946904de0ea60fb207c55e1f9f4b4735fc09d59e914fd096861ecaf3859a88a57f2dd53bff8c8cfb86 WHIRLPOOL 1d3e24e04238260d090c3de9d8dc60b21d93fba9363ac94633c5220e0169aeebf02eb0f7152690ae276c928bea0ba4783a3ebf2809882362c6a5bd53aeef37fa
 EBUILD cairo-9999.ebuild 3819 SHA256 bd190ef64586c10f31f20c43145c2788f0a0c5be38ecbfcb07cb073ec9b35e59 SHA512 6a19042e46ba7fd2e47ab576f6849283953b3b0491b9644ade330c35f627c6db90d21211fef6d1ac64a624972f6879921c1003158729f61e65377b396184b970 WHIRLPOOL 1b1b7e552832b545437311342a39b827cecd5c78397b25261e02a937b30885f62a2f1375fa513db993bf0dad8193e84f586168d07612b79f57f2088da9b2334b
-MISC ChangeLog 44034 SHA256 fcf2373f4f45228c47e88dd2d0f495bb11e14882f1c0f3809b68e9a22403d183 SHA512 87c1567b0442485d63b98de690e31375d3802a322e8bb86131162c9dc19fef0ff7eacbef6d787440c2ca808e3a78dab37961020eed6e1bb4f4f726b0253cc740 WHIRLPOOL ce89846a856d406a774a4382eb9484aef123de1dd51e2c0d0c83471e7309b7bac350ed88d5ce381233f65d28dbf8492b36d3a33d655c1e7c4e4e6012e8c6a35c
+MISC ChangeLog 44321 SHA256 705bb2f8e74e1959c5064c6b03588b2b6aae55d2e328819cd5ef74bbe8fa980e SHA512 021e013c08bbd017517626ecf3340c59d93c139f201693da6f116d3c1831195f4246e9ba5739360dca70618e146c4eed244aa300d22b525adc2dba0aa8d50fee WHIRLPOOL ca0eb87ed5f1d4d86400189c23764c31991bae07008b041faf4eeb317dfe4b2cf57ab57731e106dd00afb024b9311913602a58bb8eb85917288e81c8d1f97084
 MISC metadata.xml 958 SHA256 34cc9c511683c03054b582ff5ce62e1a75a79cc472d83ff37f20e4d0d352064c SHA512 c541701c99a94d60f5dd22f27160ede89781411641c5772ba94fd24566b95ffc56bf90d06586d8038b4c1445f896cc295a7a03f27bc2e0e6fc9f489be678ef23 WHIRLPOOL c96181f0119d73c0084fd659d6aa3a9dd2d8ac3194d35efd23bf46e8e9f3d7aa00b11130c736f2578cfe20695fd41254dad03002db28ec6337ba57ada4aee2b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQUCAJAAoJEA/daC2XTKcq8nkQAL5zE7plTb87hpmzmRJUOaMz
-jehjsl3SW978p9dg9PKIJpzZOD13lhCLpoCgX9Fh3tL9qNQ3iamzz4NowQTSKxtG
-E+rT+1z7RcjvFPa9hVKrUn32LgwDL1axw3gJBFa3k5BPlrliFpY22ttqVxh0t/s4
-wamjPZBJqZMO1yrkrX514YrX0YeSJSS8MEkSbX8bk25qIOKmRBjbJcMc0HxaUqJH
-0b80DRPALIap3Gyf0VKyLmZTc1zj0EAChUj/J2+ZZci+6NPZdzT5gcgkfIjz+zeV
-/loUFBPM37NzXn2zTwLJRVcnV7BOru79szSu9DLwWjja/3EwaJTzsll0u9ETMfDW
-szaUTl+X5vjNTYUAQrDthxm0JEuSFPfg0K6j4gkFP9srfSjMMyLoiuiSmA24kjnR
-abGqnwZskF9jcinvhy6mno1rWD6oS0g1e0btPNqEN8Bt6gxmoaTbRMRw4nJp8Nma
-GhIrGDeerrg/Gz5enZjFWyr/frDPAd/eAiaMvPHAgh0G9LrEE2we8awfknAmRfDe
-l5+ds+mcTw0Db5aObVXW6hG1KPtczuj0WAz+93b1L+x3UdCt/IqfJlGawzcs1VQ9
-v0F0mZVAcwfCy1IteI97AXfYh63YRkiW6d5GtzkXXnbaUR2JZG9zDCYDWRxc0luM
-BR0MxHvsKF0IteFxD1Nw
-=hm5J
+iEYEAREIAAYFAlB63K0ACgkQvFcC4BYPU0pkUACfWZ8rC978YMqAaGuCnyU+KDiY
+zNAAoKnyv+HOrLo/Xl4E0jjUa79XNyhf
+=r2IY
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.2-r4.ebuild b/x11-libs/cairo/cairo-1.12.2-r4.ebuild
index bd43778235a2..a708e07d2aac 100644
--- a/x11-libs/cairo/cairo-1.12.2-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.12.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.2-r4.ebuild,v 1.2 2012/09/12 05:37:43 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.2-r4.ebuild,v 1.3 2012/10/14 15:39:24 aballier Exp $
 
 EAPI=4
 
@@ -75,6 +75,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
 	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
 	epatch "${FILESDIR}"/${PN}-1.12.2-surfaceless-extension.patch
+	epatch "${FILESDIR}"/${PN}-1.12.2-fdr-nodl.patch
+	epatch "${FILESDIR}"/${PN}-1.12.2-sphinx-nodl.patch
 	epatch_user
 
 	# Slightly messed build system YAY
diff --git a/x11-libs/cairo/files/cairo-1.12.2-fdr-nodl.patch b/x11-libs/cairo/files/cairo-1.12.2-fdr-nodl.patch
new file mode 100644
index 000000000000..b2ad8ed8b64c
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.2-fdr-nodl.patch
@@ -0,0 +1,19 @@
+commit 3d2712d56a22f2a86fb80da94c3e55be8d26a330
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Fri Sep 21 08:22:54 2012 -0300
+
+    cairo-fdr: protect -ldl link with CAIRO_HAS_DL like in cairo-trace.
+    
+    Signed-off-by: Uli Schlachter <psychon@znc.in>
+
+diff --git a/util/cairo-fdr/Makefile.am b/util/cairo-fdr/Makefile.am
+index 5cd5798..34215a6 100644
+--- a/util/cairo-fdr/Makefile.am
++++ b/util/cairo-fdr/Makefile.am
+@@ -10,4 +10,6 @@ cairo_fdr_la_SOURCES = fdr.c
+ cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
+ cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
+ cairo_fdr_la_LDFLAGS = -module -no-undefined
++if CAIRO_HAS_DL
+ cairo_fdr_la_LIBADD = -ldl
++endif
diff --git a/x11-libs/cairo/files/cairo-1.12.2-sphinx-nodl.patch b/x11-libs/cairo/files/cairo-1.12.2-sphinx-nodl.patch
new file mode 100644
index 000000000000..5ca14cac0145
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.2-sphinx-nodl.patch
@@ -0,0 +1,22 @@
+commit f78a9269228f2f48e8eb496e341ef990db39c6c3
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Fri Sep 21 08:22:55 2012 -0300
+
+    cairo-sphinx: protect -ldl link with CAIRO_HAS_DL like in cairo-trace.
+    
+    Signed-off-by: Uli Schlachter <psychon@znc.in>
+
+diff --git a/util/cairo-sphinx/Makefile.am b/util/cairo-sphinx/Makefile.am
+index b25bd23..10bc10c 100644
+--- a/util/cairo-sphinx/Makefile.am
++++ b/util/cairo-sphinx/Makefile.am
+@@ -12,7 +12,9 @@ cairo_sphinx_la_SOURCES = fdr.c
+ cairo_sphinx_la_CPPFLAGS = $(AM_CPPFLAGS)
+ cairo_sphinx_la_CFLAGS = $(CAIRO_CFLAGS)
+ cairo_sphinx_la_LDFLAGS = -module -no-undefined
++if CAIRO_HAS_DL
+ cairo_sphinx_la_LIBADD = -ldl
++endif
+ 
+ cairo_sphinx_SOURCES = sphinx.c
+ cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""