* [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
@ 2019-03-30 2:04 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2019-03-30 2:04 UTC (permalink / raw
To: gentoo-commits
commit: 8e27a74b58384414d920401521f7460a240ea37a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 02:00:30 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 02:03:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e27a74b
x11-libs/cairo: Pull in a few fixes from upstream
Bug: https://bugs.gentoo.org/672908
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 132 +++++++++++++++++++++
...one_MM_Var-instead-of-free-when-available.patch | 30 +++++
.../files/cairo-1.16.0-pdf-add-missing-flush.patch | 29 +++++
3 files changed, 191 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
new file mode 100644
index 00000000000..127a9e7d75f
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+ SRC_URI=""
+else
+ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? ( x11-base/xorg-proto )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2? ( !opengl )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+ "${FILESDIR}"/${P}-pdf-add-missing-flush.patch
+ "${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+)
+
+src_prepare() {
+ default
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+ fi
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == *9999* ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable gles2 glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable utils trace) \
+ $(use_enable valgrind) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ --enable-ft \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ --enable-script \
+ --enable-interpreter \
+ --disable-drm \
+ --disable-directfb \
+ --disable-gallium \
+ --disable-qt \
+ --disable-vg \
+ --disable-xlib-xcb \
+ ${myopts}
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+}
diff --git a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
new file mode 100644
index 00000000000..3709c5a90f8
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
@@ -0,0 +1,30 @@
+From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <cgarcia@igalia.com>
+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
+
diff --git a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch
new file mode 100644
index 00000000000..19345f14187
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch
@@ -0,0 +1,29 @@
+From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+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 7eb61aa1e..939b2d2d7 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, &extents.bounded, &alpha) &&
+ _can_paint_pattern (source)) {
++
++ status = _cairo_pdf_operators_flush (&surface->pdf_operators);
++ if (unlikely (status))
++ goto cleanup;
++
+ _cairo_output_stream_printf (surface->output, "q\n");
+ status = _cairo_pdf_surface_paint_pattern (surface,
+ op,
+--
+2.19.2
+
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
@ 2020-02-04 9:03 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-02-04 9:03 UTC (permalink / raw
To: gentoo-commits
commit: 66be6eece6fb20cd720d5c0490eedfc947c918bc
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 4 09:02:14 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Feb 4 09:03:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66be6eec
x11-libs/cairo: tweak for binutils-2.34, bug #707960
Reported-by: Hugo Ribeiro
Closes: https://bugs.gentoo.org/707960
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 6 +++++-
x11-libs/cairo/cairo-9999.ebuild | 6 +++++-
.../cairo/files/cairo-1.16.0-binutils-2.34.patch | 20 ++++++++++++++++++++
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 275c687dcf5..2d3601c7a39 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -67,6 +67,10 @@ PATCHES=(
src_prepare() {
default
+ if has_version ">=sys-libs/binutils-libs-2.34"; then
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+ fi
+
# tests and perf tools require X, bug #483574
if ! use X; then
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index d5022d1759a..29d74b12d97 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -65,6 +65,10 @@ PATCHES=(
src_prepare() {
default
+ if has_version ">=sys-libs/binutils-libs-2.34"; then
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+ fi
+
# tests and perf tools require X, bug #483574
if ! use X; then
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
new file mode 100644
index 00000000000..03daac0eca4
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
@@ -0,0 +1,20 @@
+--- a/util/cairo-trace/lookup-symbol.c
++++ b/util/cairo-trace/lookup-symbol.c
+@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
+ if (symbol->found)
+ return;
+
+- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
++ if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
+ return;
+
+- vma = bfd_get_section_vma (symtab->bfd, section);
++ vma = bfd_section_vma (section);
+ if (symbol->pc < vma)
+ return;
+
+- size = bfd_section_size (symtab->bfd, section);
++ size = bfd_section_size (section);
+ if (symbol->pc >= vma + size)
+ return;
+
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
@ 2020-06-13 20:13 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-06-13 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 75aebadc586d4bbce67e1bb948a10da28b5c703d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 20:11:50 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 20:13:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75aebadc
x11-libs/cairo: detect 'strings' with AC_CHECK_TOOL
This way all binutils tools are detected with $CHOST prefix
if exist. Fixes 64-bit build on sys-devel/binutils-config[-native-symlinks]
system.
Closes: https://bugs.gentoo.org/726200
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 135 ++++++++++++++++++++++++
x11-libs/cairo/files/cairo-1.16.0-strings.patch | 19 ++++
2 files changed, 154 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
new file mode 100644
index 00000000000..d9108285f73
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+ SRC_URI=""
+else
+ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+BDEPEND="
+ virtual/pkgconfig
+ >=sys-devel/libtool-2"
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2-only? ( !opengl )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+ "${FILESDIR}"/${P}-pdf-add-missing-flush.patch
+ "${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+ "${FILESDIR}"/${P}-strings.patch
+)
+
+src_prepare() {
+ default
+
+ if has_version ">=sys-libs/binutils-libs-2.34"; then
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+ fi
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+ fi
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == *9999* ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable X xcb) \
+ $(use_enable X xcb-shm) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable gles2-only glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable utils trace) \
+ $(use_enable valgrind) \
+ --enable-ft \
+ --enable-interpreter \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ --enable-script \
+ --disable-drm \
+ --disable-directfb \
+ --disable-gallium \
+ --disable-qt \
+ --disable-vg \
+ --disable-xlib-xcb \
+ ${myopts}
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -delete || die
+ einstalldocs
+}
diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
new file mode 100644
index 00000000000..ee72f9dec7c
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/726200
+--- a/build/aclocal.float.m4
++++ b/build/aclocal.float.m4
+@@ -31,10 +31,13 @@ int main() { return 0; }
+
+ ]])], [
+
+-if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then
++# allow users to override default 'strings' with 'llvm-strings'
++# or ${CHOST}-strings.
++AC_CHECK_TOOL(STRINGS, strings)
++if $STRINGS -a conftest$ac_exeext | grep noonsees >/dev/null ; then
+ ax_cv_c_float_words_bigendian=yes
+ fi
+-if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
++if $STRINGS -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
+ if test "$ax_cv_c_float_words_bigendian" = unknown; then
+ ax_cv_c_float_words_bigendian=no
+ else
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
@ 2022-09-04 18:06 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-09-04 18:06 UTC (permalink / raw
To: gentoo-commits
commit: 3392d007e80240e76b457782760e558afb1b2a4f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 18:06:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 18:06:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3392d007
x11-libs/cairo: fix build with binutils-2.39
Closes: https://bugs.gentoo.org/868405
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/cairo/cairo-1.16.0-r5.ebuild | 1 +
.../files/cairo-1.16.0-binutils-2.39-ptr.patch | 29 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index bf5a7256fd4b..dc8e73c91275 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
"${FILESDIR}"/${P}-strings.patch
+ "${FILESDIR}"/${P}-binutils-2.39-ptr.patch
)
src_prepare() {
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
new file mode 100644
index 000000000000..6749786d23bd
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
@@ -0,0 +1,29 @@
+https://gitlab.freedesktop.org/cairo/cairo/-/commit/74f2da7b70179a363b5a4649b9c5d6fd18d9cbc0
+https://bugs.gentoo.org/868405
+
+From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 13 Jul 2022 21:26:57 +0100
+Subject: [PATCH] Fix build with newer binutils-dev installed
+
+It seems the PTR typedef (or macro?) has been removed from newer versions
+of libbfd.
+
+Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
+Signed-off-by: Simon McVittie <smcv@debian.org>
+--- a/util/cairo-trace/lookup-symbol.c
++++ b/util/cairo-trace/lookup-symbol.c
+@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char *filename)
+ if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching))
+ goto BAIL;
+
+- symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) &symtab->syms, &size);
++ symcount = bfd_read_minisymbols (symtab->bfd, false, (void **) &symtab->syms, &size);
+ if (symcount == 0) {
+ symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
+- (PTR) &symtab->syms, &size);
++ (void **) &symtab->syms, &size);
+ }
+ if (symcount < 0)
+ goto BAIL;
+GitLab
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
@ 2023-03-01 20:43 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2023-03-01 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 19503f976ef7032187350847b70aace960173ec8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 1 19:27:47 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 1 20:43:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19503f97
x11-libs/cairo: Version bump to 1.17.8
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/cairo/Manifest | 1 +
x11-libs/cairo/cairo-1.17.8.ebuild | 86 ++++++++++++++++
.../1.17.8-tee-Fix-cairo-wrapper-functions.patch | 109 +++++++++++++++++++++
3 files changed, 196 insertions(+)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7a62019cb85a..8de7a387b7f5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
+DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild b/x11-libs/cairo/cairo-1.17.8.ebuild
new file mode 100644
index 000000000000..a27acb5ec771
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+ SRC_URI=""
+else
+ SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug +glib gtk-doc test"
+RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib
+
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+ debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+ # Upstream
+ "${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.patch
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddwrite=disabled
+ -Dfontconfig=enabled
+ -Dfreetype=enabled
+ -Dpng=enabled
+ $(meson_feature aqua quartz)
+ $(meson_feature X tee)
+ $(meson_feature X xcb)
+ $(meson_feature X xlib)
+ -Dxlib-xcb=disabled
+ -Dxml=disabled
+ -Dzlib=enabled
+
+ $(meson_feature test tests)
+
+ -Dgtk2-utils=disabled
+
+ $(meson_feature glib)
+ -Dspectre=disabled # only used for tests
+ $(meson_feature debug symbol-lookup)
+
+ $(meson_use gtk-doc gtk_doc)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+ mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+ rmdir "${ED}"/usr/share/gtk-doc/html || die
+ fi
+}
diff --git a/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
new file mode 100644
index 000000000000..a9bf577f9616
--- /dev/null
+++ b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
@@ -0,0 +1,109 @@
+From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@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
+---
+ 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,
+--
+2.39.2
+
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
@ 2023-12-02 16:23 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2023-12-02 16:23 UTC (permalink / raw
To: gentoo-commits
commit: a1706f49e1fd8c1605c4af96774563e3da549fd4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 16:22:03 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 16:22:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1706f49
x11-libs/cairo: Drop old versions
Bug: https://bugs.gentoo.org/717778
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/cairo/Manifest | 1 -
x11-libs/cairo/cairo-1.17.8.ebuild | 100 -------------------
.../1.17.8-tee-Fix-cairo-wrapper-functions.patch | 109 ---------------------
3 files changed, 210 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 5536b5d0d0f9..644677d49780 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,2 +1 @@
-DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B 1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b SHA512 bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild b/x11-libs/cairo/cairo-1.17.8.ebuild
deleted file mode 100644
index 0a245be4edad..000000000000
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
- SRC_URI=""
-else
- SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug +glib gtk-doc test"
-# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
-# any2ppm tests seem to hang for now.
-RESTRICT="test !test? ( test )"
-
-RDEPEND="
- >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
- debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- test? (
- app-text/ghostscript-gpl
- app-text/poppler[cairo]
- gnome-base/librsvg
- )
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
-
- # Upstream
- "${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.patch
-)
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddwrite=disabled
- -Dfontconfig=enabled
- -Dfreetype=enabled
- -Dpng=enabled
- $(meson_feature aqua quartz)
- $(meson_feature X tee)
- $(meson_feature X xcb)
- $(meson_feature X xlib)
- -Dxlib-xcb=disabled
- -Dxml=disabled
- -Dzlib=enabled
-
- # Requires poppler-glib (poppler[cairo]) which isn't available in multilib
- $(meson_native_use_feature test tests)
-
- -Dgtk2-utils=disabled
-
- $(meson_feature glib)
- -Dspectre=disabled # only used for tests
- $(meson_feature debug symbol-lookup)
-
- $(meson_use gtk-doc gtk_doc)
- )
-
- meson_src_configure
-}
-
-multilib_src_test() {
- multilib_is_native_abi && meson_src_test
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
- mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
- rmdir "${ED}"/usr/share/gtk-doc/html || die
- fi
-}
diff --git a/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
deleted file mode 100644
index a9bf577f9616..000000000000
--- a/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@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
----
- 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,
---
-2.39.2
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-02 16:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-30 2:04 [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2020-02-04 9:03 Sergei Trofimovich
2020-06-13 20:13 Sergei Trofimovich
2022-09-04 18:06 Sam James
2023-03-01 20:43 Matt Turner
2023-12-02 16:23 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox