[142163] trunk/dports/graphics
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 12 04:35:49 PST 2015
Revision: 142163
https://trac.macports.org/changeset/142163
Author: ryandesign at macports.org
Date: 2015-11-04 22:33:49 -0800 (Wed, 04 Nov 2015)
Log Message:
-----------
cairo, cairo-devel: update to 1.14.4; only use the old private CGFontGetGlyphPath interface when Tiger support is requested, to avoid warning messages on Yosemite and later (#45599)
Modified Paths:
--------------
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo/files/patch-configure.diff
trunk/dports/graphics/cairo/files/patch-tiger.diff
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/graphics/cairo-devel/files/patch-configure.diff
trunk/dports/graphics/cairo-devel/files/patch-tiger.diff
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2015-11-05 05:46:14 UTC (rev 142162)
+++ trunk/dports/graphics/cairo/Portfile 2015-11-05 06:33:49 UTC (rev 142163)
@@ -11,8 +11,7 @@
name cairo
conflicts cairo-devel
set my_name cairo
-version 1.14.2
-revision 1
+version 1.14.4
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
@@ -31,8 +30,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 36cb30e1db06135bd291acc8a1f0a1f2d95ecb14 \
- sha256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
+checksums rmd160 622b73737143fcc854b020af42f6295874532a35 \
+ sha256 f6ec9c7c844db9ec011f0d66b57ef590c45adf55393d1fc249003512522ee716
depends_build port:pkgconfig
@@ -49,11 +48,9 @@
# Prevent cairo from using librsvg, libspectre, poppler.
patchfiles-append patch-configure.diff
-# Restore support for Quartz on Tiger. Use this patch always, not just on Tiger,
-# so that cairo built on Leopard or later can still run on Tiger. Continued
-# support for Tiger is being discussed on the cairo mailing list.
-patchfiles-append patch-tiger.diff
-platform darwin 8 {
+if {[vercmp ${macosx_deployment_target} 10.5] < 0} {
+ # Restore support for Quartz on Tiger.
+ patchfiles-append patch-tiger.diff
notes-append "
The developers of Cairo may remove support for Mac OS X v10.4 Tiger soon. See:
Modified: trunk/dports/graphics/cairo/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-configure.diff 2015-11-05 05:46:14 UTC (rev 142162)
+++ trunk/dports/graphics/cairo/files/patch-configure.diff 2015-11-05 06:33:49 UTC (rev 142163)
@@ -1,6 +1,6 @@
---- configure.orig 2015-03-10 20:43:14.000000000 -0500
-+++ configure 2015-03-15 19:19:36.000000000 -0500
-@@ -30801,7 +30801,7 @@
+--- configure.orig 2015-10-28 22:16:21.000000000 -0500
++++ configure 2015-10-29 17:23:41.000000000 -0500
+@@ -30906,7 +30906,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -31198,7 +31198,7 @@
+@@ -31303,7 +31303,7 @@
# poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,7 +18,7 @@
test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
-@@ -31568,7 +31568,7 @@
+@@ -31673,7 +31673,7 @@
Modified: trunk/dports/graphics/cairo/files/patch-tiger.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-tiger.diff 2015-11-05 05:46:14 UTC (rev 142162)
+++ trunk/dports/graphics/cairo/files/patch-tiger.diff 2015-11-05 06:33:49 UTC (rev 142163)
@@ -1,7 +1,7 @@
Revert this commit which removed Tiger support:
http://cgit.freedesktop.org/cairo/commit/?id=70cc8f250b5669e757b4f044571ba0f71e3dea9e
---- src/cairo-quartz-font.c.orig 2015-03-10 17:21:07.000000000 -0500
-+++ src/cairo-quartz-font.c 2015-04-24 23:27:49.000000000 -0500
+--- src/cairo-quartz-font.c.orig 2015-10-27 16:04:21.000000000 -0500
++++ src/cairo-quartz-font.c 2015-10-29 17:26:42.000000000 -0500
@@ -81,6 +81,9 @@
static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
@@ -40,7 +40,7 @@
-font->base.scale.yy,
0, 0);
-- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 0.0, NULL, NULL);
+- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 1.0, NULL, NULL);
- glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix);
- CFRelease (ctFont);
+ glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2015-11-05 05:46:14 UTC (rev 142162)
+++ trunk/dports/graphics/cairo-devel/Portfile 2015-11-05 06:33:49 UTC (rev 142163)
@@ -11,8 +11,7 @@
name cairo-devel
conflicts cairo
set my_name cairo
-version 1.14.2
-revision 1
+version 1.14.4
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
@@ -32,8 +31,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 36cb30e1db06135bd291acc8a1f0a1f2d95ecb14 \
- sha256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
+checksums rmd160 622b73737143fcc854b020af42f6295874532a35 \
+ sha256 f6ec9c7c844db9ec011f0d66b57ef590c45adf55393d1fc249003512522ee716
depends_build port:pkgconfig
@@ -50,11 +49,9 @@
# Prevent cairo from using librsvg, libspectre, poppler.
patchfiles-append patch-configure.diff
-# Restore support for Quartz on Tiger. Use this patch always, not just on Tiger,
-# so that cairo built on Leopard or later can still run on Tiger. Continued
-# support for Tiger is being discussed on the cairo mailing list.
-patchfiles-append patch-tiger.diff
-platform darwin 8 {
+if {[vercmp ${macosx_deployment_target} 10.5] < 0} {
+ # Restore support for Quartz on Tiger.
+ patchfiles-append patch-tiger.diff
notes-append "
The developers of Cairo may remove support for Mac OS X v10.4 Tiger soon. See:
Modified: trunk/dports/graphics/cairo-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2015-11-05 05:46:14 UTC (rev 142162)
+++ trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2015-11-05 06:33:49 UTC (rev 142163)
@@ -1,6 +1,6 @@
---- configure.orig 2015-03-10 20:43:14.000000000 -0500
-+++ configure 2015-03-15 19:19:36.000000000 -0500
-@@ -30801,7 +30801,7 @@
+--- configure.orig 2015-10-28 22:16:21.000000000 -0500
++++ configure 2015-10-29 17:23:41.000000000 -0500
+@@ -30906,7 +30906,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -31198,7 +31198,7 @@
+@@ -31303,7 +31303,7 @@
# poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,7 +18,7 @@
test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
-@@ -31568,7 +31568,7 @@
+@@ -31673,7 +31673,7 @@
Modified: trunk/dports/graphics/cairo-devel/files/patch-tiger.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-tiger.diff 2015-11-05 05:46:14 UTC (rev 142162)
+++ trunk/dports/graphics/cairo-devel/files/patch-tiger.diff 2015-11-05 06:33:49 UTC (rev 142163)
@@ -1,7 +1,7 @@
Revert this commit which removed Tiger support:
http://cgit.freedesktop.org/cairo/commit/?id=70cc8f250b5669e757b4f044571ba0f71e3dea9e
---- src/cairo-quartz-font.c.orig 2015-03-10 17:21:07.000000000 -0500
-+++ src/cairo-quartz-font.c 2015-04-24 23:27:49.000000000 -0500
+--- src/cairo-quartz-font.c.orig 2015-10-27 16:04:21.000000000 -0500
++++ src/cairo-quartz-font.c 2015-10-29 17:26:42.000000000 -0500
@@ -81,6 +81,9 @@
static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
@@ -40,7 +40,7 @@
-font->base.scale.yy,
0, 0);
-- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 0.0, NULL, NULL);
+- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 1.0, NULL, NULL);
- glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix);
- CFRelease (ctFont);
+ glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/fc5ec97b/attachment.html>
More information about the macports-changes
mailing list