From 824e4f7d15b78ac99feae1a6cb6859e6255b538d9702cc82e858845e62fa4da1 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 2 Sep 2011 16:01:14 +0000
Subject: [PATCH] Accepting request 80036 from
 home:coolo:branches:openSUSE:Factory

- disable lto for cairo-sphinx as it breaks with as-needed

OBS-URL: https://build.opensuse.org/request/show/80036
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=43
---
 cairo-fix-libs.patch | 13 +++++++++++++
 cairo.changes        |  5 +++++
 cairo.spec           |  4 ++++
 3 files changed, 22 insertions(+)
 create mode 100644 cairo-fix-libs.patch

diff --git a/cairo-fix-libs.patch b/cairo-fix-libs.patch
new file mode 100644
index 0000000..d956bac
--- /dev/null
+++ b/cairo-fix-libs.patch
@@ -0,0 +1,13 @@
+Index: cairo-1.10.2/util/cairo-sphinx/Makefile.am
+===================================================================
+--- cairo-1.10.2.orig/util/cairo-sphinx/Makefile.am	2011-08-29 13:44:11.000000000 +0200
++++ cairo-1.10.2/util/cairo-sphinx/Makefile.am	2011-08-29 14:03:37.386026554 +0200
+@@ -16,7 +16,7 @@ cairo_sphinx_la_LIBADD = -ldl
+ 
+ cairo_sphinx_SOURCES = sphinx.c
+ cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""
+-cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)  $(glib_CFLAGS)
++cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)  $(glib_CFLAGS) -fno-lto
+ cairo_sphinx_LDADD = \
+ 	$(real_pthread_LIBS)					\
+         $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
diff --git a/cairo.changes b/cairo.changes
index 145135c..2197f2d 100644
--- a/cairo.changes
+++ b/cairo.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 29 12:06:00 UTC 2011 - coolo@novell.com
+
+- disable lto for cairo-sphinx as it breaks with as-needed
+
 -------------------------------------------------------------------
 Tue Feb 22 15:19:31 CET 2011 - vuntz@opensuse.org
 
diff --git a/cairo.spec b/cairo.spec
index 845f210..eda3074 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -30,6 +30,8 @@ Source:         %{name}-%{version}.tar.bz2
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dimstar@opensuse.org -- Build modules with -module -avoid-version.
 Patch0:         cairo-modules-no-version.patch
+# PATCH-FIX-OPENSUSE cairo-fix-libs.patch coolo@suse.de -- Fix build with newer ld
+Patch1:         cairo-fix-libs.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -144,10 +146,12 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
 %configure \
+    --disable-silent-rules \
     --with-pic \
     --enable-fc \
     --enable-ft \