<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/e1e53f19f7ad0e7c754af3dd872a3adf54e8d9c4">https://github.com/macports/macports-ports/commit/e1e53f19f7ad0e7c754af3dd872a3adf54e8d9c4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e1e53f19f7ad0e7c754af3dd872a3adf54e8d9c4
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Tue Aug 3 20:24:09 2021 +0800
<span style='display:block; white-space:pre;color:#404040;'> cairo: update to 1.17.4
</span>---
graphics/cairo/Portfile | 10 +++++-----
graphics/cairo/files/dont-check-stderr.patch | 26 +++++++++++++-------------
graphics/cairo/files/patch-configure.diff | 4 ++--
3 files changed, 20 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo/Portfile b/graphics/cairo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83a2bf95e8c..9762c28e57d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,11 +10,11 @@ PortGroup xcodeversion 1.0
</span> name cairo
conflicts cairo-devel
set my_name cairo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.16.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cfd2ef6ec55b267e04600f6b1e36bb07f2566b35 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 41997432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.17.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7a440359be60f8cb971e9d538973ac29613e143e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41834076
</span>
categories graphics
maintainers {ryandesign @ryandesign} {mascguy @mascguy}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo/files/dont-check-stderr.patch b/graphics/cairo/files/dont-check-stderr.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 45ccbc0f1e6..5284da53fc9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo/files/dont-check-stderr.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo/files/dont-check-stderr.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,9 @@ https://gitlab.freedesktop.org/cairo/cairo/-/issues/121
</span> Updated version of this patch:
https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-10-19 15:20:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-01-24 22:13:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19230,7 +19230,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-11-28 10:18:15.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-08-03 15:38:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18946,7 +18946,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19277,7 +19277,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18993,7 +18993,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19328,7 +19328,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19044,7 +19044,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19375,7 +19375,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19091,7 +19091,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19444,7 +19444,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19160,7 +19160,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19500,7 +19500,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19216,7 +19216,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20973,7 +20973,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20783,7 +20783,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21020,7 +21020,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20830,7 +20830,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34315,7 +34315,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34129,7 +34129,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34434,7 +34434,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34248,7 +34248,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
</span> cairo_cc_flag=no
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34515,7 +34515,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34329,7 +34329,7 @@
</span> rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo/files/patch-configure.diff b/graphics/cairo/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b1ff401d1a..ffeab60dfbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> @@ -31729,7 +31729,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Keep in sync with meson.build!
</span> -SPECTRE_VERSION_REQUIRED=0.2.0
+SPECTRE_VERSION_REQUIRED=99999
test_ps=no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,8 +11,8 @@
</span> if test "x$use_ps" = "xyes"; then
@@ -32126,7 +32126,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # poppler-0.17.4 fixes text-pattern and text-transform
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Keep in sync with meson.build!
</span> -POPPLER_VERSION_REQUIRED=0.17.4
+POPPLER_VERSION_REQUIRED=99999
test_pdf=no
</pre><pre style='margin:0'>
</pre>