From 874cfef810f4b2691fb94c34f21551a7a4db252d350d5eb75240f06206ebe319 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 11 Sep 2010 09:50:34 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/cairo revision 33.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=7f4715abedccd1292043eec72dd6c31f --- cairo-1.10.0.tar.bz2 | 3 ++ cairo-1.9.14.tar.bz2 | 3 -- cairo-modules-no-version.patch | 25 +++++++++---- cairo.changes | 38 ++++++++++++++++++++ cairo.spec | 65 +++++++++++++++++++++++++++++----- 5 files changed, 116 insertions(+), 18 deletions(-) create mode 100644 cairo-1.10.0.tar.bz2 delete mode 100644 cairo-1.9.14.tar.bz2 diff --git a/cairo-1.10.0.tar.bz2 b/cairo-1.10.0.tar.bz2 new file mode 100644 index 0000000..2cc2943 --- /dev/null +++ b/cairo-1.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96bf6fe75db1489fc483834fc0a79b989c27dae0ad9bdd63414dea2c4a6c9753 +size 22865775 diff --git a/cairo-1.9.14.tar.bz2 b/cairo-1.9.14.tar.bz2 deleted file mode 100644 index 3cb709f..0000000 --- a/cairo-1.9.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cb4d00dc71d1b4ff63ee1844e7e0de2ff1e02cfcebc7506ced32708225f0eec -size 21696619 diff --git a/cairo-modules-no-version.patch b/cairo-modules-no-version.patch index 51c07ea..8c40709 100644 --- a/cairo-modules-no-version.patch +++ b/cairo-modules-no-version.patch @@ -1,7 +1,7 @@ -Index: cairo-1.9.12/util/cairo-fdr/Makefile.am +Index: cairo-1.10.0/util/cairo-fdr/Makefile.am =================================================================== ---- cairo-1.9.12.orig/util/cairo-fdr/Makefile.am -+++ cairo-1.9.12/util/cairo-fdr/Makefile.am +--- cairo-1.10.0.orig/util/cairo-fdr/Makefile.am ++++ cairo-1.10.0/util/cairo-fdr/Makefile.am @@ -9,5 +9,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ cairo_fdr_la_SOURCES = fdr.c cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS) @@ -9,10 +9,10 @@ Index: cairo-1.9.12/util/cairo-fdr/Makefile.am -cairo_fdr_la_LDFLAGS = -module -no-undefined +cairo_fdr_la_LDFLAGS = -module -no-undefined -avoid-version cairo_fdr_la_LIBADD = -ldl -Index: cairo-1.9.12/util/cairo-trace/Makefile.am +Index: cairo-1.10.0/util/cairo-trace/Makefile.am =================================================================== ---- cairo-1.9.12.orig/util/cairo-trace/Makefile.am -+++ cairo-1.9.12/util/cairo-trace/Makefile.am +--- cairo-1.10.0.orig/util/cairo-trace/Makefile.am ++++ cairo-1.10.0/util/cairo-trace/Makefile.am @@ -11,7 +11,7 @@ libcairo_trace_la_SOURCES = trace.c libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \ $(AM_CPPFLAGS) @@ -22,3 +22,16 @@ Index: cairo-1.9.12/util/cairo-trace/Makefile.am libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz if CAIRO_HAS_DL +Index: cairo-1.10.0/util/cairo-sphinx/Makefile.am +=================================================================== +--- cairo-1.10.0.orig/util/cairo-sphinx/Makefile.am ++++ cairo-1.10.0/util/cairo-sphinx/Makefile.am +@@ -11,7 +11,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ + cairo_sphinx_la_SOURCES = fdr.c + cairo_sphinx_la_CPPFLAGS = $(AM_CPPFLAGS) + cairo_sphinx_la_CFLAGS = $(CAIRO_CFLAGS) +-cairo_sphinx_la_LDFLAGS = -module -no-undefined ++cairo_sphinx_la_LDFLAGS = -module -no-undefined -avoid-version + cairo_sphinx_la_LIBADD = -ldl + + cairo_sphinx_SOURCES = sphinx.c diff --git a/cairo.changes b/cairo.changes index d33285b..f2b1354 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue Sep 7 13:12:10 CEST 2010 - vuntz@opensuse.org + +- Do not build the xcb backend: upstream recommends to not use it + for now. +- Add a build_gl_backend define to easily enable the build of the + gl backend, which will add a Mesa-devel BuildRequires. It's + disabled by default. +- Add a build_xcb_backend define to easily enable the build of the + xcb backend, which will add a pkgconfig(xcb) BuildRequires. It's + disabled by default. + +------------------------------------------------------------------- +Tue Sep 7 01:39:54 CEST 2010 - vuntz@opensuse.org + +- Update to version 1.10.0: + + Compared to 1.9.14, this version contains only small fixes. + + The following is the major new changes in cairo 1.10, that were + already in our previous packages of 1.9. + + Inclusion of cairo-trace, a tracing utility. + + Many performance improvements. + + Better support for printing, including file size reductions + when an image is included more than once in the document. + + Resurrect RGB16 format. + + Add cairo_region_t. + + Better interoperation with acceleration architectures, thanks + to the ability to share ardware resources through the new + cairo_device_t. +- Update cairo-modules-no-version.patch to add use -avoid-versoin + for cairo-sphinx too. +- Create a libcairo-gobject2 subpackage for a gobject integration + library. Add pkgconfig(gobject-2.0) BuildRequires for this. +- Rename cairo-utils to cairo-tools, to follow informal packaging + convention. Add appropriate Provides/Obsoletes. +- Explicitly pass --enable-fc, --enable-ft to configure. +- Pass --enable-tee to fix build for the fdr (flight data + recorder), as well as the sphinx tool. + ------------------------------------------------------------------- Wed Jul 28 12:38:42 CEST 2010 - dimstar@opensuse.org diff --git a/cairo.spec b/cairo.spec index 9041bf2..eeee7e4 100644 --- a/cairo.spec +++ b/cairo.spec @@ -1,5 +1,5 @@ # -# spec file for package cairo (Version 1.9.14) +# spec file for package cairo (Version 1.10.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,9 +16,11 @@ # +%define build_xcb_backend 0 +%define build_gl_backend 0 Name: cairo -Version: 1.9.14 +Version: 1.10.0 Release: 1 License: LGPLv2.1+ ; MPL .. Summary: Vector Graphics Library with Cross-Device Output Support @@ -31,14 +33,20 @@ Patch0: cairo-modules-no-version.patch # These libraries are needed only for tests. # Do not enable tests in build systems, it causes build loop! #BuildRequires: librsvg-devel poppler-devel +%if %build_gl_backend +BuildRequires: Mesa-devel +%endif BuildRequires: gtk-doc BuildRequires: pkg-config BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(x11) +%if %build_xcb_backend BuildRequires: pkgconfig(xcb) +%endif BuildRequires: pkgconfig(xrender) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +76,21 @@ in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. +%package -n libcairo-gobject2 +Summary: Vector Graphics Library with Cross-Device Output Support +License: LGPLv2.1+ ; MPL .. +Group: Development/Libraries/X11 + +%description -n libcairo-gobject2 +Cairo is a vector graphics library with cross-device output support. +Currently supported output targets include the X Window System, +in-memory image buffers, and PostScript. Cairo is designed to produce +identical output on all output media while taking advantage of display +hardware acceleration when available. + +This library contains GType declarations for Cairo types. It is also +meant to support gobject-introspection binding creation. + %package -n libcairo-script-interpreter2 Summary: Vector Graphics Library with Cross-Device Output Support License: LGPLv2.1+ ; MPL .. @@ -80,14 +103,17 @@ in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. -%package utils +%package tools Summary: Vector Graphics Library with Cross-Device Output Support -- Utilities License: LGPLv2.1+ ; MPL .. Group: Development/Libraries/X11 # We need an explicit requires since nothing links to the cairo library Requires: libcairo2 = %{version} +# Named changed during development of 11.4 +Provides: %{name}-utils = %{version} +Obsoletes: %{name}-utils < %{version} -%description utils +%description tools Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System, in-memory image buffers, and PostScript. Cairo is designed to produce @@ -101,6 +127,7 @@ License: LGPLv2.1+ ; MPL .. Summary: Development environment for cairo Group: Development/Libraries/X11 Requires: libcairo2 = %{version} +Requires: libcairo-gobject2 = %{version} Requires: libcairo-script-interpreter2 = %{version} Provides: cairo-doc = %{version} Obsoletes: cairo-doc < %{version} @@ -122,11 +149,21 @@ cairo. NOCONFIGURE=1 ./autogen.sh %configure \ --with-pic \ + --enable-fc \ + --enable-ft \ +%if %build_gl_backend + --enable-gl \ +%endif --enable-ps \ --enable-pdf \ - --enable-xcb \ - --enable-svg \ --enable-script \ + --enable-svg \ + --enable-tee \ +%if %build_xcb_backend + --enable-xcb \ +%else + --enable-xlib \ +%endif --disable-gtk-doc \ --disable-static %{__make} %{?jobs:-j %jobs} @@ -141,6 +178,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %postun -n libcairo2 -p /sbin/ldconfig +%post -n libcairo-gobject2 -p /sbin/ldconfig + +%postun -n libcairo-gobject2 -p /sbin/ldconfig + %post -n libcairo-script-interpreter2 -p /sbin/ldconfig %postun -n libcairo-script-interpreter2 -p /sbin/ldconfig @@ -153,22 +194,28 @@ find %{buildroot} -type f -name "*.la" -delete -print %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README %{_libdir}/libcairo.so.* +%files -n libcairo-gobject2 +%defattr(-, root, root) +%{_libdir}/libcairo-gobject.so.2* + %files -n libcairo-script-interpreter2 %defattr(-, root, root) %{_libdir}/libcairo-script-interpreter.so.* -%files utils +%files tools %defattr(-, root, root) +%{_bindir}/cairo-sphinx %{_bindir}/cairo-trace %dir %{_libdir}/cairo -%{_libdir}/cairo/libcairo-trace.so %{_libdir}/cairo/cairo-fdr.so +%{_libdir}/cairo/cairo-sphinx.so +%{_libdir}/cairo/libcairo-trace.so %files devel %defattr(-, root, root) %doc PORTING_GUIDE %doc %{_datadir}/gtk-doc/html/cairo -%{_includedir}/cairo +%{_includedir}/cairo/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %if 0%{?suse_version} <= 1110