Hello community,

here is the log from the commit of package cairo for openSUSE:Factory
checked in at Fri Sep 9 11:09:14 CEST 2011.



--------
--- GNOME/cairo/cairo.changes   2011-02-22 15:20:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/cairo/cairo.changes    2011-09-02 
18:03:14.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 29 12:06:00 UTC 2011 - co...@novell.com
+
+- Add cairo-fix-libs.patch: disable lto for cairo-sphinx as it
+  breaks with -Wl,--as-needed.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  cairo-fix-libs.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cairo.spec ++++++
--- /var/tmp/diff_new_pack.3Uce0j/_old  2011-09-09 11:09:08.000000000 +0200
+++ /var/tmp/diff_new_pack.3Uce0j/_new  2011-09-09 11:09:08.000000000 +0200
@@ -21,7 +21,8 @@
 
 Name:           cairo
 Version:        1.10.2
-Release:        8
+Release:        9
+# FIXME: on update, check that cairo-fix-libs.patch (patch1) is still needed 
(nobody has the right fix for upstream :/)
 License:        LGPLv2.1+ ; MPL ..
 Summary:        Vector Graphics Library with Cross-Device Output Support
 Url:            http://cairographics.org/
@@ -30,6 +31,8 @@
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dims...@opensuse.org -- 
Build modules with -module -avoid-version.
 Patch0:         cairo-modules-no-version.patch
+# PATCH-FIX-OPENSUSE cairo-fix-libs.patch co...@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,6 +147,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -166,7 +170,7 @@
 %endif
     --disable-gtk-doc \
     --disable-static
-%{__make} %{?jobs:-j %jobs}
+%{__make} %{?jobs:-j %jobs} V=1
 
 %install
 %makeinstall

++++++ cairo-fix-libs.patch ++++++
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 \

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to