Accepting request 111449 from home:Zaitor:branches:GNOME:Factory

Enable building of XCB backend, re review from vuntz

OBS-URL: https://build.opensuse.org/request/show/111449
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=54

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
@@ -130,9 +127,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 +145,6 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -166,6 +162,8 @@ NOCONFIGURE=1 ./autogen.sh
     --enable-tee \
 %if %build_xcb_backend
     --enable-xcb \
+    --enable-xlib-xcb \
+    --enable-xlib \
 %else
     --enable-xlib \
 %endif