sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e24d4613315184a405e5b628a2a7321b8b36ca44)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e24d4613315184a405e5b628a2a7321b8b36ca44)
Date: Sat, 23 Sep 2023 19:05:27 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

x11-libs/cairo/DEPENDS |
14 -
x11-libs/cairo/DETAILS |
7
x11-libs/cairo/HISTORY |
9
x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch |
14 -
x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch |
14 -
x11-libs/cairo/patches-stable/0001-tee-Fix-cairo-wrapper-functions.patch |
111 ----------
x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch |
14 +
7 files changed, 30 insertions(+), 153 deletions(-)

New commits:
commit e24d4613315184a405e5b628a2a7321b8b36ca44
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11-libs/cairo: version 1.18.0

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index c492560..aa317c6 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,13 +1,13 @@
. "$GRIMOIRE/FUNCTIONS" &&
. "${GRIMOIRE}/MESON_DEPENDS" &&
+list_remove CAIRO_OPTS "xml=enabled" &&
+list_remove CAIRO_OPTS "xml=disabled" &&

case "$HOST" in
(*-musl) depends libexecinfo ;;
esac &&

if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
- list_remove CAIRO_OPTS "xml=enabled" &&
- list_remove CAIRO_OPTS "xml=disabled" &&
depends git
fi &&

@@ -76,12 +76,4 @@ optional_depends lzo "" "" "for LZO compression support" &&
optional_depends gtk-doc \
"gtk_doc=true" \
"gtk_doc=false" \
- "Build documentation with gtk-doc" &&
-
-if [[ "${CAIRO_BRANCH}" != "scm" ]] &&
-is_depends_enabled "${SPELL}" "zlib" &&
-is_depends_enabled "${SPELL}" "libpng"; then
- config_query_option CAIRO_OPTS "Enable XML surface backend?" y \
- "xml=enabled" \
- "xml=disabled"
-fi
+ "Build documentation with gtk-doc"
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 1a266c1..f9f2dc5 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -9,10 +9,11 @@ if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=1.17.8
-
SOURCE_HASH="sha256:5b10c8892d1b58d70d3f0ba5b47863a061262fa56b9dc7944161f8c8b783bc64:UPSTREAM_HASH"
+ VERSION=1.18.0
+
SOURCE_HASH="sha256:243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64:UPSTREAM_HASH"
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_URL[0]="https://cairographics.org/snapshots/${SOURCE}";
+ SOURCE_URL[0]="https://cairographics.org/releases/${SOURCE}";
+# Watch: https://cairographics.org/releases/
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://cairographics.org/
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index c686ecb..db17f28 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,12 @@
+2023-09-23 Pavel Vinogradov <public AT sorcemage.org>
+ * DETAILS: version 1.18.0, updated SOURCE_URL[0], added Watch line
+ * DEPENDS: cleaned up xml flag
+ * patches-scm/0001-Fix-build-against-binutils-2.39.patch,
+ patches-stable/0001-Fix-build-against-binutils-2.39.patch,
+ atches-stable/0001-tee-Fix-cairo-wrapper-functions.patch: removed
+ * patches/0001-Fix-build-against-binutils-2.39.patch: added chunks
from scm
+ patch
+
2023-88-17 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, patches{,-{scm,stable}}/
0001-Fix-build-against-binutils-2.39.patch: split the patch across
diff --git
a/x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch
b/x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch
deleted file mode 100644
index 35b1cfe..0000000
--- a/x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
-index 8d4ac131b..cf05352c5 100644
---- a/util/cairo-trace/meson.build
-+++ b/util/cairo-trace/meson.build
-@@ -11,7 +11,8 @@ shared_lib_ext = libcairo.full_path().split('.')[-1]
- libcairotrace = library('cairo-trace', cairo_trace_sources,
- include_directories: [incbase, incsrc],
- dependencies: deps,
-- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] +
pthread_c_args,
-+ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
-+ '-DPACKAGE=cairo
-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
- link_args: extra_link_args,
- gnu_symbol_visibility: 'hidden',
- install: true,
diff --git
a/x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch
b/x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch
deleted file mode 100644
index 85e3fce..0000000
--- a/x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
-index c4a504759..d90a994ea 100644
---- a/util/cairo-trace/meson.build
-+++ b/util/cairo-trace/meson.build
-@@ -12,7 +12,8 @@ libcairotrace = library('cairo-trace', cairo_trace_sources,
- include_directories: [incbase, incsrc],
- dependencies: deps,
- link_args: extra_link_args,
-- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] +
pthread_c_args,
-+ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
-+ '-DPACKAGE=cairo
-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
- install: true,
- install_dir: join_paths(get_option('prefix'), get_option('libdir'),
'cairo'),
- )
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
deleted file mode 100644
index 42fa0d8..0000000
--- a/x11-libs/cairo/patches-stable/0001-tee-Fix-cairo-wrapper-functions.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-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
-
diff --git
a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
index c88f4f1..45ba675 100644
--- a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
+++ b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
@@ -13,3 +13,17 @@ index 970f49a52..14736e12e 100644
conf.set('HAVE_BFD', 1)
deps += [bfd_dep]
elif get_option('symbol-lookup').enabled()
+diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
+index 8d4ac131b..cf05352c5 100644
+--- a/util/cairo-trace/meson.build
++++ b/util/cairo-trace/meson.build
+@@ -11,7 +11,8 @@ shared_lib_ext = libcairo.full_path().split('.')[-1]
+ libcairotrace = library('cairo-trace', cairo_trace_sources,
+ include_directories: [incbase, incsrc],
+ dependencies: deps,
+- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] +
pthread_c_args,
++ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
++ '-DPACKAGE=cairo
-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
+ link_args: extra_link_args,
+ gnu_symbol_visibility: 'hidden',
+ install: true,

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e24d4613315184a405e5b628a2a7321b8b36ca44), Pavel Vinogradov, 09/23/2023