[135974] users/devans/GNOME-3/stable/dports/graphics/cairo
devans at macports.org
devans at macports.org
Fri May 8 05:54:24 PDT 2015
Revision: 135974
https://trac.macports.org/changeset/135974
Author: devans at macports.org
Date: 2015-05-08 05:54:24 -0700 (Fri, 08 May 2015)
Log Message:
-----------
GNOME-3/stable: cairo, merge recent updates from trunk.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile
users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-configure.diff
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-tiger.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/graphics/cairo/
Property changes on: users/devans/GNOME-3/stable/dports/graphics/cairo
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/graphics/cairo:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/graphics/cairo:128861-134238
+ /branches/mld-qt-481/dports/graphics/cairo:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/graphics/cairo:128861-135972
Modified: users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile 2015-05-08 12:52:59 UTC (rev 135973)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile 2015-05-08 12:54:24 UTC (rev 135974)
@@ -12,6 +12,7 @@
conflicts cairo-devel
set my_name cairo
version 1.14.2
+revision 1
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
@@ -48,6 +49,24 @@
# 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 {
+ notes-append "
+The developers of Cairo may remove support for Mac OS X v10.4 Tiger soon. See:
+
+http://lists.cairographics.org/archives/cairo/2015-March/026057.html
+
+Many ports in MacPorts require Cairo, including anything that uses GTK+.\
+If you rely on Cairo on Tiger, please politely let the developers of Cairo know\
+by writing to their mailing list:
+
+http://lists.cairographics.org/mailman/listinfo/cairo
+"
+}
+
# https://trac.macports.org/ticket/34137
compiler.blacklist-append {clang < 318.0.61}
Modified: users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-configure.diff 2015-05-08 12:52:59 UTC (rev 135973)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-configure.diff 2015-05-08 12:54:24 UTC (rev 135974)
@@ -1,6 +1,6 @@
---- configure.orig 2014-10-13 20:47:29.000000000 -0500
-+++ configure 2014-10-14 19:35:14.000000000 -0500
-@@ -30634,7 +30634,7 @@
+--- configure.orig 2015-03-10 20:43:14.000000000 -0500
++++ configure 2015-03-15 19:19:36.000000000 -0500
+@@ -30801,7 +30801,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -31031,7 +31031,7 @@
+@@ -31198,7 +31198,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
-@@ -31401,7 +31401,7 @@
+@@ -31568,7 +31568,7 @@
Copied: users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-tiger.diff (from rev 135972, trunk/dports/graphics/cairo/files/patch-tiger.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-tiger.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-tiger.diff 2015-05-08 12:54:24 UTC (rev 135974)
@@ -0,0 +1,49 @@
+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
+@@ -81,6 +81,9 @@
+ static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
+ static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
+
++/* Not public in the least bit */
++static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef, CGAffineTransform *textTransform, int unknown, CGGlyph glyph) = NULL;
++
+ /* CGFontGetHMetrics isn't public, but the other functions are public/present in 10.5 */
+ typedef struct {
+ int ascent;
+@@ -124,6 +127,7 @@
+ /* These have the same name in 10.4 and 10.5 */
+ CGFontGetUnitsPerEmPtr = dlsym(RTLD_DEFAULT, "CGFontGetUnitsPerEm");
+ CGFontGetGlyphAdvancesPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphAdvances");
++ CGFontGetGlyphPathPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphPath");
+
+ CGFontGetHMetricsPtr = dlsym(RTLD_DEFAULT, "CGFontGetHMetrics");
+ CGFontGetAscentPtr = dlsym(RTLD_DEFAULT, "CGFontGetAscent");
+@@ -140,6 +144,7 @@
+ CGFontGetGlyphsForUnicharsPtr &&
+ CGFontGetUnitsPerEmPtr &&
+ CGFontGetGlyphAdvancesPtr &&
++ CGFontGetGlyphPathPtr &&
+ (CGFontGetHMetricsPtr || (CGFontGetAscentPtr && CGFontGetDescentPtr && CGFontGetLeadingPtr)))
+ _cairo_quartz_font_symbols_present = TRUE;
+
+@@ -545,7 +550,6 @@
+ CGGlyph glyph = _cairo_quartz_scaled_glyph_index (scaled_glyph);
+ CGAffineTransform textMatrix;
+ CGPathRef glyphPath;
+- CTFontRef ctFont;
+ cairo_path_fixed_t *path;
+
+ if (glyph == INVALID_GLYPH) {
+@@ -560,9 +564,7 @@
+ -font->base.scale.yy,
+ 0, 0);
+
+- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 0.0, NULL, NULL);
+- glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix);
+- CFRelease (ctFont);
++ glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
+ if (!glyphPath)
+ return CAIRO_INT_STATUS_UNSUPPORTED;
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150508/d6f00734/attachment.html>
More information about the macports-changes
mailing list