From eca05c24be87e5f38e0917a82e4d5a63dcd8b0b3 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 18 Oct 2014 14:36:16 +0200 Subject: [PATCH] - another approach to sanitize cairo.pc dependencies (cairo-gobject patch) --- cairo-gobject-deps.patch | 16 ++++++++++++++++ cairo.spec | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 cairo-gobject-deps.patch diff --git a/cairo-gobject-deps.patch b/cairo-gobject-deps.patch new file mode 100644 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 1175ed9..c26cf22 100644 --- 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}} -- 2.44.0