Accepting request 21874 from GNOME:Factory

Copy from GNOME:Factory/cairo based on submit request 21874 from user vuntz

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

cairo-1.8.6-repeat-modes.patch

@@ -0,0 +1,33 @@
+Index: cairo-1.8.8/src/cairo-xlib-surface.c
+===================================================================
+--- cairo-1.8.8.orig/src/cairo-xlib-surface.c
++++ cairo-1.8.8/src/cairo-xlib-surface.c
+@@ -1425,7 +1425,11 @@ _cairo_xlib_surface_set_attributes (cair
+ 	_cairo_xlib_surface_set_repeat (surface, RepeatNormal);
+ 	break;
+     case CAIRO_EXTEND_REFLECT:
++	_cairo_xlib_surface_set_repeat (surface, RepeatReflect);
++	break;
+     case CAIRO_EXTEND_PAD:
++	_cairo_xlib_surface_set_repeat (surface, RepeatPad);
++	break;
+     default:
+ 	return CAIRO_INT_STATUS_UNSUPPORTED;
+     }
+Index: cairo-1.8.8/src/cairo-xcb-surface.c
+===================================================================
+--- cairo-1.8.8.orig/src/cairo-xcb-surface.c
++++ cairo-1.8.8/src/cairo-xcb-surface.c
+@@ -845,7 +845,12 @@ _cairo_xcb_surface_set_attributes (cairo
+ 	_cairo_xcb_surface_set_repeat (surface, 1);
+ 	break;
+     case CAIRO_EXTEND_REFLECT:
++	_cairo_xcb_surface_set_repeat (surface, 3);
++	break;
+     case CAIRO_EXTEND_PAD:
++	_cairo_xcb_surface_set_repeat (surface, 2);
++	break;
++    default:
+ 	return CAIRO_INT_STATUS_UNSUPPORTED;
+     }
+ 

cairo-1.8.8.tar.bz2

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

cairo-1.9.2.tar.bz2

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

cairo-missing-include-fdo22610.patch

@@ -1,12 +0,0 @@
-Index: cairo-1.9.2/util/cairo-script/csi-replay.c
-===================================================================
---- cairo-1.9.2.orig/util/cairo-script/csi-replay.c
-+++ cairo-1.9.2/util/cairo-script/csi-replay.c
-@@ -3,6 +3,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- static const cairo_user_data_key_t _key;
- 

cairo.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Oct  5 18:16:03 CEST 2009 - vuntz@opensuse.org
+
+- Go back to cairo 1.8.8, for maintenance reasons. Changes from
+  1.8.6 that we had before:
+  + build fixes
+  + fix uninitialised status return within
+    _cairo_clip_intersect_mask().
+  + avoid transforming nearly-degenerate matrices into degenerate
+    matrices (bmo#467423)
+  + a few FreeType font handling bugs were fixed (fdo#21985,
+    fdo#21706)
+  + ensure win32 font backend sets the return value to -1
+    (indicating the absent glyph) if the font index lookup for the
+    unicode character fails (fdo#20255)
+  + improved documentation (fdo#20095, fdo#20154, fdo#20180,
+    fdo#20183, fdo#20182, fdo#20441)
+- Drop cairo-missing-include-fdo22610.patch: not needed with this
+  version.
+- Add cairo-1.8.6-repeat-modes.patch: this is a patch used by
+  Fedora and Ubuntu to improve performance.
+- Add cairo-lcd-filter.patch, similar to the old
+  cairo-lcd-filter-fdo10301.patch patch we had. But we're now using
+  the Debian/Ubuntu/Mandriva version for better maintainability.
+- Explicitly pass --enable-pdf to configure because we require PDF
+  support.
+
 -------------------------------------------------------------------
 Sun Aug  2 01:32:06 CEST 2009 - captain.magnus@opensuse.org
 

cairo.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package cairo (Version 1.9.2)
+# spec file for package cairo (Version 1.8.8)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -32,11 +32,13 @@ License:        LGPL v2.1 or later ; MPL ..
 Group:          Development/Libraries/X11
 Summary:        Vector Graphics Library with Cross-Device Output Support
 Url:            http://cairographics.org/
-Version:        1.9.2
-Release:        2
+Version:        1.8.8
+Release:        1
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM cairo-missing-include.patch-fdo22610.patch captain.magnus@opensuse.org -- Add missing include to silence OBS
-Patch0:         cairo-missing-include-fdo22610.patch
+# PATCH-FIX-UPSTREAM cairo-1.8.6-repeat-modes.patch vuntz@opensuse.org -- Based on patch from Fedora & Ubuntu
+Patch0:         cairo-1.8.6-repeat-modes.patch
+# PATCH-FIX-UPSTREAM cairo-lcd-filter.patch vuntz@opensuse.org -- Improve font rendering on LCD, patch used by Debian, Mandriva & Ubuntu
+Patch1:         cairo-lcd-filter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Last present in SuSE Linux 10.0 (and NLD9):
 Obsoletes:      libpixman <= 0.1.1
@@ -54,12 +56,6 @@ 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.
 
-
-
-Authors:
---------
-    Carl D. Worth <cworth@isi.edu>
-
 %package devel
 License:        LGPL v2.1 or later ; MPL ..
 Summary:        Development environment for cairo
@@ -80,22 +76,16 @@ Obsoletes:      cairo-devel-64bit
 This package contains all files necessary to build binaries using
 cairo.
 
-
-
-Authors:
---------
-    Carl D. Worth <cworth@isi.edu>
-
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-#autoreconf -f -i
-# Only for tests: --enable-pdf --enable-svg
 %configure \
     --with-pic \
     --enable-ps \
+    --enable-pdf \
     --enable-xcb \
     --enable-svg \
     --enable-script \
@@ -119,16 +109,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README
-%dir %{_libdir}/cairo
-%{_libdir}/cairo/*.so.*
 %{_libdir}/*.so.*
-%{_bindir}/cairo-trace
 
 %files devel
 %defattr(-, root, root)
 %doc PORTING_GUIDE
 %{_includedir}/cairo
-%{_libdir}/cairo/*.so
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %if 0%{?suse_version} <= 1110