<div dir="ltr">On Tue, Feb 3, 2015 at 6:57 AM, Dan Raymond <span dir="ltr"><<a href="mailto:draymond@foxvalley.net" target="_blank">draymond@foxvalley.net</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000">
<div style="font-family:-moz-fixed;font-size:14px" lang="x-unicode">Hi, I would like to submit the
following two patches to cairo-1.14.0:
<br>
<br>
1) the following patch fixes a configure failure when building
under MinGW on Windows:<br></div></div></blockquote><div><br></div><div>I would assume this to already be fixed by:<br>commit f9b65ae1fc91bc558a01c2ad7be5a121c6f10818<br>Author: Adrian Johnson <<a href="mailto:ajohnson@redneon.com">ajohnson@redneon.com</a>><br>Date: Tue Oct 21 22:35:12 2014 +1030<br><br> build: fix regression on mingw<br> <br> 7cfebce1 removed the filename extension for executables.<br> <br> Patch from <a href="http://sourceforge.net/p/inkscape/mailman/message/32939144/">http://sourceforge.net/p/inkscape/mailman/message/32939144/</a><br> <br> Bug 85120<br></div><div> <br></div><div>Could you check if current cairo master generates a good "configure"?<br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div bgcolor="#FFFFFF" text="#000000"><div style="font-family:-moz-fixed;font-size:14px" lang="x-unicode">
<br>
diff -rU 0 a/configure b/configure
<br>
--- cairo-1.14.0/configure 2014-10-13 19:47:29 -0600
<br>
+++ fixed/configure 2015-02-02 21:40:21 -0700
<br>
@@ -18933 +18933 @@
<br>
-if strings - conftest | grep noonsees >/dev/null ; then
<br>
+if strings - conftest$ac_exeext | grep noonsees >/dev/null ;
then
<br>
@@ -18936 +18936 @@
<br>
-if strings - conftest | grep seesnoon >/dev/null ; then
<br>
+if strings - conftest$ac_exeext | grep seesnoon >/dev/null ;
then
<br>
<br>
2) the following patch fixes runtime warnings about
CGFontGetGlyphPath deprecation under OS X 10.10 (Yosemite):<br>
(discussion at <a href="http://comments.gmane.org/gmane.comp.lib.cairo/24875" target="_blank">http://comments.gmane.org/gmane.comp.lib.cairo/24875</a>)
<br></div></div></blockquote><div><br></div><div>I pushed the patch available in the associated bugreport to master:<br>commit 70cc8f250b5669e757b4f044571ba0f71e3dea9e<br>Author: Andrea Canciani <<a href="mailto:ranma42@gmail.com">ranma42@gmail.com</a>><br>Date: Tue Dec 9 16:13:00 2014 +0100<br><br> quartz: Remove call to obsolete CGFontGetGlyphPath<br> <br> CGFontGetGlyphPath was not public and is not available anymore on<br> modern OSX/iOS systems. The same functionality is available through<br> the CoreText API since OSX 10.5.<br> <br> Based on a patch by Simon Cozens.<br> <br> Fixes <a href="https://bugs.freedesktop.org/show_bug.cgi?id=84324">https://bugs.freedesktop.org/show_bug.cgi?id=84324</a><br><br></div><div>I tested it in my environment, but as I mentioned in the bugreport, I do not have any iOS device to try it on.<br></div><div><br></div><div>Andrea<br><br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div bgcolor="#FFFFFF" text="#000000"><div style="font-family:-moz-fixed;font-size:14px" lang="x-unicode">
<br>
diff -rU 0 a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a>
<br>
--- a/<a href="http://configure.ac" target="_blank">configure.ac</a> 2014-10-13 18:46:33.000000000 -0700
<br>
+++ b/<a href="http://configure.ac" target="_blank">configure.ac</a> 2015-01-22 20:05:02.000000000 -0800
<br>
@@ -205 +205 @@
<br>
- quartz_LIBS="-Xlinker -framework -Xlinker CoreGraphics"
<br>
+ quartz_LIBS="-Xlinker -framework -Xlinker CoreGraphics
-framework -Xlinker CoreText"
<br>
diff -rU 0 a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
<br>
--- a/src/cairo-quartz-font.c 2013-09-24 21:38:54.000000000
-0700
<br>
+++ b/src/cairo-quartz-font.c 2015-01-22 20:05:33.000000000
-0800
<br>
@@ -84,2 +84,2 @@
<br>
-/* Not public in the least bit */
<br>
-static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef,
CGAffineTransform *textTransform, int unknown, CGGlyph glyph) =
NULL;
<br>
+static CTFontRef (*CTFontCreateWithGraphicsFontPtr) (CGFontRef
fontRef) = NULL;
<br>
+static CGPathRef (*CTFontCreatePathForGlyphPtr) (CTFontRef
fontRef, CGGlyph glyph, CGAffineTransform *textTransform) = NULL;
<br>
@@ -130 +130,2 @@
<br>
- CGFontGetGlyphPathPtr = dlsym(RTLD_DEFAULT,
"CGFontGetGlyphPath");
<br>
+ CTFontCreateWithGraphicsFontPtr = dlsym(RTLD_DEFAULT,
"CTFontCreateWithGraphicsFont");
<br>
+ CTFontCreatePathForGlyphPtr = dlsym(RTLD_DEFAULT,
"CTFontCreatePathForGlyph");
<br>
@@ -147 +148,2 @@
<br>
- CGFontGetGlyphPathPtr &&
<br>
+ CTFontCreateWithGraphicsFontPtr &&
<br>
+ CTFontCreatePathForGlyphPtr &&
<br>
@@ -551,0 +554 @@
<br>
+ CTFontRef ctFont;
<br>
@@ -567 +570,3 @@
<br>
- glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont,
&textMatrix, 0, glyph);
<br>
+ ctFont = CTFontCreateWithGraphicsFontPtr
(font_face->cgFont);
<br>
+ glyphPath = CTFontCreatePathForGlyphPtr (ctFont, glyph,
&textMatrix);
<br>
+ CFRelease(ctFont);
<br>
</div>
</div>
<br>--<br>
cairo mailing list<br>
<a href="mailto:cairo@cairographics.org">cairo@cairographics.org</a><br>
<a href="http://lists.cairographics.org/mailman/listinfo/cairo" target="_blank">http://lists.cairographics.org/mailman/listinfo/cairo</a><br></blockquote></div><br></div></div>