<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f16cfeb5b5f1f4d3c3b0c870bc4e9a91fdf00d4">https://github.com/macports/macports-ports/commit/9f16cfeb5b5f1f4d3c3b0c870bc4e9a91fdf00d4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9f16cfeb5b5f1f4d3c3b0c870bc4e9a91fdf00d4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Oct 21 17:32:06 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> cairo-devel: update to 1.18
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Note: build for 10.7 may fail
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66852
</span>---
graphics/cairo-devel/Portfile | 118 ++++++++++-----------
graphics/cairo-devel/files/dont-check-stderr.patch | 109 -------------------
graphics/cairo-devel/files/memory-leak.patch | 27 -----
graphics/cairo-devel/files/patch-configure.diff | 32 ------
.../files/patch-darwin-dylib-versions.diff | 66 ++++++++++++
.../files/patch-meson-add-option-lzo2.diff | 27 +++++
6 files changed, 149 insertions(+), 230 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/Portfile b/graphics/cairo-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b2d30e9fe1a..4cecce85c8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup debug 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span> PortGroup muniversal 1.0
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,17 +17,17 @@ legacysupport.newest_darwin_requires_legacy 10
</span> name cairo-devel
conflicts cairo
set my_name cairo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.17.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b02bab53ca0f77bc3b8d095a6bfde56d7ab8c988 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35055900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.18.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5bdf361c9fbbfedc5cccd5a4e1fd2049c29aa59b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33761148
</span>
categories graphics
maintainers {ryandesign @ryandesign} {mascguy @mascguy}
license {LGPL-2.1 MPL-1.1}
homepage https://www.cairographics.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/snapshots/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/releases/
</span> platforms darwin macosx
dist_subdir ${my_name}
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +39,31 @@ long_description Cairo is ${description}. It is designed to produce \
</span> advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable unexpected download of subprojects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+meson.wrap_mode nodownload
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch to correctly set dylib versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-darwin-dylib-versions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch to add build option 'lzo2', so that we can explicitly disable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-add-option-lzo2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *.py ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "patching env python3: ${f}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python3$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot}
</span>
depends_lib-append \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,16 +76,6 @@ depends_lib-append \
</span>
minimum_xcodeversions {8 2.4.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Prevent cairo from using librsvg, libspectre, poppler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't check stderr in configure tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append dont-check-stderr.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Backport from 1.17.8 as that release is a major change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/316
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append memory-leak.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://trac.macports.org/ticket/34137
compiler.blacklist-append {clang < 318.0.61}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,44 +88,24 @@ if {${configure.build_arch} eq "x86_64" || (${universal_possible} && [variant_is
</span> }
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-quartz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-quartz-font \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-quartz-image \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-symbol-lookup \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xlib-xcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xcb-shm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ft \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-pdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ps \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-script \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-svg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-tee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Prevent cairo from using ghostscript.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append ac_cv_prog_GS=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Prevent cairo from using lzo2 because its GPL license makes cairo's effective license GPL too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append ac_cv_lib_lzo2_lzo2a_decompress=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant opengl requires x11 description {Add OpenGL graphics interface} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-gl --enable-gl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-glx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dfontconfig=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dfreetype=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dglib=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlzo2=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpng=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dquartz=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dspectre=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsymbol-lookup=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtee=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtests=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dxcb=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dxlib=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dxlib-xcb=disabled
</span>
platform macosx {
variant quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-quartz --enable-quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-quartz-font --enable-quartz-font
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-quartz-image --enable-quartz-image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dquartz=disabled -Dquartz=enabled
</span> }
default_variants +quartz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,13 +126,16 @@ variant x11 {
</span> port:xorg-xcb-util \
port:xrender
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-xcb --enable-xcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-xlib --enable-xlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-xlib-xcb --enable-xlib-xcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-x --with-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-xlib-xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-lib=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dxcb=disabled -Dxcb=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dxlib=disabled -Dxlib=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dxlib-xcb=disabled -Dxlib-xcb=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description "build tests" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dtests=disabled -Dtests=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target check
</span> }
default_variants +x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,9 +145,6 @@ if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
</span> variant_set x11
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url ${homepage}/news/
livecheck.regex ${my_name}-(\[0-9.\]+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/files/dont-check-stderr.patch b/graphics/cairo-devel/files/dont-check-stderr.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1d973fd7db9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo-devel/files/dont-check-stderr.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,109 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't check stderr in configure tests as this causes them to fail when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-unexpected warnings are emitted, such as deprecation of i386 in Xcode 10.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.freedesktop.org/cairo/cairo/-/issues/121
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Updated version of this patch:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-02-03 20:33:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-02-03 20:38:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14998,7 +14998,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15045,7 +15045,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15096,7 +15096,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15143,7 +15143,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15212,7 +15212,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15268,7 +15268,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16852,7 +16852,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16899,7 +16899,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27730,7 +27730,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27849,7 +27849,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27930,7 +27930,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cairo_cc_stderr" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_cc_flag=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/files/memory-leak.patch b/graphics/cairo-devel/files/memory-leak.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fccf664fea8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo-devel/files/memory-leak.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 243938c61a08dac8911153352e55933e0618581e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: John Ralls <jralls@ceridwen.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 23 Apr 2022 16:38:01 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [quartz] Destroy local copy of snapshot after attaching it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Because cairo_surface_snapshot_attach refs the snapshot.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes https://gitlab.freedesktop.org/cairo/cairo/-/issues/562
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/cairo-quartz-surface.c | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/cairo-quartz-surface.c src/cairo-quartz-surface.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5681918c4..fa6d9b1c9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cairo-quartz-surface.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cairo-quartz-surface.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2609,6 +2609,7 @@ _cairo_quartz_surface_snapshot_get_image (cairo_quartz_surface_t *surface)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unlikely (!snapshot || cairo_surface_status (snapshot)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _cairo_surface_attach_snapshot (&surface->base, snapshot, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cairo_surface_destroy (snapshot);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return CGImageRetain (((cairo_quartz_snapshot_t*)snapshot)->image);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/files/patch-configure.diff b/graphics/cairo-devel/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8bfc226acd8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't find spectre, poppler, or librsvg even if they're installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/33856
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://lists.macports.org/pipermail/macports-dev/2012-March/018411.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-03-18 13:40:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-02-03 20:39:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25179,7 +25179,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Keep in sync with meson.build!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SPECTRE_VERSION_REQUIRED=0.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SPECTRE_VERSION_REQUIRED=99999
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_ps=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any2ppm_ps=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$use_ps" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25573,7 +25573,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # poppler-0.17.4 fixes text-pattern and text-transform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Keep in sync with meson.build!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--POPPLER_VERSION_REQUIRED=0.17.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POPPLER_VERSION_REQUIRED=99999
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_pdf=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any2ppm_pdf=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$use_pdf" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25939,7 +25939,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBRSVG_VERSION_REQUIRED=2.35.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBRSVG_VERSION_REQUIRED=99999
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_svg=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any2ppm_svg=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$use_svg" = "xyes"; then
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/files/patch-darwin-dylib-versions.diff b/graphics/cairo-devel/files/patch-darwin-dylib-versions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3fe9b2a9e80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo-devel/files/patch-darwin-dylib-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,66 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#============================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Source: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/334
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Sun, 19 Jun 2022 13:45:09 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] meson: Setup darwin dylib versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# autotools-builds of cairo had broken compat/current version management. They had current == compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and bumped every release, making them not suitable for distribution as system libraries. In
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# transitioning to meson, we're resetting this to a sane versioning scheme.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#============================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_version_sonum = cairo_version_major + 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_version = cairo_version_major * 10000 + cairo_version_minor * 100 + cairo_version_micro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ABI compatibility version should be that used for 1.17.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cairo_version_compat = 11709
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cairo_version_minor % 2 == 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unstable release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_libversion = '@0@.@1@.0'.format(cairo_version_sonum, cairo_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +35,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_libversion = '@0@.@1@.@2@'.format(cairo_version_sonum, cairo_version, cairo_version_micro)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cairo_dylib_ver_compat = '@0@.0.0'.format(cairo_version_compat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cairo_dylib_ver_current = '@0@.0.0'.format(cairo_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++message('cairo_dylib_ver_compat: ', cairo_dylib_ver_compat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++message('cairo_dylib_ver_current: ', cairo_dylib_ver_current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cairo_darwin_versions = [cairo_dylib_ver_compat, cairo_dylib_ver_current]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf = configuration_data()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc = meson.get_compiler('c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,6 +267,7 @@ libcairo = library('cairo', cairo_sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args: extra_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ soversion: cairo_version_sonum,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: cairo_libversion,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin_versions: cairo_darwin_versions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: incbase,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- util/cairo-gobject/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ util/cairo-gobject/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: [glib_dep, gobject_dep, libcairo_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ soversion: cairo_version_sonum,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: cairo_libversion,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin_versions: cairo_darwin_versions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnu_symbol_visibility: 'hidden',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_args: ['-DCAIRO_COMPILATION'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args: extra_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- util/cairo-script/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ util/cairo-script/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: deps + [libcairo_dep, lzo_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ soversion: cairo_version_sonum,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: cairo_libversion,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin_versions: cairo_darwin_versions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_args: ['-DCAIRO_COMPILATION'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args: extra_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/files/patch-meson-add-option-lzo2.diff b/graphics/cairo-devel/files/patch-meson-add-option-lzo2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e2116a96273
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo-devel/files/patch-meson-add-option-lzo2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to add option 'lzo2', to allow explicitly disabling feature. Also prevents opportunistic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen (GitHub: @mascguy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -204,7 +204,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-lzo_dep = dependency('lzo2', required: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++lzo_dep = dependency('lzo2', required: get_option('lzo2'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if lzo_dep.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.set('HAVE_LZO', 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson_options.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson_options.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option('spectre', type : 'feature', value : 'auto')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option('symbol-lookup', type: 'feature', value : 'auto',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description: 'Symbol lookup in debug utils via binutils/bfd')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option('lzo2', type : 'feature', value : 'auto')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option('gtk_doc', type : 'boolean', value : false,
</span></pre><pre style='margin:0'>
</pre>