sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (c6956d78f889ba56fa2ab44a838e52b4a6c64e62)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c6956d78f889ba56fa2ab44a838e52b4a6c64e62)
Date: Mon, 27 Feb 2023 22:16:10 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

gnome2-libs/goffice/DETAILS |
4
gnome2-libs/goffice/HISTORY |
3
x11-libs/cairo/HISTORY |
4
x11-libs/cairo/patches-stable/0001-tee-Fix-cairo-wrapper-functions.patch |
111 ++++++++++
4 files changed, 120 insertions(+), 2 deletions(-)

New commits:
commit c6956d78f889ba56fa2ab44a838e52b4a6c64e62
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cairo: Fix build of tee surface backend

commit 2cbcfb340d996ef8c50cb2abcced08758faa055e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

goffice 0.10.55

diff --git a/gnome2-libs/goffice/DETAILS b/gnome2-libs/goffice/DETAILS
index b171b22..b86cee0 100755
--- a/gnome2-libs/goffice/DETAILS
+++ b/gnome2-libs/goffice/DETAILS
@@ -1,10 +1,10 @@
SPELL=goffice
- VERSION=0.10.53
+ VERSION=0.10.55
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:cd2d0f49f803cb2f01b3a690bfbe3ea4be5c09e00e8ef643055f56c16549529b7c2c098b87286062d3a5048c1f64d600f74082f53710d8ed8cbb34cb6829dafd
+
SOURCE_HASH=sha512:c49eec867e4147102b54b70847b495cad0e55fcb069c78a8374760121219b9097c1dfb5601b240e92ed68a6fb785ab5e771f7c579dd138e106ee25a1b9ddfe99
LICENSE[0]=LGPL
WEB_SITE=http://www.gnome.org/
ENTERED=20050530
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index 0db4198..9d2b0a8 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,6 @@
+2023-02-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.55
+
2022-09-23 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.10.53

diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f027777..becb90e 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2023-02-27 Ismael Luceno <ismael AT sourcemage.org>
+ * 0001-tee-Fix-cairo-wrapper-functions.patch:
+ added build fix for tee surface backend
+
2023-02-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.17.8, updated SOURCE_URL[0], bz2 -> xz, switched
to
UPSTREAM_HASH
diff --git
a/x11-libs/cairo/patches-stable/0001-tee-Fix-cairo-wrapper-functions.patch
b/x11-libs/cairo/patches-stable/0001-tee-Fix-cairo-wrapper-functions.patch
new file mode 100644
index 0000000..42fa0d8
--- /dev/null
+++ b/x11-libs/cairo/patches-stable/0001-tee-Fix-cairo-wrapper-functions.patch
@@ -0,0 +1,111 @@
+From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi AT gnome.org>
+Date: Fri, 3 Feb 2023 15:40:12 +0100
+Subject: [PATCH] tee: Fix cairo wrapper functions
+
+Follow-up to !391 to apply the same changes to the (disabled by default)
+tee surface.
+
+Fixes: #634
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/cairo-tee-surface.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c
+index 7a94c9bca..4994a5a60 100644
+--- a/src/cairo-tee-surface.c
++++ b/src/cairo-tee-surface.c
+@@ -220,12 +220,12 @@ _cairo_tee_surface_paint (void
*abstract_surface,
+ num_slaves = _cairo_array_num_elements (&surface->slaves);
+ slaves = _cairo_array_index (&surface->slaves, 0);
+ for (n = 0; n < num_slaves; n++) {
+- status = _cairo_surface_wrapper_paint (&slaves[n], op, source, clip);
++ status = _cairo_surface_wrapper_paint (&slaves[n], op, source, 0,
clip);
+ if (unlikely (status))
+ return status;
+ }
+
+- return _cairo_surface_wrapper_paint (&surface->master, op, source,
clip);
++ return _cairo_surface_wrapper_paint (&surface->master, op, source, 0,
clip);
+ }
+
+ static cairo_int_status_t
+@@ -244,13 +244,17 @@ _cairo_tee_surface_mask (void
*abstract_surface,
+ slaves = _cairo_array_index (&surface->slaves, 0);
+ for (n = 0; n < num_slaves; n++) {
+ status = _cairo_surface_wrapper_mask (&slaves[n],
+- op, source, mask, clip);
++ op, source, 0,
++ mask, 0,
++ clip);
+ if (unlikely (status))
+ return status;
+ }
+
+ return _cairo_surface_wrapper_mask (&surface->master,
+- op, source, mask, clip);
++ op, source, 0,
++ mask, 0,
++ clip);
+ }
+
+ static cairo_int_status_t
+@@ -274,7 +278,7 @@ _cairo_tee_surface_stroke (void
*abstract_surface,
+ slaves = _cairo_array_index (&surface->slaves, 0);
+ for (n = 0; n < num_slaves; n++) {
+ status = _cairo_surface_wrapper_stroke (&slaves[n],
+- op, source,
++ op, source, 0,
+ path, style,
+ ctm, ctm_inverse,
+ tolerance, antialias,
+@@ -284,7 +288,7 @@ _cairo_tee_surface_stroke (void
*abstract_surface,
+ }
+
+ return _cairo_surface_wrapper_stroke (&surface->master,
+- op, source,
++ op, source, 0,
+ path, style,
+ ctm, ctm_inverse,
+ tolerance, antialias,
+@@ -310,7 +314,7 @@ _cairo_tee_surface_fill (void
*abstract_surface,
+ slaves = _cairo_array_index (&surface->slaves, 0);
+ for (n = 0; n < num_slaves; n++) {
+ status = _cairo_surface_wrapper_fill (&slaves[n],
+- op, source,
++ op, source, 0,
+ path, fill_rule,
+ tolerance, antialias,
+ clip);
+@@ -319,7 +323,7 @@ _cairo_tee_surface_fill (void
*abstract_surface,
+ }
+
+ return _cairo_surface_wrapper_fill (&surface->master,
+- op, source,
++ op, source, 0,
+ path, fill_rule,
+ tolerance, antialias,
+ clip);
+@@ -361,7 +365,7 @@ _cairo_tee_surface_show_text_glyphs (void
*abstract_surface,
+ for (n = 0; n < num_slaves; n++) {
+ memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
+ status = _cairo_surface_wrapper_show_text_glyphs (&slaves[n], op,
+- source,
++ source, 0,
+ utf8, utf8_len,
+ glyphs_copy,
num_glyphs,
+ clusters,
num_clusters,
+@@ -374,7 +378,7 @@ _cairo_tee_surface_show_text_glyphs (void
*abstract_surface,
+
+ memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
+ status = _cairo_surface_wrapper_show_text_glyphs (&surface->master, op,
+- source,
++ source, 0,
+ utf8, utf8_len,
+ glyphs_copy, num_glyphs,
+ clusters, num_clusters,
+--
+GitLab
+

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (c6956d78f889ba56fa2ab44a838e52b4a6c64e62), Ismael Luceno, 02/27/2023