- another approach to sanitize cairo.pc dependencies (cairo-gobject patch)

diff --git a/cairo-gobject-deps.patch b/cairo-gobject-deps.patch
new file mode 100644 (file)
index 0000000..576adcb
--- /dev/null
+++ b/cairo-gobject-deps.patch
@@ -0,0 +1,16 @@
+Hack to avoid leaking cairo-gobject dependencies to main cairo.pc
+--- cairo-1.14.0/build/aclocal.enable.m4.orig  2014-10-18 14:18:01.248879262 +0200
++++ cairo-1.14.0/build/aclocal.enable.m4       2014-10-18 14:18:52.212210456 +0200
+@@ -101,10 +101,12 @@ AC_DEFUN([_CAIRO_ENABLE],
+ 
+       AS_IF([test "x$use_$1" = "xyes"],
+       [dnl
++              AS_IF([test "cr_feature" != "gobject"],[dnl
+               CAIRO_ACCUMULATED_FEATURE_VARS_FOREACH([cr_var],
+               [dnl
+                       CAIRO_ACCUMULATE_UNQUOTED_BEFORE(cr_var, [$]cr_feature[_]cr_var)
+               ])dnl
++              ])dnl
+       ],[dnl
+               dnl If not enabled, empty the vars so no one accidentally uses them.
+               CAIRO_FEATURE_VARS_FOREACH([cr_var], [unset cr_feature[_]cr_var]m4_newline)

diff --git a/cairo.spec b/cairo.spec
index 1175ed9f5d2c5658683d5e2f0a48a56ebea9038e..c26cf22c998ac54715aa2b140d89c4aa35be6141 100644 (file)
--- a/cairo.spec
+++ b/cairo.spec
@@ -31,6 +31,7 @@ Group:                Libraries
 Source0:       http://cairographics.org/releases/%{name}-%{version}.tar.xz
 # Source0-md5: fc3a5edeba703f906f2241b394f0cced
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-gobject-deps.patch
 URL:           http://cairographics.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 %if %{with gl} || %{with glesv2} || %{with openvg}
@@ -235,6 +236,7 @@ Dokumentacja API Cairo.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}