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

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

4 files changed, 50 insertions, 2 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/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)\""