[gtk-osx] Stop skipping Flex.



commit 67d8bab148a8d73b2f06ca48fdf50af891b119bf
Author: John Ralls <jralls ceridwen us>
Date:   Tue Oct 7 18:30:10 2014 -0700

    Stop skipping Flex.
    
    The one in Xcode 5.0 and later blows up version detection.

 jhbuildrc-gtk-osx                |    1 -
 patches/libunistring-clang.patch |   15 +++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 7639469..d924f19 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -647,7 +647,6 @@ if not (os.environ.has_key ("LIBTOOLIZE") and os.environ["LIBTOOLIZE"]):
 if not _host_tiger:
     skip.append('make')
     skip.append('subversion')
-    skip.append('flex')
 
 # The option "headerpad_max_install_names" is there to leave some room for
 # changing the library locations with install_name_tool. Note that GNU
diff --git a/patches/libunistring-clang.patch b/patches/libunistring-clang.patch
index 20681d8..b95d2b0 100644
--- a/patches/libunistring-clang.patch
+++ b/patches/libunistring-clang.patch
@@ -1,15 +1,18 @@
---- a/lib/stdint.mini.h        2009-04-10 13:28:44.000000000 -0700
-+++ b/lib/stdint.mini.h        2014-02-14 21:20:10.000000000 -0800
-@@ -119,1 +119,1 @@
+diff -c 
/Users/john/Development/Gnucash-Build/Gnucash-master-git-gcc4.8-Leopard/src/libunistring-0.9.3/lib/stdint.mini.h\~
 
/Users/john/Development/Gnucash-Build/Gnucash-master-git-gcc4.8-Leopard/src/libunistring-0.9.3/lib/stdint.mini.h
+--- a/lib/stdint.mini.h        Fri Apr 10 13:28:44 2009
++++ b/lib/stdint.mini.h        Sun Oct  5 14:05:35 2014
+@@ -119,10 +119,11 @@
  #define uint32_t unistring_uint32_t
-
+ 
  /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
-+#ifndef __APPLE__ 
++#ifndef __APPLE__
  #define _UINT8_T
  #define _UINT32_T
  #define _UINT64_T
 -
 +#endif
-
+ 
  #endif /* _UNISTRING_STDINT_H */
  #endif /* !defined _UNISTRING_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
+
+Diff finished.  Sun Oct  5 14:05:51 2014


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