Accepting request 360348 from GNOME:Next

Scripted push of project GNOME:Next

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

cairo-1.14.4.tar.xz

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

cairo-1.15.2.tar.xz

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

cairo-render-thin-lines.patch

@@ -1,26 +0,0 @@
-diff --git a/src/cairo-pen.c b/src/cairo-pen.c
-index 61be0e8..8eed775 100644
---- a/src/cairo-pen.c
-+++ b/src/cairo-pen.c
-@@ -284,7 +284,20 @@ _cairo_pen_vertices_needed (double	    tolerance,
- 								     radius);
-     int num_vertices;
- 
--    if (tolerance >= 4*major_axis) { /* XXX relaxed from 2*major for inkscape */
-+    if (tolerance >= 100*major_axis) { /* XXX relaxed from 2*major for inkscape */
-+	/*
-+         * When we decide for num_vertices = 1, the object is not drawn.
-+	 * To avoid https://bugs.freedesktop.org/show_bug.cgi?id=77298
-+	 * we use 100*major -- this just helps us to the 0.001mm line width.
-+	 *
-+	 * The author of the 'XXX relaxed' comment above, originally used 4*major,
-+	 * which is not sufficient for my inkscape lasercutter usecase.
-+	 *
-+	 * Please double check if num_vertices == 1 should never be done (for PDF).
-+	 *
-+	 * jnweiger@gmail.com
-+	 */
-+	// fprintf(stderr, "tolerance=%g major_axis=%g -> num_vertices = 1\n", tolerance, major_axis);
- 	num_vertices = 1;
-     } else if (tolerance >= major_axis) {
- 	num_vertices = 4;

cairo.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sun Dec 13 22:26:26 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.15.2:
+  + Fix xcb/xlib compilation and calls. Make image boxes behave
+    when SHM is not available.
+  + Fix various issues with printing and transparent images on
+    Win32.
+  + Fix thin lines that don't show up when printing in Inkscape due
+    to overly aggressive culling (fdo#77298).
+  + Fix broken printing via pdf when glyph 0 is used for rendering,
+    resulting in missing spaces and letters (fdo#89082).
+  + Fix crash for certain glyphs in opentype fonts (fdo#91902).
+  + Fix incorrect rendering of SVG paths with more than one
+    subpath. If more than one trap is passed in then it's
+    guaranteed that the returned traps will have their left edge to
+    the left of their right edge, but if only one trap is passed in
+    then the function always returns without doing anything
+    (fdo#90984).
+  + Improve rendering with Quarts to better match pixman's blending
+    and filtering behavior.
+- Drop cairo-render-thin-lines.patch: Fixed upstream.
+
+-------------------------------------------------------------------
+Sun Dec 13 22:20:55 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.14.6:
+  + Simple bugfix release to fix one Windows issue.
+
 -------------------------------------------------------------------
 Mon Nov  2 15:11:39 UTC 2015 - zaitor@opensuse.org
 

cairo.spec

@@ -19,18 +19,16 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:           cairo
-Version:        1.14.4
+Version:        1.15.2
 Release:        0
 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:         http://cairographics.org/releases/%{name}-%{version}.tar.xz
+Source:         http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar@opensuse.org -- Build modules with -module -avoid-version.
 Patch0:         cairo-modules-no-version.patch
-# PATCH-FIX-UPSTREAM cairo-render-thin-lines.patch fdo#77298 jw@suse.com -- Fix rendering of thin lines
-Patch1:         cairo-render-thin-lines.patch
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 fcrozat@suse.com -- Fix crash when client and server have different endianness
 Patch2:         cairo-xlib-endianness.patch
 BuildRequires:  gtk-doc
@@ -141,8 +139,6 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
-# fix_for_fdo77298.patch
-%patch1 -p1
 %patch2 -p1
 
 %build