Accepting request 111672 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/111672
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=46

cairo-1.10.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d55629b97bcc3c6b5f87cc8f2a2dc1c75d37a683a8b0ce06567aa2de4f2f849
-size 21339753

cairo-1.12.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af65b766dff11bcf3cba1f92d92a1bc28f78dc2944908a5930a026af06510099
+size 63084508

cairo-fix-libs.patch

@@ -1,13 +0,0 @@
-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 \

cairo.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Mar 26 18:57:45 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 1.12.0:
+  + Introduction of a new procedural pattern: the mesh gradient.
+  + New API to create a callback pattern:
+    cairo_pattern_create_raster_source.
+  + XCB is now a supported backend.
+  + New common API to address any surface as an image and so allow
+    direct modification of the raster data:
+    cairo_surface_create_similar_image, cairo_surface_map_to_image,
+    and cairo_surface_unmap_image.
+  + Many performance improvements.
+  + Introduction of new antialias hints (NONE, FAST, GOOD, BEST).
+  + Introduction of a new observation architecture:
+    cairo_surface_observer_t.
+  + OpenGL backend has seen significant work including the port to
+    GLESv2 and the exploitation of advanced hardware features.
+- Enable build of XCB backend as it's now officially supported: set
+  %build_xcb_backend macro to 1.
+- Note that we don't build Xlib/XCB support as it's disabled by
+  default upstream.
+- Also add pkgconfig(xcb-shm) BuildRequires for XCB/SHM support.
+- Drop cairo-fix-libs.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Tue Feb 14 09:59:51 UTC 2012 - vuntz@opensuse.org
 

cairo.spec

@@ -16,23 +16,20 @@
 #
 
 
-%define build_xcb_backend 0
+%define build_xcb_backend 1
 %define build_gl_backend 0
 
 Name:           cairo
-Version:        1.10.2
+Version:        1.12.0
 Release:        0
-# FIXME: on update, check that cairo-fix-libs.patch (patch1) is still needed (nobody has the right fix for upstream :/)
 Summary:        Vector Graphics Library with Cross-Device Output Support
 License:        LGPL-2.1+ or MPL-1.1
 Group:          System/Libraries
 Url:            http://cairographics.org/
-Source:         %{name}-%{version}.tar.bz2
+Source:         http://cairographics.org/releases/%{name}-%{version}.tar.gz
 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
@@ -50,6 +47,7 @@ BuildRequires:  pkgconfig(pixman-1)
 BuildRequires:  pkgconfig(x11)
 %if %build_xcb_backend
 BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-shm)
 %endif
 BuildRequires:  pkgconfig(xrender)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -130,9 +128,9 @@ This package contains various cairo utilities.
 Summary:        Development environment for cairo
 License:        LGPL-2.1+ or MPL-1.1
 Group:          Development/Libraries/X11
-Requires:       libcairo2 = %{version}
 Requires:       libcairo-gobject2 = %{version}
 Requires:       libcairo-script-interpreter2 = %{version}
+Requires:       libcairo2 = %{version}
 Provides:       cairo-doc = %{version}
 Obsoletes:      cairo-doc < %{version}
 # bug437293
@@ -148,7 +146,6 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -166,9 +163,8 @@ NOCONFIGURE=1 ./autogen.sh
     --enable-tee \
 %if %build_xcb_backend
     --enable-xcb \
-%else
-    --enable-xlib \
 %endif
+    --enable-xlib \
     --disable-gtk-doc \
     --disable-static
 make %{?_smp_mflags} V=1