<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d04a8a6ff505eeb1845b34fbaffacf7decec51c3">https://github.com/macports/macports-ports/commit/d04a8a6ff505eeb1845b34fbaffacf7decec51c3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d04a8a6 cairo: Update to 1.16.0
</span>d04a8a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d04a8a6ff505eeb1845b34fbaffacf7decec51c3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Dec 1 10:35:43 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> cairo: Update to 1.16.0
</span>---
graphics/cairo/Portfile | 16 ++++------
graphics/cairo/files/patch-configure.diff | 10 +++----
graphics/cairo/files/patch-tiger.diff | 49 -------------------------------
3 files changed, 10 insertions(+), 65 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 5d6425e..ce06b2b 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,7 +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.14.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.16.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cfd2ef6ec55b267e04600f6b1e36bb07f2566b35 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41997432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories graphics
maintainers {ryandesign @ryandesign}
license {LGPL-2.1 MPL-1.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +33,6 @@ 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:#ffe0e0;'>-checksums rmd160 7c2868a64b146bf5663b7586f59f865cc8c2bf31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 36251896
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/pixman-1.pc:libpixman \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,12 +48,6 @@ minimum_xcodeversions {8 2.4.1}
</span> # Prevent cairo from using librsvg, libspectre, poppler.
patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${macosx_deployment_target} 10.5] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Restore support for Quartz on Tiger.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://cgit.freedesktop.org/cairo/commit/?id=5a8a9c97ed268004cbac510d39739ff56c0fb43c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-tiger.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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;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 1c1d2b5..6b1ff40 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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-06-15 17:14:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-06-24 01:49:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31257,7 +31257,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-10-19 15:20:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-10-19 23:07:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31729,7 +31729,7 @@
</span>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31654,7 +31654,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32126,7 +32126,7 @@
</span>
# poppler-0.17.4 fixes text-pattern and text-transform
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32024,7 +32024,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32496,7 +32496,7 @@
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo/files/patch-tiger.diff b/graphics/cairo/files/patch-tiger.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 206552a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo/files/patch-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Revert this commit which removed Tiger support:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://cgit.freedesktop.org/cairo/commit/?id=70cc8f250b5669e757b4f044571ba0f71e3dea9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cairo-quartz-font.c.orig 2015-10-27 16:04:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cairo-quartz-font.c 2015-10-29 17:26:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,6 +81,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Not public in the least bit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef, CGAffineTransform *textTransform, int unknown, CGGlyph glyph) = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CGFontGetHMetrics isn't public, but the other functions are public/present in 10.5 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ascent;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -124,6 +127,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* These have the same name in 10.4 and 10.5 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFontGetUnitsPerEmPtr = dlsym(RTLD_DEFAULT, "CGFontGetUnitsPerEm");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFontGetGlyphAdvancesPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphAdvances");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFontGetGlyphPathPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphPath");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFontGetHMetricsPtr = dlsym(RTLD_DEFAULT, "CGFontGetHMetrics");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFontGetAscentPtr = dlsym(RTLD_DEFAULT, "CGFontGetAscent");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,6 +144,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFontGetGlyphsForUnicharsPtr &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFontGetUnitsPerEmPtr &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFontGetGlyphAdvancesPtr &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFontGetGlyphPathPtr &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (CGFontGetHMetricsPtr || (CGFontGetAscentPtr && CGFontGetDescentPtr && CGFontGetLeadingPtr)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _cairo_quartz_font_symbols_present = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -545,7 +550,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGGlyph glyph = _cairo_quartz_scaled_glyph_index (scaled_glyph);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGAffineTransform textMatrix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGPathRef glyphPath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CTFontRef ctFont;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_path_fixed_t *path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (glyph == INVALID_GLYPH) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -560,9 +564,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -font->base.scale.yy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 1.0, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFRelease (ctFont);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!glyphPath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return CAIRO_INT_STATUS_UNSUPPORTED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>