[gtk-osx] Repair freetype's deletion of CCexe_CFLAGS then using it for apinames.



commit f294870db6cbb0888120c7acbaeb154016a97bd3
Author: John Ralls <jralls ceridwen us>
Date:   Sun Feb 22 14:43:16 2015 -0800

    Repair freetype's deletion of CCexe_CFLAGS then using it for apinames.

 modulesets-stable/gtk-osx-bootstrap.modules |    4 +++-
 patches/freetype-2.5.3-ccexe_cflags.patch   |   21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 6afd83b..b2872ce 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -149,7 +149,9 @@
              skip-autogen="never"
              autogenargs="--without-bzip2 --without-harfbuzz">
     <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
-            repo="sourceforge"/>
+           repo="sourceforge">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="zlib"/>
     </dependencies>
diff --git a/patches/freetype-2.5.3-ccexe_cflags.patch b/patches/freetype-2.5.3-ccexe_cflags.patch
new file mode 100644
index 0000000..5923772
--- /dev/null
+++ b/patches/freetype-2.5.3-ccexe_cflags.patch
@@ -0,0 +1,21 @@
+diff -c 
/Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/freetype-2.5.3/builds/unix/unix-cc.in\~ 
/Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/freetype-2.5.3/builds/unix/unix-cc.in
+--- a/builds/unix/unix-cc.in   Tue Aug 31 04:04:28 2010
++++ b/builds/unix/unix-cc.in   Sun Feb 22 14:14:44 2015
+@@ -80,6 +80,7 @@
+ #
+ CPPFLAGS := @CPPFLAGS@
+ CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
++CCexe_CFLAGS := @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
+ 
+ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+ #
+@@ -94,6 +95,7 @@
+ # Linker flags.
+ #
+ LDFLAGS := @LDFLAGS@
++CCexe_LDFLAGS := @LDFLAGS@
+ 
+ 
+ # export symbols
+
+Diff finished.  Sun Feb 22 14:18:35 2015


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]