commit cairo for openSUSE:Factory

2020-03-01 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2020-03-01 21:25:53

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new.26092 (New)


Package is "cairo"

Sun Mar  1 21:25:53 2020 rev:90 rq:779971 version:1.16.0

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2019-09-11 
10:20:38.195508952 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new.26092/cairo.changes   2020-03-01 
21:25:57.696306325 +0100
@@ -1,0 +2,7 @@
+Sun Feb 23 20:24:08 UTC 2020 - Martin Wilck 
+
+- Add an upstream bug fix
+  + cairo-pdf-add-missing-flush.patch: Fixes PDF generation
+see https://gitlab.freedesktop.org/cairo/cairo/issues/342
+
+---

New:

  cairo-pdf-add-missing-flush.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.jprtTM/_old  2020-03-01 21:25:58.836308641 +0100
+++ /var/tmp/diff_new_pack.jprtTM/_new  2020-03-01 21:25:58.840308649 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,8 @@
 Patch2: cairo-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
 # PATCH-FIX-UPSTREAM cairo-composite_color_glyphs.patch -- Fix a thinko in 
composite_color_glyphs
 Patch3: cairo-composite_color_glyphs.patch
+# PATCH-FIX-UPSTREAM cairo-pdf-add-missing-flush.patch - fix pdf generation 
(upstream issue #342)
+Patch4: cairo-pdf-add-missing-flush.patch
 
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig

++ cairo-pdf-add-missing-flush.patch ++
>From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001
From: Adrian Johnson 
Date: Thu, 25 Oct 2018 18:46:17 +1030
Subject: [PATCH] pdf: add missing flush

Issue #342
---
 src/cairo-pdf-surface.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index 7eb61aa..939b2d2 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -7711,6 +7711,11 @@ _cairo_pdf_surface_mask (void
*abstract_surface,
  * and most common, case to handle. */
 if (_cairo_pattern_is_constant_alpha (mask, , ) &&
_can_paint_pattern (source)) {
+
+   status = _cairo_pdf_operators_flush (>pdf_operators);
+   if (unlikely (status))
+   goto cleanup;
+
_cairo_output_stream_printf (surface->output, "q\n");
status = _cairo_pdf_surface_paint_pattern (surface,
   op,
-- 
2.25.0




commit cairo for openSUSE:Factory

2019-09-11 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2019-09-11 10:20:36

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new.7948 (New)


Package is "cairo"

Wed Sep 11 10:20:36 2019 rev:89 rq:728255 version:1.16.0

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-11-06 
13:53:46.720302369 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new.7948/cairo.changes2019-09-11 
10:20:38.195508952 +0200
@@ -1,0 +2,13 @@
+Wed Sep  4 09:59:21 UTC 2019 - Bjørn Lie 
+
+- Add 2 upstream bug fix patches:
+  + cairo-Use-FT_Done_MM_Var-instead-of-free-when-available.patch:
+ft: Use FT_Done_MM_Var instead of free when available in
+cairo_ft_apply_variations. Fixes a crash when using freetype
+>= 2.9
+  + cairo-composite_color_glyphs.patch: Fix a thinko in
+composite_color_glyphs. We can't just move around the contents
+of the passed-in string, we need to make a copy. This was
+showing up as memory corruption in pango.
+
+---

New:

  cairo-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
  cairo-composite_color_glyphs.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.bNKrrW/_old  2019-09-11 10:20:39.291508816 +0200
+++ /var/tmp/diff_new_pack.bNKrrW/_new  2019-09-11 10:20:39.291508816 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,10 @@
 Patch0: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
alarr...@suse.com -- Fix segfault in get_bitmap_surface
 Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+# PATCH-FIX-UPSTREAM 
cairo-Use-FT_Done_MM_Var-instead-of-free-when-available.patch -- ft: Use 
FT_Done_MM_Var instead of free when available in cairo_ft_apply_variations
+Patch2: cairo-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+# PATCH-FIX-UPSTREAM cairo-composite_color_glyphs.patch -- Fix a thinko in 
composite_color_glyphs
+Patch3: cairo-composite_color_glyphs.patch
 
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig
@@ -138,9 +142,7 @@
 cairo.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
 
 %build
 %configure \

++ cairo-Use-FT_Done_MM_Var-instead-of-free-when-available.patch ++
>From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos 
Date: Mon, 19 Nov 2018 12:33:07 +0100
Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
 cairo_ft_apply_variations

Fixes a crash when using freetype >= 2.9
---
 src/cairo-ft-font.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 325dd61b4..981973f78 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2393,7 +2393,11 @@ skip:
 done:
 free (coords);
 free (current_coords);
+#if HAVE_FT_DONE_MM_VAR
+FT_Done_MM_Var (face->glyph->library, ft_mm_var);
+#else
 free (ft_mm_var);
+#endif
 }
 }
 
-- 
2.19.2

++ cairo-composite_color_glyphs.patch ++
>From 79ad01724161502e8d9d2bd384ff1f0174e5df6e Mon Sep 17 00:00:00 2001
From: Matthias Clasen 
Date: Thu, 30 May 2019 07:30:55 -0400
Subject: [PATCH] Fix a thinko in composite_color_glyphs

We can't just move around the contents of the
passed-in string, we need to make a copy. This
was showing up as memory corruption in pango.

See https://gitlab.gnome.org/GNOME/pango/issues/346
---
 src/cairo-surface.c | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index c30f84087..e112b660a 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -2820,6 +2820,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t  
*surface,
 const cairo_clip_t *clip)
 {
 cairo_int_status_t status;
+char *utf8_copy = NULL;
 
 TRACE ((stderr, "%s\n", __FUNCTION__));
 if (unlikely (surface->status))
@@ -2847,6 +2848,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t 
*surface,
 status = CAIRO_INT_STATUS_UNSUPPORTED;
 
 if (_cairo_scaled_font_has_color_glyphs (scaled_font)) {
+utf8_copy = malloc (sizeof (char) * utf8_len);
+memcpy (utf8_copy, utf8, sizeof (char) * utf8_len);
+utf8 = utf8_copy;
+
 status = composite_color_glyphs 

commit cairo for openSUSE:Factory

2018-11-06 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-11-06 13:53:36

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Tue Nov  6 13:53:36 2018 rev:88 rq:643719 version:1.16.0

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-10-17 
08:22:42.006795632 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-11-06 
13:53:46.720302369 +0100
@@ -1,0 +2,8 @@
+Sun Oct 21 08:48:44 UTC 2018 - bjorn@gmail.com
+
+- Update to version 1.16.0:
+  + test: Free resources in pdf2png.
+  + Drop skia backend.
+  + Revert "Correctly decode Adobe CMYK JPEGs in PDF export".
+
+---

Old:

  cairo-1.15.14.tar.xz

New:

  cairo-1.16.0.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.eFA8kZ/_old  2018-11-06 13:53:48.400300081 +0100
+++ /var/tmp/diff_new_pack.eFA8kZ/_new  2018-11-06 13:53:48.404300075 +0100
@@ -19,13 +19,13 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.15.14
+Version:1.16.0
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1-or-later OR MPL-1.1
 Group:  Development/Libraries/C and C++
 URL:https://cairographics.org/
-Source0:https://cairographics.org/snapshots/%{name}-%{version}.tar.xz
+Source0:https://cairographics.org/releases/%{name}-%{version}.tar.xz
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch0: cairo-xlib-endianness.patch

++ cairo-1.15.14.tar.xz -> cairo-1.16.0.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.15.14.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.16.0.tar.xz differ: char 26, line 
1




commit cairo for openSUSE:Factory

2018-10-17 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-10-17 08:21:13

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Wed Oct 17 08:21:13 2018 rev:87 rq:640253 version:1.15.14

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-06-22 
13:28:50.209169092 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-10-17 
08:22:42.006795632 +0200
@@ -1,0 +2,23 @@
+Fri Oct  5 20:36:19 UTC 2018 - bjorn@gmail.com
+
+- Update to version 1.15.14:
+  + Features and Enhancements:
+- Add more FreeeType font color conversions to support
+  COLR/CPAL.
+- Update test reference images against current pixman.
+  + Bugs fixed:
+   - Fix crash when rendering Microsoft's Segoe UI Emoji Regular
+ font.
+   - Fix build breakage with glesv3 enabled due to non-existant
+ glesv3.pc.
+   - Fix memory leaks found by Coverity.
+   - Fix incorrect null ptr handling found by Coverity.
+   - Fix test compilation when font-config is disabled.
+   - Use _cairo_malloc instead of malloc
+ (fdo#101547, CVE-2017-9814).
+   - Fix assertion failure in the freetype backend (fdo#105746).
+- Drop upstream fixed patches:
+  + cairo-fix-assertion-failure-in-freetype-backend.patch.
+  + cairo-CVE-2017-9814.patch.
+
+---

Old:

  cairo-1.15.12.tar.xz
  cairo-CVE-2017-9814.patch
  cairo-fix-assertion-failure-in-freetype-backend.patch

New:

  cairo-1.15.14.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.5omwkd/_old  2018-10-17 08:22:43.714794256 +0200
+++ /var/tmp/diff_new_pack.5omwkd/_new  2018-10-17 08:22:43.718794253 +0200
@@ -12,14 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.15.12
+Version:1.15.14
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1-or-later OR MPL-1.1
@@ -31,10 +31,7 @@
 Patch0: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
alarr...@suse.com -- Fix segfault in get_bitmap_surface
 Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
-# PATCH-FIX-UPSTREAM cairo-fix-assertion-failure-in-freetype-backend.patch 
fdo#105746 -- Fix assertion failure in the freetype backend
-Patch2: cairo-fix-assertion-failure-in-freetype-backend.patch
-# PATCH-FIX-UPSTREAM cairo-CVE-2017-9814.patch boo#1049092 CVE-2017-9814 
fdo#101547 qzh...@suse.com -- Replace malloc with _cairo_malloc and check cmap 
size before allocating.
-Patch3: cairo-CVE-2017-9814.patch
+
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig)
@@ -144,8 +141,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure \

++ cairo-1.15.12.tar.xz -> cairo-1.15.14.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.15.12.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.15.14.tar.xz differ: char 25, 
line 1




commit cairo for openSUSE:Factory

2018-06-22 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-06-22 13:28:47

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Fri Jun 22 13:28:47 2018 rev:86 rq:618169 version:1.15.12

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-04-27 
15:59:46.787297613 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-06-22 
13:28:50.209169092 +0200
@@ -1,0 +2,7 @@
+Wed Jun 20 06:26:30 UTC 2018 - qzh...@suse.com
+
+- Add cairo-CVE-2017-9814.patch: Replace malloc with _cairo_malloc
+  and check cmap size before allocating (boo#1049092,
+  CVE-2017-9814, fdo#101547).
+
+---

New:

  cairo-CVE-2017-9814.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.fa68c4/_old  2018-06-22 13:28:52.733075811 +0200
+++ /var/tmp/diff_new_pack.fa68c4/_new  2018-06-22 13:28:52.733075811 +0200
@@ -33,6 +33,8 @@
 Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
 # PATCH-FIX-UPSTREAM cairo-fix-assertion-failure-in-freetype-backend.patch 
fdo#105746 -- Fix assertion failure in the freetype backend
 Patch2: cairo-fix-assertion-failure-in-freetype-backend.patch
+# PATCH-FIX-UPSTREAM cairo-CVE-2017-9814.patch boo#1049092 CVE-2017-9814 
fdo#101547 qzh...@suse.com -- Replace malloc with _cairo_malloc and check cmap 
size before allocating.
+Patch3: cairo-CVE-2017-9814.patch
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig)
@@ -143,6 +145,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure \

++ cairo-CVE-2017-9814.patch ++
 3190 lines (skipped)




commit cairo for openSUSE:Factory

2018-04-27 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-04-27 15:59:41

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Fri Apr 27 15:59:41 2018 rev:85 rq:600979 version:1.15.12

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-04-19 
15:25:24.217049416 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-04-27 
15:59:46.787297613 +0200
@@ -1,0 +2,6 @@
+Tue Apr 24 21:00:53 UTC 2018 - bjorn@gmail.com
+
+- Add cairo-fix-assertion-failure-in-freetype-backend.patch: Fix
+  assertion failure in the freetype backend (fdo#105746).
+
+---

New:

  cairo-fix-assertion-failure-in-freetype-backend.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.WKpGpq/_old  2018-04-27 15:59:48.175246669 +0200
+++ /var/tmp/diff_new_pack.WKpGpq/_new  2018-04-27 15:59:48.179246523 +0200
@@ -31,6 +31,8 @@
 Patch0: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
alarr...@suse.com -- Fix segfault in get_bitmap_surface
 Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+# PATCH-FIX-UPSTREAM cairo-fix-assertion-failure-in-freetype-backend.patch 
fdo#105746 -- Fix assertion failure in the freetype backend
+Patch2: cairo-fix-assertion-failure-in-freetype-backend.patch
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig)
@@ -140,6 +142,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \

++ cairo-fix-assertion-failure-in-freetype-backend.patch ++
>From 7554822dd0b52d33ec7898e81b59e97164b00142 Mon Sep 17 00:00:00 2001
From: Uli Schlachter 
Date: Sat, 21 Apr 2018 09:37:06 +0200
Subject: Fix assertion failure in the freetype backend

Fonts are kept in a hash table, so when creating a new font, the code
first checks the hash table for an already-existing entry and only then
is a new instance really created. There is an assert that checks that
the key used for the hash table lookup is the same as the instance that
is created later has, because otherwise the hash table was checked
incorrectly.

This assert failed in some conditions.

Fix this by fixing some places that initialised ft hash keys in a wrong
way.

Patch by Behdad Esfahbod and submitted via bugzilla.

Source: https://bugs.freedesktop.org/show_bug.cgi?id=105746#c4
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=105746
Signed-off-by: Uli Schlachter 
---
 src/cairo-ft-font.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 79aef78..9b10708 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -445,7 +445,7 @@ _cairo_ft_unscaled_font_init (cairo_ft_unscaled_font_t 
*unscaled,
 
 if (from_face) {
unscaled->from_face = TRUE;
-   _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, 
face->face_index, face);
+   _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, id, face);
 
 
 unscaled->have_color = FT_HAS_COLOR (face) != 0;
@@ -640,7 +640,7 @@ static cairo_status_t
 _cairo_ft_unscaled_font_create_from_face (FT_Face face,
  cairo_ft_unscaled_font_t **out)
 {
-return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 0, face, out);
+return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 
face->face_index, face, out);
 }
 
 static cairo_bool_t
-- 
cgit v1.1




commit cairo for openSUSE:Factory

2018-04-19 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-04-19 15:25:15

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Thu Apr 19 15:25:15 2018 rev:84 rq:596171 version:1.15.12

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-03-14 
19:23:03.943234853 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-04-19 
15:25:24.217049416 +0200
@@ -1,0 +2,29 @@
+Thu Apr 12 08:16:38 UTC 2018 - bjorn@gmail.com
+
+- Update to version 1.15.12:
+  + The main focus for this release is the addition of Variable
+Font support. Variable fonts are single font files with various
+typography characteristics, such as weight or slant, that users
+of the font can adjust between two points. Effectively this
+enables a single font to behave as multiple fonts.
+  + The Skia backend is disabled in this release, due to severe
+bitrot, and will be removed in future releases. Contact the
+cairo team if you have a need of this backend.
+  + Features and Enhancements:
+- Variable font support.
+- Skia backend is disabled.
+  + API Changes: cairo_font_options_get_variations() and
+cairo_font_options_set_variations() are added.
+  + Bugs fixed:
+- Fix errors in csi-trace --help and --version options.
+- Fix a 'memory leak' in the image compositor, with
+  pixman_glyph_cache_t.
+- Fix access of uninitialized memory found by valgrind
+  (fdo#91271).
+- Fix improper initialization of memory in
+  _cairo_ft_font_face_create_for_pattern() (fdo#105084).
+- Fix multi-monitor virtual desktop with negative coords on
+  Win32 (fdo#100793).
+- Fix issues occuring with older FreeType versions.
+
+---

Old:

  cairo-1.15.10.tar.xz

New:

  cairo-1.15.12.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.zypWg7/_old  2018-04-19 15:25:25.273006542 +0200
+++ /var/tmp/diff_new_pack.zypWg7/_new  2018-04-19 15:25:25.273006542 +0200
@@ -19,13 +19,13 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.15.10
+Version:1.15.12
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPL-2.1+ OR MPL-1.1
+License:LGPL-2.1-or-later OR MPL-1.1
 Group:  Development/Libraries/C and C++
-URL:http://cairographics.org/
-Source: http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
+URL:https://cairographics.org/
+Source0:https://cairographics.org/snapshots/%{name}-%{version}.tar.xz
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch0: cairo-xlib-endianness.patch
@@ -64,7 +64,7 @@
 
 %package -n libcairo2
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPL-2.1+ OR MPL-1.1
+License:LGPL-2.1-or-later OR MPL-1.1
 Group:  System/Libraries
 Provides:   cairo = %{version}
 Obsoletes:  cairo < %{version}
@@ -78,7 +78,7 @@
 
 %package -n libcairo-gobject2
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPL-2.1+ OR MPL-1.1
+License:LGPL-2.1-or-later OR MPL-1.1
 Group:  System/Libraries
 
 %description -n libcairo-gobject2
@@ -93,7 +93,7 @@
 
 %package -n libcairo-script-interpreter2
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPL-2.1+ OR MPL-1.1
+License:LGPL-2.1-or-later OR MPL-1.1
 Group:  System/Libraries
 
 %description -n libcairo-script-interpreter2
@@ -124,7 +124,7 @@
 
 %package devel
 Summary:Development environment for cairo
-License:LGPL-2.1+ OR MPL-1.1
+License:LGPL-2.1-or-later OR MPL-1.1
 Group:  Development/Libraries/X11
 Requires:   libcairo-gobject2 = %{version}
 Requires:   libcairo-script-interpreter2 = %{version}

++ cairo-1.15.10.tar.xz -> cairo-1.15.12.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.15.10.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.15.12.tar.xz differ: char 26, 
line 1




commit cairo for openSUSE:Factory

2018-03-14 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-03-14 19:23:01

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Wed Mar 14 19:23:01 2018 rev:83 rq:584694 version:1.15.10

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-02-21 
14:08:21.656910276 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-03-14 
19:23:03.943234853 +0100
@@ -1,0 +2,5 @@
+Wed Feb 28 16:23:56 UTC 2018 - dims...@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+---



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.p8fnAd/_old  2018-03-14 19:23:06.287151633 +0100
+++ /var/tmp/diff_new_pack.p8fnAd/_new  2018-03-14 19:23:06.287151633 +0100
@@ -24,7 +24,7 @@
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ OR MPL-1.1
 Group:  Development/Libraries/C and C++
-Url:http://cairographics.org/
+URL:http://cairographics.org/
 Source: http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
@@ -106,7 +106,7 @@
 %package tools
 Summary:Utilities for cairo, a Vector Graphics Library with 
Cross-Device Output Support
 # We need an explicit requires since nothing links to the cairo library
-License:GPL-3.0+
+License:GPL-3.0-or-later
 Group:  Development/Libraries/X11
 Requires:   libcairo2 = %{version}
 # Named changed during  development of 11.4
@@ -180,11 +180,11 @@
 %{_libdir}/libcairo-gobject.so.2*
 
 %files -n libcairo-script-interpreter2
-%doc util/cairo-script/COPYING
+%license util/cairo-script/COPYING
 %{_libdir}/libcairo-script-interpreter.so.*
 
 %files tools
-%doc util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3
+%license util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3
 %{_bindir}/cairo-sphinx
 %{_bindir}/cairo-trace
 %dir %{_libdir}/cairo




commit cairo for openSUSE:Factory

2018-02-21 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-02-21 14:08:16

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Wed Feb 21 14:08:16 2018 rev:82 rq:578041 version:1.15.10

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2018-01-16 
09:29:05.174988776 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-02-21 
14:08:21.656910276 +0100
@@ -1,0 +2,7 @@
+Fri Feb 16 14:30:02 UTC 2018 - crrodrig...@opensuse.org
+
+- Add explicit pkgconfig(zlib) and (conditionalized on
+  build_xcb_backend) pkgconfig(xcb-render) BuildRequires: closer
+  alignment with what configure checks for.
+
+---



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.A009ah/_old  2018-02-21 14:08:24.316814492 +0100
+++ /var/tmp/diff_new_pack.A009ah/_new  2018-02-21 14:08:24.320814348 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,6 +41,7 @@
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(zlib)
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -49,7 +50,8 @@
 BuildRequires:  pkgconfig(gl)
 %endif
 %if %{build_xcb_backend}
-BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb) >= 1.6
+BuildRequires:  pkgconfig(xcb-render) >= 1.6
 BuildRequires:  pkgconfig(xcb-shm)
 %endif
 




commit cairo for openSUSE:Factory

2018-01-16 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2018-01-16 09:29:02

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Tue Jan 16 09:29:02 2018 rev:81 rq:562620 version:1.15.10

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-12-15 
14:03:20.790521942 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2018-01-16 
09:29:05.174988776 +0100
@@ -1,0 +2,52 @@
+Mon Dec 18 16:38:19 UTC 2017 - zai...@opensuse.org
+
+- Update to version 1.15.10:
+  + Features and Enhancements:
+- Add support for OpenGL ES 3.0 to the gl backend.
+- Use Reusable streams for forms in Level 3 Postscript.
+- Add CAIRO_MIME_TYPE_EPS mime type for embedding EPS files.
+-  Add CCITT_FAX mime type for PDF and PS surfaces.
+- svg: add a new function to specify the SVG document unit
+  (fdo#90166).
+- Use UTF-8 filenames on Windows.
+  + API Changes: cairo_svg_surface_set_document_unit() and
+cairo_svg_surface_get_document_unit().
+  + Bugs fixed:
+- Fix regression in gles version detection.
+- Fix undefined-behavior with integer math.
+- Handle SOURCE and CLEAR operators when painting color glyphs
+  (fdo#102661).
+- Convert images to rgba or a8 formats when uploading with
+  GLESv2.
+- Use _WIN32 instead of windows.h to check for windows build.
+- Fix sigabrt printing documents with fonts lacking the
+  mandatory .nodef glyph (fdo#102922).
+- Prevent curved strokes in small ctms from being culled from
+  vector surfaces (fdo#103071).
+- Fix painting an unbounded recording surface with the SVG
+  backend.
+- Fix falling back to system font with PDFs using certain
+  embedded fonts, due to truncated font names (fdo#103249).
+- Fix handling of truetype fonts with excessively long font
+  names (fdo#103249).
+- Fix race conditions with cairo_mask_compositor_t
+  (fdo#103037).
+- Fix build error with util/font-view.
+- Fix assertion hit with PDFs using Type 4 fonts rendered with
+  user fonts, due to error when destroying glyph page
+  (fdo#103335).
+- Set default creation date for PDFs.
+- Prevent invalid ptr access for > 4GB images (fdo#98165).
+- Prevent self-copy infinite loop in Postscript surface.
+- Fix padded image crash in Postscript surface.
+- Fix annotation bugs in PDFs and related memory leaks.
+- Fix test failures and other assorted issues in ps and pdf
+  code.
+- Fix code generation when using GCC legacy atomic operations
+  (fdo#103559).
+- Fix various compilation warnings and errors.
+- Fix various distcheck errors with private symbols, doxygen
+  formatting etc.
+- Drop cairo-image-prevent-invalid-ptr-access.patch
+
+---

Old:

  cairo-1.15.8.tar.xz
  cairo-image-prevent-invalid-ptr-access.patch

New:

  cairo-1.15.10.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.5BHWFM/_old  2018-01-16 09:29:06.790913172 +0100
+++ /var/tmp/diff_new_pack.5BHWFM/_new  2018-01-16 09:29:06.794912985 +0100
@@ -19,7 +19,7 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.15.8
+Version:1.15.10
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ OR MPL-1.1
@@ -31,8 +31,6 @@
 Patch0: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
alarr...@suse.com -- Fix segfault in get_bitmap_surface
 Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
-# PATCH-FIX-UPSTREAM cairo-image-prevent-invalid-ptr-access.patch bsc#1007255 
fdo#98165 CVE-2016-9082 alarr...@suse.com -- Fix segfault when using >4GB images
-Patch2: cairo-image-prevent-invalid-ptr-access.patch
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig)
@@ -140,7 +138,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure \

++ cairo-1.15.8.tar.xz -> cairo-1.15.10.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.15.8.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.15.10.tar.xz differ: char 26, 
line 1




commit cairo for openSUSE:Factory

2017-12-15 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-12-15 14:03:05

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Fri Dec 15 14:03:05 2017 rev:80 rq:556455 version:1.15.8

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-09-13 
21:40:51.521354392 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-12-15 
14:03:20.790521942 +0100
@@ -1,0 +2,8 @@
+Tue Dec 12 11:18:44 UTC 2017 - m...@suse.com
+
+- Depend on pkgconfig(gl) and pkgconfig(egl) instead of Mesa-devel.
+  * The pkgconfig(gl) and pkgconfig(egl) are what cairo really
+needs. Mesa-devel is too general and is a bottleneck in
+distribution build. (bnc#1071297)
+
+---



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.WKvGDr/_old  2017-12-15 14:03:22.446442004 +0100
+++ /var/tmp/diff_new_pack.WKvGDr/_new  2017-12-15 14:03:22.450441811 +0100
@@ -47,7 +47,8 @@
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
 %if %{build_gl_backend}
-BuildRequires:  Mesa-devel
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(gl)
 %endif
 %if %{build_xcb_backend}
 BuildRequires:  pkgconfig(xcb)




commit cairo for openSUSE:Factory

2017-09-13 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-09-13 21:40:35

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Wed Sep 13 21:40:35 2017 rev:79 rq:520690 version:1.15.8

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-06-28 
10:32:20.876808694 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-09-13 
21:40:51.521354392 +0200
@@ -1,0 +2,30 @@
+Wed Aug 30 14:35:46 UTC 2017 - zai...@opensuse.org
+
+- Update to version 1.15.8:
+  + This small snapshot provides new colored emoji glyph support,
+and a handful of minor fixes. For a complete log of changes,
+please see
+http://cairographics.org/releases/ChangeLog.1.15.8
+  + Features and Enhancements: Support colored emoji glyphs, stored
+as PNG images in OpenType fonts.
+  + Bug Fixes:
+- pdf:
+  . Fix internal links pointing to other pages, by
+pre-calculating page heights so that link positions can be
+calculated more accurately.
+  . Don't emit /PageLabel dict when no labels defined.
+- image: Fix crash on negative lengths.
+- win32: Fix initialization of mutexes for static builds.
+- font:
+  . Fix color font loading on big-endian systems.
+  . Fix color font support infinite-loop with empty glyphs.
+- Fix off by one check in cairo-image-info.c.
+- Drop cairo-fix-off-by-one-check.patch: Fixed upstream.
+- Run spec-cleaner, modernize spec.
+- Rename 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch
+  to cairo-image-prevent-invalid-ptr-access.patch.
+- Pass enable-gtk-doc instead of disable-gtk-doc to configure, we
+  already have the gtk-doc BuildRequires in place so I can only
+  assume that this was an honest error.
+
+---

Old:

  0001-image-prevent-invalid-ptr-access-for-4GB-images.patch
  cairo-1.15.6.tar.xz
  cairo-fix-off-by-one-check.patch

New:

  cairo-1.15.8.tar.xz
  cairo-image-prevent-invalid-ptr-access.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.cYQUVv/_old  2017-09-13 21:40:52.941154624 +0200
+++ /var/tmp/diff_new_pack.cYQUVv/_new  2017-09-13 21:40:52.941154624 +0200
@@ -19,10 +19,10 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.15.6
+Version:1.15.8
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPL-2.1+ or MPL-1.1
+License:LGPL-2.1+ OR MPL-1.1
 Group:  Development/Libraries/C and C++
 Url:http://cairographics.org/
 Source: http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
@@ -31,12 +31,10 @@
 Patch0: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
alarr...@suse.com -- Fix segfault in get_bitmap_surface
 Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
-# PATCH-FIX-UPSTREAM cairo-fix-off-by-one-check.patch fdo#101427 
zai...@opensuse.org -- Fix off by one check in cairo-image-info.c
-Patch2: cairo-fix-off-by-one-check.patch
-# PATCH-FIX-UPSTREAM 
0001-image-prevent-invalid-ptr-access-for-4GB-images.patch bsc#1007255 
fdo#98165 CVE-2016-9082 alarr...@suse.com -- Fix segfault when using >4GB images
-Patch3: 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch
+# PATCH-FIX-UPSTREAM cairo-image-prevent-invalid-ptr-access.patch bsc#1007255 
fdo#98165 CVE-2016-9082 alarr...@suse.com -- Fix segfault when using >4GB images
+Patch2: cairo-image-prevent-invalid-ptr-access.patch
 BuildRequires:  gtk-doc
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gobject-2.0)
@@ -45,7 +43,6 @@
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrender)
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -66,7 +63,7 @@
 
 %package -n libcairo2
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPL-2.1+ or MPL-1.1
+License:LGPL-2.1+ OR MPL-1.1
 Group:  System/Libraries
 Provides:   cairo = %{version}
 Obsoletes:  cairo < %{version}
@@ -80,7 +77,7 @@
 
 %package -n libcairo-gobject2
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPL-2.1+ or MPL-1.1
+License:LGPL-2.1+ 

commit cairo for openSUSE:Factory

2017-06-28 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-06-28 10:32:16

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Wed Jun 28 10:32:16 2017 rev:78 rq:505122 version:1.15.6

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-06-19 
13:23:07.362701320 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-06-28 
10:32:20.876808694 +0200
@@ -1,0 +2,7 @@
+Tue Jun 20 11:20:29 UTC 2017 - alarr...@suse.com
+
+- Add 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch to
+  fix a segfault when using >4GB images since int values were used
+  for pointer operations (bsc#1007255, fdo#98165, CVE-2016-9082).
+
+---

New:

  0001-image-prevent-invalid-ptr-access-for-4GB-images.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.Vqu9Ir/_old  2017-06-28 10:32:22.156627628 +0200
+++ /var/tmp/diff_new_pack.Vqu9Ir/_new  2017-06-28 10:32:22.156627628 +0200
@@ -33,6 +33,8 @@
 Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
 # PATCH-FIX-UPSTREAM cairo-fix-off-by-one-check.patch fdo#101427 
zai...@opensuse.org -- Fix off by one check in cairo-image-info.c
 Patch2: cairo-fix-off-by-one-check.patch
+# PATCH-FIX-UPSTREAM 
0001-image-prevent-invalid-ptr-access-for-4GB-images.patch bsc#1007255 
fdo#98165 CVE-2016-9082 alarr...@suse.com -- Fix segfault when using >4GB images
+Patch3: 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch
 BuildRequires:  gtk-doc
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontconfig)
@@ -141,6 +143,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure \

++ 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch ++
>From c812d1c1935cccf096a60ad904e640fdc83bd41c Mon Sep 17 00:00:00 2001
From: Adrian Johnson 
Date: Thu, 20 Oct 2016 21:12:30 +1030
Subject: [PATCH] image: prevent invalid ptr access for > 4GB images

Image data is often accessed using:

  image->data + y * image->stride

On 64-bit achitectures if the image data is > 4GB, this computation
will overflow since both y and stride are 32-bit types.

https://bugs.freedesktop.org/show_bug.cgi?id=98165
---
 boilerplate/cairo-boilerplate.c | 4 +++-
 src/cairo-image-compositor.c| 4 ++--
 src/cairo-image-surface-private.h   | 2 +-
 src/cairo-mesh-pattern-rasterizer.c | 2 +-
 src/cairo-png.c | 2 +-
 src/cairo-script-surface.c  | 3 ++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 7fdbf79..4804dea 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -42,6 +42,7 @@
 #undef CAIRO_VERSION_H
 #include "../cairo-version.h"
 
+#include 
 #include 
 #include 
 #include 
@@ -976,7 +977,8 @@ cairo_surface_t *
 cairo_boilerplate_image_surface_create_from_ppm_stream (FILE *file)
 {
 char format;
-int width, height, stride;
+int width, height;
+ptrdiff_t stride;
 int x, y;
 unsigned char *data;
 cairo_surface_t *image = NULL;
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
index 48072f8..3ca0006 100644
--- a/src/cairo-image-compositor.c
+++ b/src/cairo-image-compositor.c
@@ -1575,7 +1575,7 @@ typedef struct _cairo_image_span_renderer {
 pixman_image_t *src, *mask;
 union {
struct fill {
-   int stride;
+   ptrdiff_t stride;
uint8_t *data;
uint32_t pixel;
} fill;
@@ -1594,7 +1594,7 @@ typedef struct _cairo_image_span_renderer {
struct finish {
cairo_rectangle_int_t extents;
int src_x, src_y;
-   int stride;
+   ptrdiff_t stride;
uint8_t *data;
} mask;
 } u;
diff --git a/src/cairo-image-surface-private.h 
b/src/cairo-image-surface-private.h
index 8ca694c..7e78d61 100644
--- a/src/cairo-image-surface-private.h
+++ b/src/cairo-image-surface-private.h
@@ -71,7 +71,7 @@ struct _cairo_image_surface {
 
 int width;
 int height;
-int stride;
+ptrdiff_t stride;
 int depth;
 
 unsigned owns_data : 1;
diff --git a/src/cairo-mesh-pattern-rasterizer.c 
b/src/cairo-mesh-pattern-rasterizer.c
index 1b63ca8..e7f0db6 100644
--- a/src/cairo-mesh-pattern-rasterizer.c
+++ b/src/cairo-mesh-pattern-rasterizer.c
@@ -470,7 +470,7 @@ draw_pixel (unsigned char *data, int width, int height, int 
stride,
tg += tg >> 16;
tb += tb >> 16;
 
-   *((uint32_t*) (data + y*stride + 4*x)) = ((ta << 16) 

commit cairo for openSUSE:Factory

2017-06-19 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-06-19 13:23:04

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Mon Jun 19 13:23:04 2017 rev:77 rq:504299 version:1.15.6

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-06-12 
15:08:17.960661542 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-06-19 
13:23:07.362701320 +0200
@@ -1,0 +2,29 @@
+Fri Jun 16 19:11:41 UTC 2017 - zai...@opensuse.org
+
+- Update to version 1.15.6:
+  + Detect if variable fonts have synthesized bold/italic or
+non-default variants, and use a fallback font where needed.
+  + Restore MacOSX 10.4 support. Cairo had dropped 10.4 support
+when moving to the CoreText API.  Now we automatically detect
+which API to use via dynamic linking, so can resume supporting
+this older version of MacOSX.
+  + Fix error reporting in the xcb backend if fallback fails.
+Instead of returning NULL when the X11 server can't do some
+operation, return a surface in an error state.
+  + Call XSync in the xlib backend before setting the error handler
+to ignore errors for certain requests, to make sure all pending
+errors are handled first.
+  + Fix text-glyph-range for quartz-font.  Use 0x instead of 0
+for invalid index tracking.
+  + Fix handling of Supplementary Multilingual Plane (SMP) Unicode
+characters in quartz-font.
+  + Fix various issues in the drm backend including updating API
+usage and general code cleanup.
+  + Clarify documentation regarding device scale inheritance and
+the units used in cairo_surface_create_similar_image
+(fdo#99094).
+- Drop cairo-pdf-fixes.patch: Fixed upstream.
+- Add cairo-fix-off-by-one-check.patch: Fix off by one check in
+  cairo-image-info.c (fdo#101427).
+
+---

Old:

  cairo-1.15.4.tar.xz
  cairo-pdf-fixes.patch

New:

  cairo-1.15.6.tar.xz
  cairo-fix-off-by-one-check.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.Yrnk4J/_old  2017-06-19 13:23:09.218439684 +0200
+++ /var/tmp/diff_new_pack.Yrnk4J/_new  2017-06-19 13:23:09.222439120 +0200
@@ -19,7 +19,7 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.15.4
+Version:1.15.6
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ or MPL-1.1
@@ -29,10 +29,10 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch0: cairo-xlib-endianness.patch
-# PATCH-FIX-UPSTREAM cairo-pdf-fixes.patch fdo#99630 zai...@opensuse.org -- 
Three minor pdf fixes from upstream git.
-Patch1: cairo-pdf-fixes.patch
 # PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
alarr...@suse.com -- Fix segfault in get_bitmap_surface
-Patch2: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+# PATCH-FIX-UPSTREAM cairo-fix-off-by-one-check.patch fdo#101427 
zai...@opensuse.org -- Fix off by one check in cairo-image-info.c
+Patch2: cairo-fix-off-by-one-check.patch
 BuildRequires:  gtk-doc
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontconfig)
@@ -105,9 +105,9 @@
 
 %package tools
 Summary:Utilities for cairo, a Vector Graphics Library with 
Cross-Device Output Support
+# We need an explicit requires since nothing links to the cairo library
 License:GPL-3.0+
 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}

++ cairo-1.15.4.tar.xz -> cairo-1.15.6.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.15.4.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.15.6.tar.xz differ: char 25, line 
1

++ cairo-fix-off-by-one-check.patch ++
>From 57b40507dda3f58dfc8635548d606b86dc7bcf51 Mon Sep 17 00:00:00 2001
From: Adrian Johnson 
Date: Thu, 15 Jun 2017 20:53:29 +0930
Subject: Fix off by one check in cairo-image-info.c

https://bugs.freedesktop.org/show_bug.cgi?id=101427

diff --git a/src/cairo-image-info.c b/src/cairo-image-info.c
index 2ecce95..3b4cf6e 100644
--- a/src/cairo-image-info.c
+++ b/src/cairo-image-info.c
@@ -154,7 +154,7 @@ _cairo_image_info_get_jpeg_info (cairo_image_info_t *info,
   

commit cairo for openSUSE:Factory

2017-06-12 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-06-12 15:08:16

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Mon Jun 12 15:08:16 2017 rev:76 rq:501744 version:1.15.4

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-03-22 
23:05:27.404790348 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-06-12 
15:08:17.960661542 +0200
@@ -1,0 +2,7 @@
+Wed Jun  7 10:06:55 UTC 2017 - alarr...@suse.com
+
+- Add cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff to
+  fix a segfault in get_bitmap_surface due to malformed font
+  (bsc#1036789, fdo#100763, CVE-2017-7475).
+
+---

New:

  cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.l9IP08/_old  2017-06-12 15:08:19.252479180 +0200
+++ /var/tmp/diff_new_pack.l9IP08/_new  2017-06-12 15:08:19.252479180 +0200
@@ -31,6 +31,8 @@
 Patch0: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-pdf-fixes.patch fdo#99630 zai...@opensuse.org -- 
Three minor pdf fixes from upstream git.
 Patch1: cairo-pdf-fixes.patch
+# PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff 
alarr...@suse.com -- Fix segfault in get_bitmap_surface
+Patch2: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
 BuildRequires:  gtk-doc
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontconfig)
@@ -103,9 +105,9 @@
 
 %package tools
 Summary:Utilities for cairo, a Vector Graphics Library with 
Cross-Device Output Support
-# We need an explicit requires since nothing links to the cairo library
 License:GPL-3.0+
 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}
@@ -138,6 +140,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \

++ cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff ++
Index: cairo-1.15.4/src/cairo-ft-font.c
===
--- cairo-1.15.4.orig/src/cairo-ft-font.c
+++ cairo-1.15.4/src/cairo-ft-font.c
@@ -1149,7 +1149,7 @@ _get_bitmap_surface (FT_Bitmap *bi
 width = bitmap->width;
 height = bitmap->rows;
 
-if (width == 0 || height == 0) {
+if (width == 0 || height == 0 || bitmap->buffer == NULL) {
*surface = (cairo_image_surface_t *)
cairo_image_surface_create_for_data (NULL, format, 0, 0, 0);
return (*surface)->base.status;



commit cairo for openSUSE:Factory

2017-03-22 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-03-22 23:05:25

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Wed Mar 22 23:05:25 2017 rev:75 rq:481362 version:1.15.4

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-02-26 
17:07:21.625156491 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-03-22 
23:05:27.404790348 +0100
@@ -1,0 +2,5 @@
+Wed Mar  8 19:41:41 UTC 2017 - zai...@opensuse.org
+
+- Rebase cairo-pdf-fixes.patch: Add commit to fix fdo#100029.
+
+---



Other differences:
--
++ cairo-pdf-fixes.patch ++
--- /var/tmp/diff_new_pack.pfokuy/_old  2017-03-22 23:05:28.848585732 +0100
+++ /var/tmp/diff_new_pack.pfokuy/_new  2017-03-22 23:05:28.852585165 +0100
@@ -139,3 +139,30 @@
  static cairo_int_status_t
 -- 
 cgit v0.10.2
+
+From 1a307123af14cfa50a0c35819cfaee79f0ade1ba Mon Sep 17 00:00:00 2001
+From: Adrian Johnson 
+Date: Thu, 2 Mar 2017 19:14:04 +1030
+Subject: pdf-operators: fix bug in line wrapping
+
+patch by jmmor...@sonic.net
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100029
+
+diff --git a/src/cairo-pdf-operators.c b/src/cairo-pdf-operators.c
+index 99a8dc8..b4ac253 100644
+--- a/src/cairo-pdf-operators.c
 b/src/cairo-pdf-operators.c
+@@ -319,7 +319,8 @@ _word_wrap_stream_write (cairo_output_stream_t  *base,
+   if (*data == '\n' || stream->column >= stream->max_column) {
+   _cairo_output_stream_printf (stream->output, "\n");
+   stream->column = 0;
+-  } else if (*data == '<') {
++  }
++  if (*data == '<') {
+   stream->state = WRAP_STATE_HEXSTRING;
+   } else if (*data == '(') {
+   stream->state = WRAP_STATE_STRING;
+-- 
+cgit v0.10.2
+




commit cairo for openSUSE:Factory

2017-02-26 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-02-26 17:07:20

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-02-14 
00:40:05.448629220 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-02-26 
17:07:21.625156491 +0100
@@ -1,0 +2,6 @@
+Mon Feb 13 22:13:52 UTC 2017 - zai...@opensuse.org
+
+- Add cairo-pdf-fixes.patch: Three minor pdf fixes from upstream
+  git (fdo#99630).
+
+---

New:

  cairo-pdf-fixes.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.X37xOF/_old  2017-02-26 17:07:22.493024850 +0100
+++ /var/tmp/diff_new_pack.X37xOF/_new  2017-02-26 17:07:22.497024243 +0100
@@ -29,6 +29,8 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch0: cairo-xlib-endianness.patch
+# PATCH-FIX-UPSTREAM cairo-pdf-fixes.patch fdo#99630 zai...@opensuse.org -- 
Three minor pdf fixes from upstream git.
+Patch1: cairo-pdf-fixes.patch
 BuildRequires:  gtk-doc
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontconfig)
@@ -135,6 +137,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \

++ cairo-pdf-fixes.patch ++
>From c7e87cd9df401f2c5a62534697d12a4e0afda2ce Mon Sep 17 00:00:00 2001
From: Kouhei Sutou 
Date: Wed, 4 Jan 2017 23:32:59 +0900
Subject: pdf: Remove duplicated item


diff --git a/src/cairo-pdf.h b/src/cairo-pdf.h
index 1e46a7c..74117f4 100644
--- a/src/cairo-pdf.h
+++ b/src/cairo-pdf.h
@@ -120,7 +120,6 @@ cairo_pdf_surface_add_outline (cairo_surface_t  
  *surface,
  * @CAIRO_PDF_METADATA_SUBJECT: The document subject (Since 1.16)
  * @CAIRO_PDF_METADATA_KEYWORDS: The document keywords (Since 1.16)
  * @CAIRO_PDF_METADATA_CREATOR: The document creator (Since 1.16)
- * @CAIRO_PDF_METADATA_TITLE: The document title (Since 1.16)
  * @CAIRO_PDF_METADATA_CREATE_DATE: The document creation date (Since 1.16)
  * @CAIRO_PDF_METADATA_MOD_DATE: The document modification date (Since 1.16)
  *
-- 
cgit v0.10.2


>From dd4706d0a9d123d3aa4284ac9ab35fbe165278b2 Mon Sep 17 00:00:00 2001
From: Kouhei Sutou 
Date: Wed, 4 Jan 2017 23:38:17 +0900
Subject: pdf: Fix wrong cairo_pdf_outline_flags_t item prefix


diff --git a/src/cairo-pdf-interchange.c b/src/cairo-pdf-interchange.c
index 18dd4d8..1fc8197 100644
--- a/src/cairo-pdf-interchange.c
+++ b/src/cairo-pdf-interchange.c
@@ -579,9 +579,9 @@ cairo_pdf_interchange_write_outline (cairo_pdf_surface_t 
*surface)
 
if (outline->flags) {
int flags = 0;
-   if (outline->flags & CAIRO_BOOKMARK_FLAG_ITALIC)
+   if (outline->flags & CAIRO_PDF_OUTLINE_FLAG_ITALIC)
flags |= 1;
-   if (outline->flags & CAIRO_BOOKMARK_FLAG_BOLD)
+   if (outline->flags & CAIRO_PDF_OUTLINE_FLAG_BOLD)
flags |= 2;
_cairo_output_stream_printf (surface->output,
 "   /F %d\n",
@@ -1338,7 +1338,7 @@ _cairo_pdf_interchange_add_outline (cairo_pdf_surface_t   
 *surface,
 /* Update Count */
 outline = outline->parent;
 while (outline) {
-   if (outline->flags & CAIRO_BOOKMARK_FLAG_OPEN) {
+   if (outline->flags & CAIRO_PDF_OUTLINE_FLAG_OPEN) {
outline->count++;
} else {
outline->count--;
diff --git a/src/cairo-pdf.h b/src/cairo-pdf.h
index 74117f4..040c0ed 100644
--- a/src/cairo-pdf.h
+++ b/src/cairo-pdf.h
@@ -87,9 +87,9 @@ cairo_pdf_surface_set_size (cairo_surface_t   *surface,
 
 /**
  * cairo_pdf_outline_flags_t:
- * @CAIRO_BOOKMARK_FLAG_OPEN: The outline item defaults to open in the PDF 
viewer (Since 1.16)
- * @CAIRO_BOOKMARK_FLAG_BOLD: The outline item is displayed by the viewer in 
bold text (Since 1.16)
- * @CAIRO_BOOKMARK_FLAG_ITALIC: The outline item is displayed by the viewer in 
italic text (Since 1.16)
+ * @CAIRO_PDF_OUTLINE_FLAG_OPEN: The outline item defaults to open in the PDF 
viewer (Since 1.16)
+ * @CAIRO_PDF_OUTLINE_FLAG_BOLD: The outline item is displayed by the viewer 
in bold text (Since 1.16)
+ * @CAIRO_PDF_OUTLINE_FLAG_ITALIC: The outline item is displayed by the viewer 
in italic text (Since 1.16)
  *
  * #cairo_pdf_outline_flags_t is used by the
  * cairo_pdf_surface_add_outline() function specify the attributes of
@@ -99,9 +99,9 @@ cairo_pdf_surface_set_size (cairo_surface_t   *surface,
  * Since: 1.16
  **/

commit cairo for openSUSE:Factory

2017-02-13 Thread root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2017-02-14 00:40:04

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2017-01-10 
10:41:14.446306181 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2017-02-14 
00:40:05.448629220 +0100
@@ -1,0 +2,6 @@
+Sat Feb 11 13:53:32 UTC 2017 - jeng...@inai.de
+
+- Fix RPM groups; update summaries.
+  Remove useless --with-pic which is only for static libs.
+
+---



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.cQnouT/_old  2017-02-14 00:40:08.064259948 +0100
+++ /var/tmp/diff_new_pack.cQnouT/_new  2017-02-14 00:40:08.068259384 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ or MPL-1.1
-Group:  System/Libraries
+Group:  Development/Libraries/C and C++
 Url:http://cairographics.org/
 Source: http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
 Source99:   baselibs.conf
@@ -100,10 +100,10 @@
 hardware acceleration when available.
 
 %package tools
-Summary:Vector Graphics Library with Cross-Device Output Support -- 
Utilities
+Summary:Utilities for cairo, a Vector Graphics Library with 
Cross-Device Output Support
+# We need an explicit requires since nothing links to the cairo library
 License:GPL-3.0+
 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}
@@ -138,7 +138,6 @@
 
 %build
 %configure \
---with-pic \
 --enable-fc \
 --enable-ft \
 %if %{build_gl_backend}




commit cairo for openSUSE:Factory

2016-09-10 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2016-09-11 00:53:05

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2016-08-16 
13:02:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2016-09-11 
00:53:08.0 +0200
@@ -1,0 +2,7 @@
+Mon Sep  5 07:36:33 UTC 2016 - badshah...@gmail.com
+
+- Add cairo-xlib-double-free.patch to fix double free in
+  _get_image_surface(); patch taken from upstream git (fdo#91967,
+  boo#997189).
+
+---

New:

  cairo-xlib-double-free.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.r52p3N/_old  2016-09-11 00:53:09.0 +0200
+++ /var/tmp/diff_new_pack.r52p3N/_new  2016-09-11 00:53:09.0 +0200
@@ -33,6 +33,8 @@
 Patch2: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch 
fdo#93891 bsc#958844 h...@suse.com -- Fix mutex deadlock on certain documents.
 Patch3: cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch
+# PATCH-FIX-UPSTREAM cairo-xlib-double-free.patch fdo#91967 boo#997189 
badshah...@gmail.com -- xlib: Fix double free in _get_image_surface(); patch 
taken from upstream git.
+Patch4: cairo-xlib-double-free.patch
 BuildRequires:  gtk-doc
 # Needed by patch0
 BuildRequires:  libtool
@@ -143,6 +145,7 @@
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # Needed by patch0 and patch1

++ cairo-xlib-double-free.patch ++
>From c088ba1faab9579efdaed7a524124901a17801b0 Mon Sep 17 00:00:00 2001
From: Uli Schlachter 
Date: Sat, 18 Jun 2016 15:08:52 +0200
Subject: [PATCH] xlib: Fix double free in _get_image_surface()

If XShmGetImage() fails, the code tries to continue with its normal,
non-shared-memory path. However, the image variable, which was previously set to
NULL, now points to an already-destroyed surface, causing a double-free when the
function cleans up after itself (actually, its an assertion failure because the
reference count of the surface is zero, but technically this is still a double
free).

Fix this by setting image=NULL after destroying the surface that this refers to,
to make sure this surface will not be destroyed again.

While we are here (multiple changes in a single commit are bad...), also fix the
cleanup done in bail. In practice, >base should be safe when image==NULL,
because this just adds some offset to the pointer (the offset here is actually
zero, so this doesn't do anything at all). However, the C standard does not
require this to be safe, so let's handle this case specially.

Note that anything that is fixed by this change is still buggy, because the only
reason why XShmGetImage() could fail would be BadDrawable, meaning that the
target we draw to does not exist or was already destroyed. This patch will
likely just cause X11 errors elsewhere and drawing to (possible) invalid
drawables is not supported by cairo anyway. This means that if SHM fails, the
following fallback code has a high chance of failing, too.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=91967
Signed-off-by: Uli Schlachter 
---
 src/cairo-xlib-surface.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 3f407c3..555c1fe 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -807,6 +807,7 @@ _get_image_surface (cairo_xlib_surface_t*surface,
}
 
cairo_surface_destroy (>base);
+   image = NULL;
}
 }
 
@@ -1011,7 +1012,8 @@ _get_image_surface (cairo_xlib_surface_t*surface,
 cairo_device_release (>base);
 
 if (unlikely (status)) {
-   cairo_surface_destroy (>base);
+   if (image)
+   cairo_surface_destroy (>base);
return _cairo_surface_create_in_error (status);
 }
 
-- 
2.8.1





commit cairo for openSUSE:Factory

2016-08-16 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2016-08-16 13:02:28

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2016-03-29 
14:25:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2016-08-16 
13:02:29.0 +0200
@@ -1,0 +2,19 @@
+Wed Jul 20 21:23:25 CEST 2016 - h...@suse.com
+
+- Add back cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch
+  (bsc#958844, fdo#93891). This is still not fixed upstream.
+
+---
+Wed Apr 13 08:08:36 UTC 2016 - idon...@suse.com
+
+- Update to GNOME 3.20  Fate#318572
+- Remove patch:
+  cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch.
+
+---
+Mon Dec 21 21:53:52 CET 2015 - h...@suse.com
+
+- Add cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch
+  to fix mutex deadlocks on certain documents (bsc#958844).
+
+---

New:

  cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.bFwqFk/_old  2016-08-16 13:02:32.0 +0200
+++ /var/tmp/diff_new_pack.bFwqFk/_new  2016-08-16 13:02:32.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,8 @@
 Patch0: cairo-modules-no-version.patch
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch2: cairo-xlib-endianness.patch
+# PATCH-FIX-UPSTREAM cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch 
fdo#93891 bsc#958844 h...@suse.com -- Fix mutex deadlock on certain documents.
+Patch3: cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch
 BuildRequires:  gtk-doc
 # Needed by patch0
 BuildRequires:  libtool
@@ -140,6 +142,7 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Needed by patch0 and patch1

++ cairo-bsc958844-deadlock-on-scaled-font-cache-reset.patch ++
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index ac80c97..a22b36e 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -818,23 +818,35 @@ _cairo_scaled_font_thaw_cache (cairo_scaled_font_t 
*scaled_font)
 void
 _cairo_scaled_font_reset_cache (cairo_scaled_font_t *scaled_font)
 {
+cairo_scaled_glyph_page_t *page;
+
 CAIRO_MUTEX_LOCK (scaled_font->mutex);
 assert (! scaled_font->cache_frozen);
 assert (! scaled_font->global_cache_frozen);
 CAIRO_MUTEX_LOCK (_cairo_scaled_glyph_page_cache_mutex);
-while (! cairo_list_is_empty (_font->glyph_pages)) {
-   cairo_scaled_glyph_page_t *page =
-   cairo_list_first_entry (_font->glyph_pages,
-   cairo_scaled_glyph_page_t,
-   link);
 
+cairo_list_foreach_entry (page,
+ cairo_scaled_glyph_page_t,
+ _font->glyph_pages,
+ link) {
cairo_scaled_glyph_page_cache.size -= page->cache_entry.size;
_cairo_hash_table_remove (cairo_scaled_glyph_page_cache.hash_table,
  (cairo_hash_entry_t *) >cache_entry);
+}
 
+CAIRO_MUTEX_UNLOCK (_cairo_scaled_glyph_page_cache_mutex);
+
+/* Destroy scaled_font's pages while holding its lock only, and not the
+ * global page cache lock. The destructor can cause us to recurse and
+ * end up back here for a different scaled_font. */
+
+while (! cairo_list_is_empty (_font->glyph_pages)) {
+   page = cairo_list_first_entry (_font->glyph_pages,
+  cairo_scaled_glyph_page_t,
+  link);
_cairo_scaled_glyph_page_destroy (scaled_font, page);
 }
-CAIRO_MUTEX_UNLOCK (_cairo_scaled_glyph_page_cache_mutex);
+
 CAIRO_MUTEX_UNLOCK (scaled_font->mutex);
 }
 



commit cairo for openSUSE:Factory

2016-03-29 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2016-03-29 14:25:39

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2015-11-11 
10:29:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2016-03-29 
14:25:41.0 +0200
@@ -1,0 +2,29 @@
+Sun Dec 13 22:26:26 UTC 2015 - zai...@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 - zai...@opensuse.org
+
+- Update to version 1.14.6:
+  + Simple bugfix release to fix one Windows issue.
+
+---

Old:

  cairo-1.14.4.tar.xz
  cairo-render-thin-lines.patch

New:

  cairo-1.15.2.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.5MPCbV/_old  2016-03-29 14:25:42.0 +0200
+++ /var/tmp/diff_new_pack.5MPCbV/_new  2016-03-29 14:25:42.0 +0200
@@ -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 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
-# PATCH-FIX-UPSTREAM cairo-render-thin-lines.patch fdo#77298 j...@suse.com -- 
Fix rendering of thin lines
-Patch1: cairo-render-thin-lines.patch
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch2: cairo-xlib-endianness.patch
 BuildRequires:  gtk-doc
@@ -141,8 +139,6 @@
 %prep
 %setup -q
 %patch0 -p1
-# fix_for_fdo77298.patch
-%patch1 -p1
 %patch2 -p1
 
 %build

++ cairo-1.14.4.tar.xz -> cairo-1.15.2.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.14.4.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.15.2.tar.xz differ: char 26, line 
1




commit cairo for openSUSE:Factory

2015-11-11 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2015-11-11 10:28:58

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is "cairo"

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2015-08-17 
15:34:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2015-11-11 
10:29:00.0 +0100
@@ -1,0 +2,38 @@
+Mon Nov  2 15:11:39 UTC 2015 - zai...@opensuse.org
+
+- Update to version 1.14.4:
+  + Avoid appending empty slots to user data arrays. Fixes a memory
+consumption regression since commit 9341c254a.
+  + Return a better error (file-not-found) when setting up pango on
+devices where the font files don't have read permissions.
+  + Fix regression in the font size of canvas text in Inkscape when
+compiled with the Quartz backend (fdo#84324).
+  + Fix _cairo_gl_shader_bind_matrix() to maintain compatibility
+with OpenGL ES 2.0. Manually transpose the matrix.
+  + Fix incorrect font descriptor conversion when the font matrix
+yy is negative (fdo#90538).
+  + Fix crash when using a complex path for clip and stroke due to
+discarding the intersection exactly at the top edge
+(fdo#74779).
+  + Fix cairo_get_locale_decimal_point() on Android.
+  + Fix compilation problem on AIX due to conflicting usage of
+symbol 'jmpbuf' (fdo#89339).
+  + Fix broken rendering with XCB due to snapshotting of uploaded
+part of surfaces (fdo#67505).
+  + Fix loss of alpha when copying a mask for a cairo recording
+surface, resulting in a double copy (fdo#73038, fdo#73901).
+  + Fix incorrect recording of certain paths with script surfaces
+(fdo#91054).
+  + Fix typo in definition of MAYBE_WARN in configure script
+(fdo#89750).
+  + Fix use of filename variable after it's been freed (fdo#91206).
+  + Fix out of bounds access when printing pattern (fdo#91266).
+  + Fix incorrect size calculation in glyph cache unlocking for
+Cairo GL compositor (fdo#91321).
+  + Fix memory leak in _cairo_gl_pattern_texture_setup()
+(fdo#91537).
+  + Fix transparent images in win32-print (fdo#91835).
+  + Fix _put_shm_image_boxes and _put_image_boxes when no SHM
+available with XCB.
+
+---

Old:

  cairo-1.14.2.tar.xz

New:

  cairo-1.14.4.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.FFRjBU/_old  2015-11-11 10:29:02.0 +0100
+++ /var/tmp/diff_new_pack.FFRjBU/_new  2015-11-11 10:29:02.0 +0100
@@ -19,7 +19,7 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.14.2
+Version:1.14.4
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ or MPL-1.1

++ cairo-1.14.2.tar.xz -> cairo-1.14.4.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.14.2.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.14.4.tar.xz differ: char 25, line 
1




commit cairo for openSUSE:Factory

2015-08-17 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2015-08-17 15:34:40

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2015-03-18 
13:00:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2015-08-17 
15:34:41.0 +0200
@@ -1,0 +2,5 @@
+Sat May 16 10:42:31 CEST 2015 - r...@suse.de
+
+- drop cairo-disable-lto.patch: lto was dropped upstream
+
+---

Old:

  cairo-disable-lto.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.Pc4LST/_old  2015-08-17 15:34:42.0 +0200
+++ /var/tmp/diff_new_pack.Pc4LST/_new  2015-08-17 15:34:42.0 +0200
@@ -29,12 +29,10 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
-# PATCH-FIX-OPENSUSE cairo-disable-lto.patch idoen...@suse.de -- Disable -flto 
on s390{x}
-Patch1: cairo-disable-lto.patch
 # PATCH-FIX-UPSTREAM cairo-render-thin-lines.patch fdo#77298 j...@suse.com -- 
Fix rendering of thin lines
-Patch2: cairo-render-thin-lines.patch
+Patch1: cairo-render-thin-lines.patch
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
-Patch3: cairo-xlib-endianness.patch
+Patch2: cairo-xlib-endianness.patch
 BuildRequires:  gtk-doc
 # Needed by patch0
 BuildRequires:  libtool
@@ -143,12 +141,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%ifarch s390 s390x
-%patch1 -p1
-%endif
 # fix_for_fdo77298.patch
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 # Needed by patch0 and patch1




commit cairo for openSUSE:Factory

2015-03-18 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2015-03-18 13:00:52

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2015-01-20 
12:27:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2015-03-18 
13:00:55.0 +0100
@@ -1,0 +2,50 @@
+Sat Mar 14 12:30:22 UTC 2015 - opens...@mirell.de
+
+- Update to version 1.14.2:
+  + Features:
+- Improve xcb's handling of per-screen subpixel ordering. If
+  no Xft.rgba property is specified, default to the screen's
+  subpixel order.
+  + Performance Optimizations:
+- Improve performance of cpu_to_be32 and be32_to_cpu, making
+  truetype subsetting of large fonts run about 15% faster.
+  + Bug fixes:
+- Fix unaligned access on sparc with the compact font format
+  (CFF).
+  Unlike truetype, all data in CFF is not aligned.
+  (Debian bug #712836)
+- Fix unaligned access on sparc with tor-scan-converter's
+  memory pool.
+- Fix crash when loading a PDF with a transformed image.
+  (fdo bug #85151)
+- Fix regression on mingw for bigendian test due to removal of
+  file extension for executables. (fdo bug #85120)
+- Fix handling of backslash in PDF interpreter (fdo bug #85662)
+- Fix crash in xlib and xcb renderers when swapping a 0-sized
+  glyph
+- Fix bug with RTL text in PDF operators (fdo bug #86461)
+- Fix compilation 'cairo-path-stroke-traps.c' with MSVC8
+  (fdo bug #84908)
+- Fix crash in _fill_xrgb32_lerp_opaque_spans when a span
+  length is negative.
+- Fix valgrind error by releasing pattern created by
+  cairo_pattern_create_rgb().
+- Fix valgrind errors when running cairo-test-suite.
+- Fix memory leak in recording surface replays (fdo bug #87898)
+- Fix destruction of fonts in api-special-cases test.
+  (fdo bug #87567)
+- Fix duplicated surface push on similar-image, preventing
+  trivial GTK3 program traces from being replayable, with an
+  error message about invalid values for the size of the input.
+  (fdo bug #73580)
+- Fix crash when win32 surface's image size does not cover the
+  entire
+  surface. (fdo bug #53121)
+- Fix crash due to obsolete CGFontGetGlyphPath call
+  (fdo bug #84324)
+- Fix several build issues on AIX (fdo bugs #89338, #89340,
+  #89356, #89354)
+- Fix various documentation warnings and errors
+- Remove cairo-tor-scan-convertor.patch. It was upstreamed.
+
+---

Old:

  cairo-1.14.0.tar.xz
  cairo-tor-scan-convertor.patch

New:

  cairo-1.14.2.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.juZyNm/_old  2015-03-18 13:00:57.0 +0100
+++ /var/tmp/diff_new_pack.juZyNm/_new  2015-03-18 13:00:57.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define build_xcb_backend 1
 %define build_gl_backend 1
 Name:   cairo
-Version:1.14.0
+Version:1.14.2
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ or MPL-1.1
@@ -35,8 +35,6 @@
 Patch2: cairo-render-thin-lines.patch
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch3: cairo-xlib-endianness.patch
-# PATCH-FIX-UPSTREAM cairo-tor-scan-convertor.patch fdo#85151 
dims...@opensuse.org -- tor-scan-converter: can't do_fullrow when intersection 
in row + 0.5subrow
-Patch4: cairo-tor-scan-convertor.patch
 BuildRequires:  gtk-doc
 # Needed by patch0
 BuildRequires:  libtool
@@ -151,7 +149,6 @@
 # fix_for_fdo77298.patch
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 # Needed by patch0 and patch1

++ cairo-1.14.0.tar.xz - cairo-1.14.2.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.14.0.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.14.2.tar.xz differ: char 25, line 
1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2015-01-20 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2015-01-20 12:27:03

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2015-01-08 
23:05:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2015-01-20 
12:27:10.0 +0100
@@ -1,0 +2,7 @@
+Fri Jan  9 13:50:03 UTC 2015 - tchva...@suse.com
+
+- Spec-cleanify
+- Remove the obsoletes for sle10 64bit subpackages on ppc
+- Remove libtool archive always
+
+---



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.1lzDum/_old  2015-01-20 12:27:12.0 +0100
+++ /var/tmp/diff_new_pack.1lzDum/_new  2015-01-20 12:27:12.0 +0100
@@ -18,7 +18,6 @@
 
 %define build_xcb_backend 1
 %define build_gl_backend 1
-
 Name:   cairo
 Version:1.14.0
 Release:0
@@ -38,12 +37,6 @@
 Patch3: cairo-xlib-endianness.patch
 # PATCH-FIX-UPSTREAM cairo-tor-scan-convertor.patch fdo#85151 
dims...@opensuse.org -- tor-scan-converter: can't do_fullrow when intersection 
in row + 0.5subrow
 Patch4: cairo-tor-scan-convertor.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
 # Needed by patch0
 BuildRequires:  libtool
@@ -54,13 +47,19 @@
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(pixman-1) = 0.30.0
 BuildRequires:  pkgconfig(x11)
-%if %build_xcb_backend
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-shm)
-%endif
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrender)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+# 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
+%if %{build_xcb_backend}
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-shm)
+%endif
 
 %description
 Cairo is a vector graphics library with cross-device output support.
@@ -75,11 +74,6 @@
 Group:  System/Libraries
 Provides:   cairo = %{version}
 Obsoletes:  cairo  %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:  cairo-64bit
-%endif
-#
 
 %description -n libcairo2
 Cairo is a vector graphics library with cross-device output support.
@@ -143,11 +137,6 @@
 Requires:   libcairo2 = %{version}
 Provides:   cairo-doc = %{version}
 Obsoletes:  cairo-doc  %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:  cairo-devel-64bit
-%endif
-#
 
 %description devel
 This package contains all files necessary to build binaries using
@@ -171,7 +160,7 @@
 --with-pic \
 --enable-fc \
 --enable-ft \
-%if %build_gl_backend
+%if %{build_gl_backend}
 --enable-gl \
 %endif
 --enable-ps \
@@ -179,7 +168,7 @@
 --enable-script \
 --enable-svg \
 --enable-tee \
-%if %build_xcb_backend
+%if %{build_xcb_backend}
 --enable-xcb \
 %endif
 --enable-xlib \
@@ -188,10 +177,8 @@
 make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
-%if 0%{?suse_version}  1110
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name *.la -delete -print
-%endif
 
 %post -n libcairo2 -p /sbin/ldconfig
 
@@ -236,8 +223,5 @@
 %{_includedir}/cairo/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%if 0%{?suse_version} = 1110
-%{_libdir}/*.la
-%endif
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2015-01-08 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2015-01-08 23:05:22

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2014-11-13 
09:16:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2015-01-08 
23:05:23.0 +0100
@@ -1,0 +2,6 @@
+Wed Jan  7 13:30:28 UTC 2015 - dims...@opensuse.org
+
+- Add cairo-tor-scan-convertor.patch: tor-scan-converter: can't
+  do_fullrow when intersection in row + 0.5subrow (fdo#85151).
+
+---

New:

  cairo-tor-scan-convertor.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.nnTOPK/_old  2015-01-08 23:05:26.0 +0100
+++ /var/tmp/diff_new_pack.nnTOPK/_new  2015-01-08 23:05:26.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,8 @@
 Patch2: cairo-render-thin-lines.patch
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch3: cairo-xlib-endianness.patch
+# PATCH-FIX-UPSTREAM cairo-tor-scan-convertor.patch fdo#85151 
dims...@opensuse.org -- tor-scan-converter: can't do_fullrow when intersection 
in row + 0.5subrow
+Patch4: cairo-tor-scan-convertor.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -160,6 +162,7 @@
 # fix_for_fdo77298.patch
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # Needed by patch0 and patch1

++ cairo-tor-scan-convertor.patch ++
From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001
From: Massimo Valentini mvalent...@src.gnome.org
Date: Sun, 19 Oct 2014 09:19:10 +0200
Subject: tor-scan-converter: can't do_fullrow when intersection in row +
 0.5subrow

the active edges list must be left sorted at the next possible use
and since full_row does not deal with intersections it is not usable
when there is an intersection in the top half of the next row first
subrow

Reported-and-tested-by: Matthew Leach
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151
Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
index 4adcafb..14922d0 100644
--- a/src/cairo-tor-scan-converter.c
+++ b/src/cairo-tor-scan-converter.c
@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
 
if (e-dy) {
struct quorem x = e-x;
-   x.quo += e-dxdy_full.quo - e-dxdy.quo/2;
-   x.rem += e-dxdy_full.rem - e-dxdy.rem/2;
+   x.quo += e-dxdy_full.quo;
+   x.rem += e-dxdy_full.rem;
if (x.rem  0) {
x.quo--;
x.rem += e-dy;
-- 
cgit v0.10.2


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2014-11-13 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2014-11-13 09:16:41

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2014-07-17 
06:57:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2014-11-13 
09:16:44.0 +0100
@@ -1,0 +2,92 @@
+Wed Oct 15 16:07:26 UTC 2014 - zai...@opensuse.org
+
+- Update to version 1.14.0:
+  + Features:
+- Filtering improvements for the image backend, in particular
+  down-scaling of images produces filtered images that depend
+  on all the pixels of the source.
+- Improve handling of device transformation and scaling,
+  allowing Cairo to now support scaling at a device level,
+  permitting easier, more transparent HiDPI support.
+- Support JBIG2 mime data in PDF.  This allows embedding of
+  more compressed JPEG formats within PDF, rather than
+  including the full uncompressed image. Also, reduce the
+  number of transparency groups used by PDF to keep the file
+  size small and viewing/printing of the PDF fast.
+- Expand the embedding section to include stencil mask support.
+- Reorder font declarations to be in natural order.
+- Update the Skia backend to build against current Skia.
+- Drop Link-Time Optimization (LTO) support from build system.
+- Optimize VBO size on GL to 1M and to 16k for EGL.
+  + API changes:
+- cairo_surface_set_device_scale,
+  cairo_surface_get_device_scale.
+- cairo_egl_device_get_display, cairo_egl_device_get_context.
+  + Dependency changes:
+- Cairo now requires glib 2.14 for its gobject helper
+  functions, and pixman 0.30 for downscaling.
+  + Bug fixes:
+- Don't embed CMYK Jpeg images in svg.
+- Fix tests to place output in proper location.
+- Fix determination of alpha for all surfaces when recording.
+- Extend oversize check to cairo_gl_surface_create_for_texture,
+  so an error surface is returned if the texture is too large
+  to render to.
+- Fix embedding of mime data in PDF and PS files.
+- Remove useless error handling in *_reply() functions in XCB.
+- Fix a double-free exposed by multithreaded apps creating and
+  destroying the same font concurrently (fdo#69470).
+- Fix corrupt stacks produced by bugs in operand emission for
+  trace.
+- Fix out of bounds array access in format cache for xlib.
+- Don't rename glyphs used by seac operator (fdo#70364).
+- Fix crash on calling cairo_create with a finished surface.
+- Fix SSIZE_T definition problem when making with MSYS on
+  Windows7.
+- Fix one off issue in gl context cleanup.
+- Fix usage of CAIRO_STACK_ARRAY_LENGTH.
+- Fix rectangle stroke with non rectilinear pen.
+- Fix imagemask with pattern source failure on some printers
+  (fdo#69485).
+- Fix whitespace in font names.
+- Fix page size in generated PDFs (fdo#73452).
+- Fix path-currentpoint test by preserving current-point in
+  copy_path()/append_path() sequence.
+- Fix generation of HTML in code docs for
+  cairo-format-stride-for-width (fdo#63257).
+- Fix spelling of tessellator throughout code (fdo#50411).
+- Fix crash in pixman_image_composite32.
+- Fix crash when trying to modify a (const) all-clipped
+  cairo_clip_t (fdo#75819).
+- Add check_composite method to all compositors, to fix crashes
+  in the test suite.
+- Fix crash in Firefox when scrolling on certain pages.
+- Fix memory leaks found by static analysis.
+- Fix build of any2ppm if fork is not available.
+- Fix broken build for Qt backend, due to missing libstdc++.
+- Fix typo in two cairo_uint128 functions.  Fixes potential
+  build issues on systems without a uint128 type.
+- Fix build when --enable-pdf=no.
+- Fix cache_frozen assertions for Win32 print.
+- Correctly check for xcb image surface for inplace upload.
+- Fix webkit-based web browser crashes due to empty boxes by
+  skipping over them when tesselating.
+- Make pixman, libpng, and zlib paths commandline configurable
+  for win32 builds.
+- Fix image scale on Win32 when GDI scale is not identity.
+- Fix float endian configure test when using clang -O4.
+- Fix compilation with Android bionic libc.
+- Don't try to build util/sphinx on Windows.
+- Fix loss of precision when emitting joins.
+- Fix loss of precision and associated rendering issues in
+  cairo-tor-scan-converter from projection onto sample grid.
+- Fix pixman oversampling of neighbouring edges within a cell
+  by eliminating self-intersections for the pixman traps

commit cairo for openSUSE:Factory

2014-07-16 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2014-07-17 06:57:45

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2014-05-05 
21:14:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2014-07-17 
06:57:49.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul  8 09:13:31 UTC 2014 - fcro...@suse.com
+
+- Add cairo-xlib-endianness.patch: fix crash when client and server
+  have different endianness [bnc#882951, fdo#63461]
+
+---

New:

  cairo-xlib-endianness.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.2EcbB6/_old  2014-07-17 06:57:50.0 +0200
+++ /var/tmp/diff_new_pack.2EcbB6/_new  2014-07-17 06:57:50.0 +0200
@@ -34,6 +34,8 @@
 Patch1: cairo-disable-lto.patch
 # PATCH-FIX-UPSTREAM cairo-render-thin-lines.patch fdo#77298 j...@suse.com -- 
Fix rendering of thin lines
 Patch2: cairo-render-thin-lines.patch
+# PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
+Patch3: cairo-xlib-endianness.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -157,6 +159,7 @@
 %endif
 # fix_for_fdo77298.patch
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Needed by patch0 and patch1

++ cairo-xlib-endianness.patch ++
--- cairo/src/cairo-xlib-render-compositor.c2013-04-12 11:22:48.010384018 
+0200
+++ cairo/src/cairo-xlib-render-compositor.c.new2013-04-12 
11:23:54.362925287 +0200
@@ -1318,10 +1318,10 @@
}
n = new;
d = (uint32_t *) data;
-   do {
+   while (c--) {
*n++ = bswap_32 (*d);
d++;
-   } while (--c);
+   }
data = (uint8_t *) new;
}
break;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2014-05-05 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2014-05-05 21:14:10

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2013-09-04 
14:07:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2014-05-05 
21:14:24.0 +0200
@@ -1,0 +2,7 @@
+Fri Apr 11 12:55:12 UTC 2014 - j...@suse.com
+
+- Add cairo-render-thin-lines.patch: Fix rendering of thin lines,
+  so that inkscape can export 0.01mm lines again to PDF. Regression
+  introduced with 1.12.3.
+
+---

New:

  cairo-render-thin-lines.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.BwTnb9/_old  2014-05-05 21:14:26.0 +0200
+++ /var/tmp/diff_new_pack.BwTnb9/_new  2014-05-05 21:14:26.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,8 @@
 Patch0: cairo-modules-no-version.patch
 # PATCH-FIX-OPENSUSE cairo-disable-lto.patch idoen...@suse.de -- Disable -flto 
on s390{x}
 Patch1: cairo-disable-lto.patch
+# PATCH-FIX-UPSTREAM cairo-render-thin-lines.patch fdo#77298 j...@suse.com -- 
Fix rendering of thin lines
+Patch2: cairo-render-thin-lines.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -153,6 +155,8 @@
 %ifarch s390 s390x
 %patch1 -p1
 %endif
+# fix_for_fdo77298.patch
+%patch2 -p1
 
 %build
 # Needed by patch0 and patch1

++ cairo-render-thin-lines.patch ++
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).
+*
+* jnwei...@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;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2013-09-04 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2013-09-04 14:07:59

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2013-08-28 
21:20:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2013-09-04 
14:07:59.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug 28 20:42:58 UTC 2013 - idon...@suse.com
+
+- Add cairo-disable-lto.patch to disable LTO on s390{x} to fix the
+  build.
+
+---

New:

  cairo-disable-lto.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.m3FZOk/_old  2013-09-04 14:08:01.0 +0200
+++ /var/tmp/diff_new_pack.m3FZOk/_new  2013-09-04 14:08:01.0 +0200
@@ -30,6 +30,8 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
+# PATCH-FIX-OPENSUSE cairo-disable-lto.patch idoen...@suse.de -- Disable -flto 
on s390{x}
+Patch1: cairo-disable-lto.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -148,9 +150,12 @@
 %prep
 %setup -q
 %patch0 -p1
+%ifarch s390 s390x
+%patch1 -p1
+%endif
 
 %build
-# Needed by patch0
+# Needed by patch0 and patch1
 NOCONFIGURE=1 ./autogen.sh
 %configure \
 --with-pic \

++ cairo-disable-lto.patch ++
Index: cairo-1.12.16/build/configure.ac.warnings
===
--- cairo-1.12.16.orig/build/configure.ac.warnings
+++ cairo-1.12.16/build/configure.ac.warnings
@@ -36,16 +36,6 @@ MAYBE_WARN=$MAYBE_WARN -erroff=E_ENUM_T
 dnl We also abuse the warning-flag facility to enable other compiler
 dnl options.  Namely, the following:
 
-dnl -flto working really needs a test link, not just a compile
-
-safe_MAYBE_WARN=$MAYBE_WARN
-MAYBE_WARN=$MAYBE_WARN -flto
-AC_TRY_LINK([],[
-   int main(int argc, char **argv) { return 0; }
-],[],[
-   MAYBE_WARN=$safe_MAYBE_WARN
-])
-
 MAYBE_WARN=$MAYBE_WARN -fno-strict-aliasing -fno-common
 
 dnl Also to turn various gcc/glibc-specific preprocessor checks
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2013-08-28 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2013-08-28 21:20:52

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2013-07-11 
13:27:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2013-08-28 
21:20:56.0 +0200
@@ -1,0 +2,19 @@
+Tue Aug 27 06:41:01 UTC 2013 - dims...@opensuse.org
+
+- Update to version 1.12.16:
+  + Set the correct orientation for simple boxes with a negative
+scale factor.
+  + Fix the creation of the shading dictionary in PDF.
+  + Avoid upscaling bitmap fonts if possible.
+  + Fix an assertion failure within the mempool allocator for
+shared memory.
+  + Fix allocation size for CFF subsets.
+  + Export cairo_matrix_t for GObject bindings.
+  + Stop leaking the image data when loading PNGs.
+  + Prevent an assertion failure when creating similar GL surfaces
+larger than supported by hardware.
+  + Bugs fixed: fdo#61451, fdo#62885, fdo#61876, fdo#63196,
+fdo#697357, fdo#61592, fdo#68014, fdo#63787.
+- Drop cairo-reduce-buddy-assertion.patch: fixed upstream.
+
+---

Old:

  cairo-1.12.14.tar.xz
  cairo-reduce-buddy-assertion.patch

New:

  cairo-1.12.16.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.2nWjoh/_old  2013-08-28 21:20:58.0 +0200
+++ /var/tmp/diff_new_pack.2nWjoh/_new  2013-08-28 21:20:58.0 +0200
@@ -20,7 +20,7 @@
 %define build_gl_backend 1
 
 Name:   cairo
-Version:1.12.14
+Version:1.12.16
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ or MPL-1.1
@@ -30,8 +30,6 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
-# PATCH-FIX-UPSTREAM cairo-reduce-buddy-assertion.patch bnc#828074 
sbra...@suse.cz -- Fix assert crash on unaligned memory, taken from git, commit 
01a8bf0
-Patch1: cairo-reduce-buddy-assertion.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -46,7 +44,7 @@
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(pixman-1)
+BuildRequires:  pkgconfig(pixman-1) = 0.16.0
 BuildRequires:  pkgconfig(x11)
 %if %build_xcb_backend
 BuildRequires:  pkgconfig(xcb)
@@ -150,7 +148,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 # Needed by patch0

++ cairo-1.12.14.tar.xz - cairo-1.12.16.tar.xz ++
/work/SRC/openSUSE:Factory/cairo/cairo-1.12.14.tar.xz 
/work/SRC/openSUSE:Factory/.cairo.new/cairo-1.12.16.tar.xz differ: char 26, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2013-07-11 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2013-07-11 13:27:27

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2013-05-28 
07:29:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2013-07-11 
13:27:28.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul  8 18:49:31 CEST 2013 - sbra...@suse.cz
+
+- Add cairo-reduce-buddy-assertion.patch: Fix eog crash on
+  assertion, after pressing Next (bnc#828074).
+
+---

New:

  cairo-reduce-buddy-assertion.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.kdZ1rb/_old  2013-07-11 13:27:29.0 +0200
+++ /var/tmp/diff_new_pack.kdZ1rb/_new  2013-07-11 13:27:29.0 +0200
@@ -30,6 +30,8 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
+# PATCH-FIX-UPSTREAM cairo-reduce-buddy-assertion.patch bnc#828074 
sbra...@suse.cz -- Fix assert crash on unaligned memory, taken from git, commit 
01a8bf0
+Patch1: cairo-reduce-buddy-assertion.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -148,6 +150,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Needed by patch0

++ cairo-reduce-buddy-assertion.patch ++
From 01a8bf01c6508a4fea8d40371c3049e7a2f7908a Mon Sep 17 00:00:00 2001
From: Chris Wilson ch...@chris-wilson.co.uk
Date: Fri, 15 Mar 2013 09:08:00 +
Subject: [PATCH] mempool: Reduce an assert into an error return for
 get_buddy()

If we ask for a buddy that is outside of our allocation that is an
error that should not happen with a power-of-two allocated zone...
However, since it has been seen in the wild, we can safely return that
there is no buddy rather than die in a too-late assert.

Reported-by: Anton Eliasson de...@antoneliasson.se
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
---
 src/cairo-mempool.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cairo-mempool.c b/src/cairo-mempool.c
index 96e4a62..751ede3 100644
--- a/src/cairo-mempool.c
+++ b/src/cairo-mempool.c
@@ -157,7 +157,8 @@ get_buddy (cairo_mempool_t *pool, size_t offset, int bits)
 {
 struct _cairo_memblock *block;
 
-assert (offset + (1  bits) = pool-num_blocks);
+if (offset + (1  bits) = pool-num_blocks)
+   return NULL; /* invalid */
 
 if (BITTEST (pool, offset + (1  bits) - 1))
return NULL; /* buddy is allocated */
-- 
1.8.1.4

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2013-05-27 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2013-05-28 07:29:08

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2013-04-07 
14:20:32.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2013-05-28 
07:29:09.0 +0200
@@ -1,0 +2,7 @@
+Sat May 25 20:58:42 UTC 2013 - dims...@opensuse.org
+
+- Drop cairo-libpng16-v2.patch: in its current form, this patch
+  causes issues as that cairo.ImageSurface.create_from_png errors
+  out with 'MemoryError' in all cases (bnc#821766).
+
+---
@@ -6 +13 @@
-  png_read_update_info() (bnc#810701)..
+  png_read_update_info() (bnc#810701).

Old:

  cairo-libpng16-v2.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.Idqp0M/_old  2013-05-28 07:29:11.0 +0200
+++ /var/tmp/diff_new_pack.Idqp0M/_new  2013-05-28 07:29:11.0 +0200
@@ -30,8 +30,6 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
-# PATCH-FIX-UPSTREAM cairo-libpng16-v2.patch fdo#62779 bnc#810701 
pgaj...@suse.com -- call png_set_read_user_transform_fn() before 
png_read_update_info()
-Patch1: cairo-libpng16-v2.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -150,7 +148,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1
 
 %build
 # Needed by patch0

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2013-04-07 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2013-04-07 14:20:31

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2013-04-02 
11:39:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2013-04-07 
14:20:32.0 +0200
@@ -1,0 +2,7 @@
+Tue Apr  2 11:57:02 UTC 2013 - pgaj...@suse.com
+
+- Add cairo-libpng16-v2.patch: Fix png usage with libpng 1.6:
+  call png_set_read_user_transform_fn() before
+  png_read_update_info() (bnc#810701)..
+
+---

New:

  cairo-libpng16-v2.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.ZFC3vN/_old  2013-04-07 14:20:34.0 +0200
+++ /var/tmp/diff_new_pack.ZFC3vN/_new  2013-04-07 14:20:34.0 +0200
@@ -30,6 +30,8 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
+# PATCH-FIX-UPSTREAM cairo-libpng16-v2.patch fdo#62779 bnc#810701 
pgaj...@suse.com -- call png_set_read_user_transform_fn() before 
png_read_update_info()
+Patch1: cairo-libpng16-v2.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -148,6 +150,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 # Needed by patch0

++ cairo-libpng16-v2.patch ++
http://lists.cairographics.org/archives/cairo/2013-March/024195.html
--- src/cairo-png.c 2012-03-29 12:05:32.0 +0200
+++ src/cairo-png.c 2013-03-30 09:13:50.817181600 +0100
@@ -497,6 +497,20 @@
 }
 }
 
+/* branches into premultiply_data or convert_bytes_to_data depending on color 
type */
+static void read_user_transform_func (png_structp png, png_row_infop row_info, 
png_bytep data)
+{
+switch ((cairo_format_t) png_get_user_transform_ptr (png)) {
+case CAIRO_FORMAT_ARGB32:
+premultiply_data (png, row_info, data);
+break;
+
+case CAIRO_FORMAT_RGB24:
+convert_bytes_to_data (png, row_info, data);
+break;
+}
+}
+
 static cairo_status_t
 stdio_read_func (void *closure, unsigned char *data, unsigned int size)
 {
@@ -623,6 +637,9 @@
 
 png_set_filler (png, 0xff, PNG_FILLER_AFTER);
 
+/* this must be stored before calling png_read_update_info */
+png_set_read_user_transform_fn (png, read_user_transform_func);
+
 /* recheck header after setting EXPAND options */
 png_read_update_info (png, info);
 png_get_IHDR (png, info,
@@ -643,15 +660,15 @@
 
case PNG_COLOR_TYPE_RGB_ALPHA:
format = CAIRO_FORMAT_ARGB32;
-   png_set_read_user_transform_fn (png, premultiply_data);
break;
 
case PNG_COLOR_TYPE_RGB:
format = CAIRO_FORMAT_RGB24;
-   png_set_read_user_transform_fn (png, convert_bytes_to_data);
break;
 }
 
+png_set_user_transform_info (png, (void*) format, 0, 0);
+
 stride = cairo_format_stride_for_width (format, png_width);
 if (stride  0) {
surface = _cairo_surface_create_in_error (_cairo_error 
(CAIRO_STATUS_INVALID_STRIDE));
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2012-11-12 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2012-11-12 12:33:13

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2012-10-26 
07:50:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2012-11-12 
12:33:14.0 +0100
@@ -1,0 +2,43 @@
+Tue Nov  6 12:21:53 UTC 2012 - dims...@opensuse.org
+
+- Update to version 1.12.8:
+  + Expand the sanity checking for broken combinations of
+XSendEvent and ShmCompletionEvent.
+  + Notice that The X.Org Foundation sometimes also identifies
+itself as The Xorg Foundation.
+  + Handle various ages of libXext and its Shm headers.
+  + Fix the invalid clipping of the source drawable when using SHM
+transport to upload images (fdo#56547).
+  + Handle all Type1 postscript operators for better font
+compatibility (fdo#56265).
+  + Fix a couple of memory leaks in Type1 font subsetting
+(fdo#56566)
+  + Tighten the evaluation of the start/stop pen vertices, and catch
+a few instances where we would use a fan instead of a bevel.
+(fdo#56432)
+  + Fix assumption that geometric clipping always succeeds with the
+span-compositor (fdo#56574)
+  + Fix call to spline intersection when evaluating whether a stoke
+is visible.
+  + Remember to copy inferior sources when using SHM to readback the
+surface for use as a source.
+- Changes from version 1.12.6:
+  + Fix the recording surface to actually snapshot the source and
+so fix PDF drawing.
+  + Calling XSendEvent with an XShmCompletionEvent is incompatabile
+with older Xorg servers.
+  + Reorder CloseDisplay chain so that XShm is not reinstantiated
+after shutdown, causing a potential crash if the Display was
+immediately recreated using the same memory address.
+  + Make sure that the Xserver has attached to the SHM segment
+before deleting it from the global namespace on systems that do
+not support deferred deletion.
+  + Type1 subsetting support for PDF (and PS) was once again
+improved to work with a larger number of PDF readers.
+  + GLESv2 build fixes and improved support for embedded GPUs.
+  + Tweak the invisible pen detection for applications that are
+currently using too large values for geometric tolerance.
+  + A build fix for older freetype libraries.
+- Rebase cairo-modules-no-version.patch.
+
+---

Old:

  cairo-1.12.4.tar.xz

New:

  cairo-1.12.8.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.51lLGw/_old  2012-11-12 12:33:18.0 +0100
+++ /var/tmp/diff_new_pack.51lLGw/_new  2012-11-12 12:33:18.0 +0100
@@ -20,7 +20,7 @@
 %define build_gl_backend 0
 
 Name:   cairo
-Version:1.12.4
+Version:1.12.8
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ or MPL-1.1

++ cairo-modules-no-version.patch ++
--- /var/tmp/diff_new_pack.51lLGw/_old  2012-11-12 12:33:18.0 +0100
+++ /var/tmp/diff_new_pack.51lLGw/_new  2012-11-12 12:33:18.0 +0100
@@ -1,18 +1,20 @@
-Index: cairo-1.10.0/util/cairo-fdr/Makefile.am
+Index: cairo-1.12.8/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-1.12.8.orig/util/cairo-fdr/Makefile.am
 cairo-1.12.8/util/cairo-fdr/Makefile.am
+@@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
  cairo_fdr_la_SOURCES = fdr.c
  cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
  cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
 -cairo_fdr_la_LDFLAGS = -module -no-undefined
 +cairo_fdr_la_LDFLAGS = -module -no-undefined -avoid-version
+ if CAIRO_HAS_DL
  cairo_fdr_la_LIBADD = -ldl
-Index: cairo-1.10.0/util/cairo-trace/Makefile.am
+ endif
+Index: cairo-1.12.8/util/cairo-trace/Makefile.am
 ===
 cairo-1.10.0.orig/util/cairo-trace/Makefile.am
-+++ cairo-1.10.0/util/cairo-trace/Makefile.am
+--- cairo-1.12.8.orig/util/cairo-trace/Makefile.am
 cairo-1.12.8/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,16 +24,16 @@
  
  libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz
  if CAIRO_HAS_DL
-Index: 

commit cairo for openSUSE:Factory

2012-10-25 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2012-10-26 07:50:02

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2012-05-22 
10:08:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2012-10-26 
07:50:05.0 +0200
@@ -1,0 +2,27 @@
+Fri Oct 12 12:00:24 UTC 2012 - dims...@opensuse.org
+
+- Update to version 1.12.4:
+  + Interior boxes were being dropped when amalgamating regions
+during tesselation (fdo#49446)
+  + Allow building without gtk-doc installed
+  + Invalid edge generation whilst reducing complex polygons
+(fdo#50852)
+  + Stroking around tight cusps
+  + Use locale correct formats for reading font subsetting and
+valid buffers (fdo#51443)
+  + Ensure that the type1 subset includes all the glyph encodings
+(fdo#53040)
+  + Upload the whole source for a repeating pattern (fdo#51910)
+  + Fix damage tracking to handle continuation chunks corectly and
+so prevent crashes on win32 (fdo#53384)
+  + Avoid emitting miter joins for degenerate line segments
+(fdo#407107)
+  + Convert the relative path semgents into the backend coordinates
+and then back again to user coordinates (fdo#54732)
+  + Fix extents computations for a degenerate path consisting only
+of a move-to (fdo#54549)
+  + Prevent crashing on a degenerate project edge after polygon
+intersection (fdo#54822).
+- Add pkgconfig(xext) BuildRequires: new verified dependency.
+
+---

Old:

  cairo-1.12.2.tar.xz

New:

  cairo-1.12.4.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.OC8j6W/_old  2012-10-26 07:50:09.0 +0200
+++ /var/tmp/diff_new_pack.OC8j6W/_new  2012-10-26 07:50:09.0 +0200
@@ -20,7 +20,7 @@
 %define build_gl_backend 0
 
 Name:   cairo
-Version:1.12.2
+Version:1.12.4
 Release:0
 Summary:Vector Graphics Library with Cross-Device Output Support
 License:LGPL-2.1+ or MPL-1.1
@@ -50,6 +50,7 @@
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-shm)
 %endif
+BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrender)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2012-05-22 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2012-05-22 10:08:28

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2012-05-03 
10:54:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2012-05-22 
10:08:31.0 +0200
@@ -1,0 +2,22 @@
+Sun Apr 29 21:09:19 UTC 2012 - dims...@opensuse.org
+
+- Update to version 1.12.2:
+  + Allow applications to create 0x0 xlib surfaces, such as used by
+LibreOffice (fdo#49118)
+  + Trim composite extents for SOURCE/CLEAR operators to the mask.
+  + Use fallback fonts in PDF for unhandled computed glyph widths
+(fdo#48349)
+  + Handle snapshots of recording surfaces for analysing pattern
+extents. Fixes a regression of reporting the PDF bounding box
+as being the page size.
+  + Fix allocation size for PDF pattern ids. (fdo#49089)
+  + Fix emission of rectilinear dashed segments, with and without
+scaling, and application of degenerate line joins.
+  + Clamp unbounded fixup polygons to the clip extents.
+  + Prevent infinite loop due to rounding errors whilst
+incrementing along dashes.
+  + Prevent overflow for inline a8 span filling.
+  + Miscellaneous build fixes for Cygwin on Windows and Solaris.
+- Drop cairo-fix-wrong-allocation.patch: fixed upstream.
+
+---

Old:

  cairo-1.12.0.tar.gz
  cairo-fix-wrong-allocation.patch

New:

  cairo-1.12.2.tar.xz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.kJORlB/_old  2012-05-22 10:08:35.0 +0200
+++ /var/tmp/diff_new_pack.kJORlB/_new  2012-05-22 10:08:35.0 +0200
@@ -20,18 +20,16 @@
 %define build_gl_backend 0
 
 Name:   cairo
-Version:1.12.0
+Version:1.12.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.gz
+Source: http://cairographics.org/releases/%{name}-%{version}.tar.xz
 Source99:   baselibs.conf
-# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dims...@opensuse.org -- 
Build modules with -module -avoid-version.
+# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 
dims...@opensuse.org -- Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
-# PATCH-FIX-UPSTREAM cairo-fix-wrong-allocation bnc#758422 fdo#49089 
je...@suse.com -- Fix wrong allocation in _cairo_pdf_surface_add_source_surface
-Patch1: cairo-fix-wrong-allocation.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -39,6 +37,7 @@
 BuildRequires:  Mesa-devel
 %endif
 BuildRequires:  gtk-doc
+# Needed by patch0
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontconfig)
@@ -148,9 +147,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
+# Needed by patch0
 NOCONFIGURE=1 ./autogen.sh
 %configure \
 --with-pic \

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2012-05-03 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2012-05-03 10:54:10

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2012-03-29 
11:35:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2012-05-03 
10:54:19.0 +0200
@@ -1,0 +2,6 @@
+Sat Apr 21 15:34:36 UTC 2012 - je...@suse.com
+
+- Add cairo-fix-wrong-allocation: fix wrong allocation in
+  _cairo_pdf_surface_add_source_surface (bnc#758422).
+
+---

New:

  cairo-fix-wrong-allocation.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.0BMJUE/_old  2012-05-03 10:54:21.0 +0200
+++ /var/tmp/diff_new_pack.0BMJUE/_new  2012-05-03 10:54:21.0 +0200
@@ -30,6 +30,8 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dims...@opensuse.org -- 
Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
+# PATCH-FIX-UPSTREAM cairo-fix-wrong-allocation bnc#758422 fdo#49089 
je...@suse.com -- Fix wrong allocation in _cairo_pdf_surface_add_source_surface
+Patch1: cairo-fix-wrong-allocation.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -146,6 +148,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh

++ cairo-fix-wrong-allocation.patch ++
From: Jeff Mahoney je...@suse.com
Subject: cairo: Fix wrong allocation in _cairo_pdf_surface_add_source_surface
References: bnc#758422

 _cairo_pdf_surface_add_source_surface allocates unique_id with
 size unique_id_length but then copies surface_key.unique_id_length into it.

 This causes e.g. evince to crash predictably while trying to print with:
  *** buffer overflow detected ***: evince terminated

 We should be using surface_key.unique_id_length instead.

Signed-off-by: Jeff Mahoney je...@suse.com
---
 src/cairo-pdf-surface.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1379,7 +1379,7 @@ _cairo_pdf_surface_add_source_surface (c
goto release_source;
 
if (surface_key.unique_id  surface_key.unique_id_length  0) {
-   unique_id = malloc (unique_id_length);
+   unique_id = malloc (surface_key.unique_id_length);
if (unique_id == NULL) {
status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
goto release_source;

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2012-03-29 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2012-03-29 11:35:07

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2012-02-17 
12:00:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2012-03-29 
11:35:12.0 +0200
@@ -1,0 +2,25 @@
+Mon Mar 26 18:57:45 UTC 2012 - zai...@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.
+
+---

Old:

  cairo-1.10.2.tar.bz2
  cairo-fix-libs.patch

New:

  cairo-1.12.0.tar.gz



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.hF0aBZ/_old  2012-03-29 11:35:15.0 +0200
+++ /var/tmp/diff_new_pack.hF0aBZ/_new  2012-03-29 11:35:15.0 +0200
@@ -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 dims...@opensuse.org -- 
Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
-# PATCH-FIX-OPENSUSE cairo-fix-libs.patch co...@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(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 @@
 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 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -166,9 +163,8 @@
 --enable-tee \
 %if %build_xcb_backend
 --enable-xcb \
-%else
---enable-xlib \
 %endif
+--enable-xlib \
 --disable-gtk-doc \
 --disable-static
 make %{?_smp_mflags} V=1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2012-02-17 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2012-02-17 12:00:10

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2012-01-06 
11:43:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2012-02-17 
12:00:16.0 +0100
@@ -1,0 +2,8 @@
+Tue Feb 14 09:59:51 UTC 2012 - vu...@opensuse.org
+
+- Ship additional COPYING files that come with some utilities.
+- Fix license of the tool subpackage: it is GPL-3.0+ (bnc#739748).
+- Change the group of library subpackages from
+  Development/Libraries/X11 to System/Libraries.
+
+---



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.hsADdx/_old  2012-02-17 12:00:17.0 +0100
+++ /var/tmp/diff_new_pack.hsADdx/_new  2012-02-17 12:00:17.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define build_xcb_backend 0
 %define build_gl_backend 0
 
@@ -23,8 +24,8 @@
 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+ ; MPL-1.1
-Group:  Development/Libraries/X11
+License:LGPL-2.1+ or MPL-1.1
+Group:  System/Libraries
 Url:http://cairographics.org/
 Source: %{name}-%{version}.tar.bz2
 Source99:   baselibs.conf
@@ -62,6 +63,8 @@
 
 %package -n libcairo2
 Summary:Vector Graphics Library with Cross-Device Output Support
+License:LGPL-2.1+ or MPL-1.1
+Group:  System/Libraries
 Provides:   cairo = %{version}
 Obsoletes:  cairo  %{version}
 # bug437293
@@ -79,6 +82,8 @@
 
 %package -n libcairo-gobject2
 Summary:Vector Graphics Library with Cross-Device Output Support
+License:LGPL-2.1+ or MPL-1.1
+Group:  System/Libraries
 
 %description -n libcairo-gobject2
 Cairo is a vector graphics library with cross-device output support.
@@ -92,6 +97,8 @@
 
 %package -n libcairo-script-interpreter2
 Summary:Vector Graphics Library with Cross-Device Output Support
+License:LGPL-2.1+ or MPL-1.1
+Group:  System/Libraries
 
 %description -n libcairo-script-interpreter2
 Cairo is a vector graphics library with cross-device output support.
@@ -102,6 +109,8 @@
 
 %package tools
 Summary:Vector Graphics Library with Cross-Device Output Support -- 
Utilities
+License:GPL-3.0+
+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
@@ -119,6 +128,8 @@
 
 %package devel
 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}
@@ -191,10 +202,12 @@
 
 %files -n libcairo-script-interpreter2
 %defattr(-, root, root)
+%doc util/cairo-script/COPYING
 %{_libdir}/libcairo-script-interpreter.so.*
 
 %files tools
 %defattr(-, root, root)
+%doc util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3
 %{_bindir}/cairo-sphinx
 %{_bindir}/cairo-trace
 %dir %{_libdir}/cairo

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2012-01-06 Thread h_root
Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2012-01-06 11:43:15

Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and  /work/SRC/openSUSE:Factory/.cairo.new (New)


Package is cairo, Maintainer is gnome-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/cairo/cairo.changes  2011-10-04 
18:07:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2012-01-06 
11:43:17.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec  9 11:48:43 UTC 2011 - co...@suse.com
+
+- fix license to be in spdx.org format
+
+---



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.IECnsC/_old  2012-01-06 11:43:18.0 +0100
+++ /var/tmp/diff_new_pack.IECnsC/_new  2012-01-06 11:43:18.0 +0100
@@ -15,18 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %define build_xcb_backend 0
 %define build_gl_backend 0
 
 Name:   cairo
 Version:1.10.2
-Release:9
+Release:0
 # FIXME: on update, check that cairo-fix-libs.patch (patch1) is still needed 
(nobody has the right fix for upstream :/)
-License:LGPLv2.1+ ; MPL ..
 Summary:Vector Graphics Library with Cross-Device Output Support
-Url:http://cairographics.org/
+License:LGPL-2.1+ ; MPL-1.1
 Group:  Development/Libraries/X11
+Url:http://cairographics.org/
 Source: %{name}-%{version}.tar.bz2
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dims...@opensuse.org -- 
Build modules with -module -avoid-version.
@@ -63,8 +62,6 @@
 
 %package -n libcairo2
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPLv2.1+ ; MPL ..
-Group:  Development/Libraries/X11
 Provides:   cairo = %{version}
 Obsoletes:  cairo  %{version}
 # bug437293
@@ -82,8 +79,6 @@
 
 %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.
@@ -97,8 +92,6 @@
 
 %package -n libcairo-script-interpreter2
 Summary:Vector Graphics Library with Cross-Device Output Support
-License:LGPLv2.1+ ; MPL ..
-Group:  Development/Libraries/X11
 
 %description -n libcairo-script-interpreter2
 Cairo is a vector graphics library with cross-device output support.
@@ -109,8 +102,6 @@
 
 %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
@@ -127,9 +118,7 @@
 This package contains various cairo utilities.
 
 %package devel
-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}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2011-10-04 Thread h_root

Hello community,

here is the log from the commit of package cairo for openSUSE:Factory
checked in at Tue Oct 4 18:07:51 CEST 2011.




--- openSUSE:Factory/cairo/cairo.changes2011-10-02 09:51:43.0 
+0200
+++ /mounts/work_src_done/STABLE/cairo/cairo.changes2011-09-30 
22:10:16.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 30 20:07:46 UTC 2011 - co...@suse.com
+
+- add libtool as buildrequire to make the spec file more reliable
+
+---

calling whatdependson for head-i586




Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.8GGo1Z/_old  2011-10-04 18:07:42.0 +0200
+++ /var/tmp/diff_new_pack.8GGo1Z/_new  2011-10-04 18:07:42.0 +0200
@@ -40,6 +40,7 @@
 BuildRequires:  Mesa-devel
 %endif
 BuildRequires:  gtk-doc
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2011-10-02 Thread h_root

Hello community,

here is the log from the commit of package cairo for openSUSE:Factory
checked in at Sun Oct 2 09:51:43 CEST 2011.




--- openSUSE:Factory/cairo/cairo.changes2011-09-23 01:53:08.0 
+0200
+++ /mounts/work_src_done/STABLE/cairo/cairo.changes2011-09-18 
20:14:42.0 +0200
@@ -1,0 +2,7 @@
+Sat Sep 17 22:31:04 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+- Fix baselibs requires for cairo-devel and make it available
+
+---

calling whatdependson for head-i586




Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.KcpayU/_old  2011-10-02 09:51:39.0 +0200
+++ /var/tmp/diff_new_pack.KcpayU/_new  2011-10-02 09:51:39.0 +0200
@@ -170,7 +170,7 @@
 %endif
 --disable-gtk-doc \
 --disable-static
-%{__make} %{?jobs:-j %jobs} V=1
+make %{?_smp_mflags} V=1
 
 %install
 %makeinstall
@@ -190,9 +190,6 @@
 
 %postun -n libcairo-script-interpreter2 -p /sbin/ldconfig
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files -n libcairo2
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README

++ baselibs.conf ++
--- /var/tmp/diff_new_pack.KcpayU/_old  2011-10-02 09:51:39.0 +0200
+++ /var/tmp/diff_new_pack.KcpayU/_new  2011-10-02 09:51:39.0 +0200
@@ -3,5 +3,8 @@
   obsoletes cairo-targettype  version
 libcairo-gobject2
 libcairo-script-interpreter2
-arch ppc package cairo-devel
-arch sparcv9 package cairo-devel
+cairo-devel
+  requires -cairo-targettype
+  requires libcairo2-targettype = version
+  requires libcairo-gobject2-targettype = version
+  requires libcairo-script-interpreter2-targettype = version

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2011-09-09 Thread h_root

Hello community,

here is the log from the commit of package cairo for openSUSE:Factory
checked in at Fri Sep 9 11:09:14 CEST 2011.




--- GNOME/cairo/cairo.changes   2011-02-22 15:20:01.0 +0100
+++ /mounts/work_src_done/STABLE/cairo/cairo.changes2011-09-02 
18:03:14.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 29 12:06:00 UTC 2011 - co...@novell.com
+
+- Add cairo-fix-libs.patch: disable lto for cairo-sphinx as it
+  breaks with -Wl,--as-needed.
+
+---

calling whatdependson for head-i586


New:

  cairo-fix-libs.patch



Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.3Uce0j/_old  2011-09-09 11:09:08.0 +0200
+++ /var/tmp/diff_new_pack.3Uce0j/_new  2011-09-09 11:09:08.0 +0200
@@ -21,7 +21,8 @@
 
 Name:   cairo
 Version:1.10.2
-Release:8
+Release:9
+# FIXME: on update, check that cairo-fix-libs.patch (patch1) is still needed 
(nobody has the right fix for upstream :/)
 License:LGPLv2.1+ ; MPL ..
 Summary:Vector Graphics Library with Cross-Device Output Support
 Url:http://cairographics.org/
@@ -30,6 +31,8 @@
 Source99:   baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dims...@opensuse.org -- 
Build modules with -module -avoid-version.
 Patch0: cairo-modules-no-version.patch
+# PATCH-FIX-OPENSUSE cairo-fix-libs.patch co...@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
@@ -144,6 +147,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -166,7 +170,7 @@
 %endif
 --disable-gtk-doc \
 --disable-static
-%{__make} %{?jobs:-j %jobs}
+%{__make} %{?jobs:-j %jobs} V=1
 
 %install
 %makeinstall

++ cairo-fix-libs.patch ++
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.0 +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 \





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cairo for openSUSE:Factory

2011-02-22 Thread h_root

Hello community,

here is the log from the commit of package cairo for openSUSE:Factory
checked in at Tue Feb 22 20:18:41 CET 2011.




--- GNOME/cairo/cairo.changes   2010-12-27 23:08:48.0 +0100
+++ cairo/cairo.changes 2011-02-22 15:20:01.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb 22 15:19:31 CET 2011 - vu...@opensuse.org
+
+- Add missing libcairo-gobject2 to baselibs.conf.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ cairo.spec ++
--- /var/tmp/diff_new_pack.qUO2uQ/_old  2011-02-22 20:18:33.0 +0100
+++ /var/tmp/diff_new_pack.qUO2uQ/_new  2011-02-22 20:18:33.0 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package cairo (Version 1.10.2)
+# spec file for package cairo
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,7 +21,7 @@
 
 Name:   cairo
 Version:1.10.2
-Release:1
+Release:8
 License:LGPLv2.1+ ; MPL ..
 Summary:Vector Graphics Library with Cross-Device Output Support
 Url:http://cairographics.org/

++ baselibs.conf ++
--- /var/tmp/diff_new_pack.qUO2uQ/_old  2011-02-22 20:18:33.0 +0100
+++ /var/tmp/diff_new_pack.qUO2uQ/_new  2011-02-22 20:18:33.0 +0100
@@ -1,6 +1,7 @@
 libcairo2
   provides cairo-targettype = version
   obsoletes cairo-targettype  version
+libcairo-gobject2
 libcairo-script-interpreter2
 arch ppc package cairo-devel
 arch sparcv9 package cairo-devel






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org