tag 630811 patch thanks Hi, Cyril Brulebois <kibi@debian.org> (17/06/2011): > Currently, the website (and testing) advises a git snapshot past 1.11.2, > but that tag would be sufficient to get things built. A few cherry-picks > would make more or less all clients run mostly OK, and I can prepare > either: > - a patch series with all the needed commits (touching the gl part only), > - or a big patch, squashing all commits into a single commit, > depending on what you prefer. I went for one patch per commit for now, let me know if you prefere a big patch. I've pointed upstream-experimental to the 1.11.2 release, merged that into master as debian-experimental, and worked from this point. The resulting branches can be seen in that repository: http://cgit.freedesktop.org/~kibi/cairo I'm also attaching the git format-patch'es for the debian-experimental branch (compressing the last one since it might be a bit too big for debbugs or lists.d.o). Please let me know if you find any mistakes. If that looks OK, I'd be happy to see somebody from the team upload that for me. Thanks already! Mraw, KiBi.
From 15e97cd920f5ab9223596314d50426ccd86472cf Mon Sep 17 00:00:00 2001 From: Cyril Brulebois <kibi@debian.org> Date: Mon, 20 Jun 2011 02:00:25 +0200 Subject: [PATCH 1/9] New upstream release. --- debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e998db..54ee17b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cairo (1.11.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200 + cairo (1.10.2-6) unstable; urgency=low * debian/patches/03_export-symbols.patch: -- 1.7.5.4
From 5c25c5f31c7f3c13191cc2cdc6708c4190a29224 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 20 Jun 2011 02:01:00 +0200
Subject: [PATCH 2/9] debian/control: pixman 0.20.2 is now required.
---
debian/changelog | 3 +++
debian/control | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54ee17b..a067458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
cairo (1.11.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/control:
+ + Bump Build-Depends on libpixman-1-dev from 0.18.4 to 0.20.2.
+ + Bump Depends on libpixman-1-dev in libcairo2-dev accordingly.
-- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/control b/debian/control
index 750d2b7..00a87a5 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7),
libsm-dev,
xutils-dev,
libxt-dev,
- libpixman-1-dev (>= 0.18.4),
+ libpixman-1-dev (>= 0.20.2),
libxcb1-dev (>= 1.4),
libxcb-render0-dev (>= 0.9.92),
libxcb-shm0-dev,
@@ -41,7 +41,7 @@ Depends: libcairo2 (= ${binary:Version}),
libxrender-dev (>= 0.6),
libpng12-dev,
libsm-dev,
- libpixman-1-dev (>= 0.18.4),
+ libpixman-1-dev (>= 0.20.2),
libxcb1-dev (>= 1.4),
libxcb-render0-dev (>= 0.9.92),
libxcb-shm0-dev,
--
1.7.5.4
From ce2c8cb8bfcc7b5be6eca7d10a90ced002ac4b8e Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 20 Jun 2011 02:03:12 +0200
Subject: [PATCH 3/9] Add lintian override for embedded-library (glew).
---
debian/changelog | 3 +++
debian/libcairo2.lintian-overrides | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 debian/libcairo2.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index a067458..ba6ed24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
* debian/control:
+ Bump Build-Depends on libpixman-1-dev from 0.18.4 to 0.20.2.
+ Bump Depends on libpixman-1-dev in libcairo2-dev accordingly.
+ * debian/libcairo2.lintian-overrides:
+ + Add override for embedded-library; glew is going away post 1.11.2
+ anyway, so overriding temporarily is OK.
-- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/libcairo2.lintian-overrides b/debian/libcairo2.lintian-overrides
new file mode 100644
index 0000000..e910684
--- /dev/null
+++ b/debian/libcairo2.lintian-overrides
@@ -0,0 +1 @@
+embedded-library usr/lib/libcairo.so.2.11000.2: glew
--
1.7.5.4
From 2bda821dea120830df8af2fd387f59614160b316 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 20 Jun 2011 02:05:43 +0200
Subject: [PATCH 4/9] rules: Call dh_lintian -i/-s accordingly.
---
debian/changelog | 2 ++
debian/rules | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ba6ed24..df333d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
* debian/libcairo2.lintian-overrides:
+ Add override for embedded-library; glew is going away post 1.11.2
anyway, so overriding temporarily is OK.
+ * debian/rules:
+ + Call dh_lintian -i/-s accordingly.
-- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/rules b/debian/rules
index 04b6438..df8d0ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,6 +136,7 @@ binary-indep: build install
dh_installchangelogs -i ChangeLog
dh_installdocs -i -A NEWS README AUTHORS
dh_link -i
+ dh_lintian -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
@@ -154,6 +155,7 @@ binary-arch: build install
dh_link -s
dh_strip -s --dbg-package=libcairo2-dbg -Nlibcairo2-udeb
dh_strip -plibcairo2-udeb
+ dh_lintian -s
dh_compress -s
dh_fixperms -s
dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>= 1.10.2-2~)' -- -c4
--
1.7.5.4
From 9cea298cd2136c00d48b2fe6ae0bacfe39eb3c77 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 20 Jun 2011 02:21:31 +0200
Subject: [PATCH 5/9] Revert disabling the OpenGL/EGL backend temporarily.
This reverts commit 0dc596c70f0ce207d1af63c8e09504b1dfe69f3a.
Conflicts:
debian/changelog
---
debian/changelog | 5 +++++
debian/control | 8 ++++----
debian/libcairo2.symbols | 24 ++++++++++++------------
debian/rules | 3 ++-
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index df333d3..b40d104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
anyway, so overriding temporarily is OK.
* debian/rules:
+ Call dh_lintian -i/-s accordingly.
+ * debian/control,
+ debian/libcairo2.symbols,
+ debian/rules:
+ + Enable the OpenGL/EGL backend again (temporarily disabled in
+ 1.10.2-5).
-- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/control b/debian/control
index 00a87a5..e25974d 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Build-Depends: debhelper (>= 7),
libxcb1-dev (>= 1.4),
libxcb-render0-dev (>= 0.9.92),
libxcb-shm0-dev,
-# libgl1-mesa-dev,
-# libegl1-mesa-dev [!hurd-any],
+ libgl1-mesa-dev,
+ libegl1-mesa-dev [!hurd-any],
libglib2.0-dev,
zlib1g-dev
Standards-Version: 3.8.4
@@ -45,8 +45,8 @@ Depends: libcairo2 (= ${binary:Version}),
libxcb1-dev (>= 1.4),
libxcb-render0-dev (>= 0.9.92),
libxcb-shm0-dev,
-# libgl1-mesa-dev,
-# libegl1-mesa-dev [!hurd-any],
+ libgl1-mesa-dev,
+ libegl1-mesa-dev [!hurd-any],
libglib2.0-dev,
${shlibs:Depends},
${misc:Depends}
diff --git a/debian/libcairo2.symbols b/debian/libcairo2.symbols
index 1eca412..b37d49a 100644
--- a/debian/libcairo2.symbols
+++ b/debian/libcairo2.symbols
@@ -28,7 +28,7 @@ libcairo.so.2 libcairo2 #MINVER#
cairo_device_status@Base 1.10.0
cairo_device_to_user@Base 1.2.4
cairo_device_to_user_distance@Base 1.2.4
-# (arch=!hurd-any)cairo_egl_device_create@Base 1.10.2-2~
+ (arch=!hurd-any)cairo_egl_device_create@Base 1.10.2-2~
cairo_fill@Base 1.2.4
cairo_fill_extents@Base 1.2.4
cairo_fill_preserve@Base 1.2.4
@@ -82,17 +82,17 @@ libcairo.so.2 libcairo2 #MINVER#
cairo_get_target@Base 1.2.4
cairo_get_tolerance@Base 1.2.4
cairo_get_user_data@Base 1.4.10
-# cairo_gl_surface_create@Base 1.10.2-2~
-# (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.10.2-2~
-# cairo_gl_surface_create_for_texture@Base 1.10.2-2~
-# cairo_gl_surface_create_for_window@Base 1.10.2-2~
-# cairo_gl_surface_get_height@Base 1.10.2-2~
-# cairo_gl_surface_get_width@Base 1.10.2-2~
-# cairo_gl_surface_set_size@Base 1.10.2-2~
-# cairo_gl_surface_swapbuffers@Base 1.10.2-2~
-# cairo_glx_device_create@Base 1.10.2-2~
-# cairo_glx_device_get_context@Base 1.10.2-2~
-# cairo_glx_device_get_display@Base 1.10.2-2~
+ cairo_gl_surface_create@Base 1.10.2-2~
+ (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.10.2-2~
+ cairo_gl_surface_create_for_texture@Base 1.10.2-2~
+ cairo_gl_surface_create_for_window@Base 1.10.2-2~
+ cairo_gl_surface_get_height@Base 1.10.2-2~
+ cairo_gl_surface_get_width@Base 1.10.2-2~
+ cairo_gl_surface_set_size@Base 1.10.2-2~
+ cairo_gl_surface_swapbuffers@Base 1.10.2-2~
+ cairo_glx_device_create@Base 1.10.2-2~
+ cairo_glx_device_get_context@Base 1.10.2-2~
+ cairo_glx_device_get_display@Base 1.10.2-2~
cairo_glyph_allocate@Base 1.7.2
cairo_glyph_extents@Base 1.2.4
cairo_glyph_free@Base 1.7.2
diff --git a/debian/rules b/debian/rules
index df8d0ab..9daa46b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,8 @@ endif
main_configure_flags += \
$(configure_flags) \
--enable-xlib --enable-svg \
---enable-xcb --enable-perf-utils # --enable-gl
+--enable-xcb --enable-perf-utils \
+--enable-gl
udeb_configure_flags += \
$(configure_flags) \
--
1.7.5.4
From 2ffe7e05e1a8184f77abdbce04183daac9c081ec Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 20 Jun 2011 02:23:47 +0200
Subject: [PATCH 6/9] libcairo2.symbols: Bump version for the related symbols
to 1.11.2.
---
debian/changelog | 2 +-
debian/libcairo2.symbols | 32 ++++++++++++++++----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b40d104..2b60898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
debian/libcairo2.symbols,
debian/rules:
+ Enable the OpenGL/EGL backend again (temporarily disabled in
- 1.10.2-5).
+ 1.10.2-5). Bump version for the related symbols to 1.11.2.
-- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/libcairo2.symbols b/debian/libcairo2.symbols
index b37d49a..3a9e009 100644
--- a/debian/libcairo2.symbols
+++ b/debian/libcairo2.symbols
@@ -28,7 +28,7 @@ libcairo.so.2 libcairo2 #MINVER#
cairo_device_status@Base 1.10.0
cairo_device_to_user@Base 1.2.4
cairo_device_to_user_distance@Base 1.2.4
- (arch=!hurd-any)cairo_egl_device_create@Base 1.10.2-2~
+ (arch=!hurd-any)cairo_egl_device_create@Base 1.11.2
cairo_fill@Base 1.2.4
cairo_fill_extents@Base 1.2.4
cairo_fill_preserve@Base 1.2.4
@@ -82,17 +82,17 @@ libcairo.so.2 libcairo2 #MINVER#
cairo_get_target@Base 1.2.4
cairo_get_tolerance@Base 1.2.4
cairo_get_user_data@Base 1.4.10
- cairo_gl_surface_create@Base 1.10.2-2~
- (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.10.2-2~
- cairo_gl_surface_create_for_texture@Base 1.10.2-2~
- cairo_gl_surface_create_for_window@Base 1.10.2-2~
- cairo_gl_surface_get_height@Base 1.10.2-2~
- cairo_gl_surface_get_width@Base 1.10.2-2~
- cairo_gl_surface_set_size@Base 1.10.2-2~
- cairo_gl_surface_swapbuffers@Base 1.10.2-2~
- cairo_glx_device_create@Base 1.10.2-2~
- cairo_glx_device_get_context@Base 1.10.2-2~
- cairo_glx_device_get_display@Base 1.10.2-2~
+ cairo_gl_surface_create@Base 1.11.2
+ (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.11.2
+ cairo_gl_surface_create_for_texture@Base 1.11.2
+ cairo_gl_surface_create_for_window@Base 1.11.2
+ cairo_gl_surface_get_height@Base 1.11.2
+ cairo_gl_surface_get_width@Base 1.11.2
+ cairo_gl_surface_set_size@Base 1.11.2
+ cairo_gl_surface_swapbuffers@Base 1.11.2
+ cairo_glx_device_create@Base 1.11.2
+ cairo_glx_device_get_context@Base 1.11.2
+ cairo_glx_device_get_display@Base 1.11.2
cairo_glyph_allocate@Base 1.7.2
cairo_glyph_extents@Base 1.2.4
cairo_glyph_free@Base 1.7.2
@@ -295,10 +295,10 @@ libcairo.so.2 libcairo2 #MINVER#
cairo_svg_surface_create_for_stream@Base 1.2.4
cairo_svg_surface_restrict_to_version@Base 1.2.4
cairo_svg_version_to_string@Base 1.2.4
- cairo_tee_surface_add@Base 1.10.2-2~
- cairo_tee_surface_create@Base 1.10.2-2~
- cairo_tee_surface_index@Base 1.10.2-2~
- cairo_tee_surface_remove@Base 1.10.2-2~
+ cairo_tee_surface_add@Base 1.11.2
+ cairo_tee_surface_create@Base 1.11.2
+ cairo_tee_surface_index@Base 1.11.2
+ cairo_tee_surface_remove@Base 1.11.2
cairo_text_cluster_allocate@Base 1.7.2
cairo_text_cluster_free@Base 1.7.2
cairo_text_extents@Base 1.2.4
--
1.7.5.4
From 1970338b52d7bf505ad561e8aa599068c4b4b7da Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 20 Jun 2011 03:00:14 +0200
Subject: [PATCH 7/9] libcairo2.symbols: Add cairo_pattern_create_mesh and
cairo_pattern_mesh_* symbols.
---
debian/changelog | 2 ++
debian/libcairo2.symbols | 13 +++++++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2b60898..5d4dc72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
debian/rules:
+ Enable the OpenGL/EGL backend again (temporarily disabled in
1.10.2-5). Bump version for the related symbols to 1.11.2.
+ * debian/libcairo2.symbols:
+ + Add cairo_pattern_create_mesh and cairo_pattern_mesh_* symbols.
-- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/libcairo2.symbols b/debian/libcairo2.symbols
index 3a9e009..f38dab1 100644
--- a/debian/libcairo2.symbols
+++ b/debian/libcairo2.symbols
@@ -137,6 +137,7 @@ libcairo.so.2 libcairo2 #MINVER#
cairo_pattern_add_color_stop_rgba@Base 1.2.4
cairo_pattern_create_for_surface@Base 1.2.4
cairo_pattern_create_linear@Base 1.2.4
+ cairo_pattern_create_mesh@Base 1.11.2
cairo_pattern_create_radial@Base 1.2.4
cairo_pattern_create_rgb@Base 1.2.4
cairo_pattern_create_rgba@Base 1.2.4
@@ -153,6 +154,18 @@ libcairo.so.2 libcairo2 #MINVER#
cairo_pattern_get_surface@Base 1.4.10
cairo_pattern_get_type@Base 1.2.4
cairo_pattern_get_user_data@Base 1.4.10
+ cairo_pattern_mesh_begin_patch@Base 1.11.2
+ cairo_pattern_mesh_curve_to@Base 1.11.2
+ cairo_pattern_mesh_end_patch@Base 1.11.2
+ cairo_pattern_mesh_get_control_point@Base 1.11.2
+ cairo_pattern_mesh_get_corner_color_rgba@Base 1.11.2
+ cairo_pattern_mesh_get_patch_count@Base 1.11.2
+ cairo_pattern_mesh_get_path@Base 1.11.2
+ cairo_pattern_mesh_line_to@Base 1.11.2
+ cairo_pattern_mesh_move_to@Base 1.11.2
+ cairo_pattern_mesh_set_control_point@Base 1.11.2
+ cairo_pattern_mesh_set_corner_color_rgb@Base 1.11.2
+ cairo_pattern_mesh_set_corner_color_rgba@Base 1.11.2
cairo_pattern_reference@Base 1.2.4
cairo_pattern_set_extend@Base 1.2.4
cairo_pattern_set_filter@Base 1.2.4
--
1.7.5.4
From 9a53393fb999fdc6acf6e4793fb39ec49cbe80f9 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 20 Jun 2011 03:03:12 +0200
Subject: [PATCH 8/9] debian/rules: Bump shlibs for libcairo2 due to new
symbols.
---
debian/changelog | 2 ++
debian/rules | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5d4dc72..94b6e1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
1.10.2-5). Bump version for the related symbols to 1.11.2.
* debian/libcairo2.symbols:
+ Add cairo_pattern_create_mesh and cairo_pattern_mesh_* symbols.
+ * debian/rules:
+ + Bump shlibs for libcairo2 due to new symbols.
-- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/rules b/debian/rules
index 9daa46b..b2c1395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,7 +159,7 @@ binary-arch: build install
dh_lintian -s
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>= 1.10.2-2~)' -- -c4
+ dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>= 1.11.2)' -- -c4
dh_makeshlibs -plibcairo-gobject2 -V 'libcairo-gobject2 (>= 1.10.0)' -- -c4
dh_makeshlibs -plibcairo-script-interpreter2 -V 'libcairo-script-interpreter2 (>= 1.10.0)' -- -c4
dh_installdeb -s
--
1.7.5.4
Attachment:
0009-Add-8-.patch-and-9-.patch-cherry-picked-from-upstrea.patch.bz2
Description: Binary data
Attachment:
signature.asc
Description: Digital signature