pool/cairo
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 81446 from GNOME:Factory

Browse Source 
Pushing most of G:F

OBS-URL: https://build.opensuse.org/request/show/81446
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=39
This commit is contained in:
Sascha Peilicke 2011-09-09 09:09:09 +00:00 committed by Git OBS Bridge
commit 0b342e369a
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cairo-fix-libs.patch Normal file
View File

@ -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 \

6
cairo.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 29 12:06:00 UTC 2011 - coolo@novell.com
- Add cairo-fix-libs.patch: disable lto for cairo-sphinx as it
breaks with -Wl,--as-needed.
-------------------------------------------------------------------
Tue Feb 22 15:19:31 CET 2011 - vuntz@opensuse.org

6
cairo.spec
View File

@ -22,6 +22,7 @@
Name: cairo
Version: 1.10.2
Release: 8
# 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 @@ 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,6 +147,7 @@ cairo.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
NOCONFIGURE=1 ./autogen.sh
@ -166,7 +170,7 @@ NOCONFIGURE=1 ./autogen.sh
%endif
--disable-gtk-doc \
--disable-static
%{__make} %{?jobs:-j %jobs}
%{__make} %{?jobs:-j %jobs} V=1
%install
%makeinstall