[gtk-osx] Patch Glib to fix charset.alias install failure



commit 5ae1ca6faab4d688c2c6f119bb8c2dfcf1c3f34e
Author: John Ralls <jralls ceridwen us>
Date:   Tue Oct 8 07:26:24 2013 -0700

    Patch Glib to fix charset.alias install failure

 modulesets-stable/gtk-osx.modules                  |    5 ++-
 ...GLIBC21-to-configure-needed-for-libcharse.patch |   24 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index e2e1c5e..963bce0 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -65,11 +65,12 @@
     </after>
   </metamodule>
 
-  <autotools id="glib" autogen-sh="configure">
+  <autotools id="glib" autogen-sh="autoreconf">
     <branch module="glib/2.38/glib-2.38.0.tar.xz"  version="2.38.0"
             hash="sha256:7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch";
 strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/delete-gnetworking.h.patch"; strip="1"/>
+      <patch file="/patches/delete-gnetworking.h.patch" strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Restore-gl_GLIBC21-to-configure-needed-for-libcharse.patch";
 strip="1"/>
     </branch>
     <dependencies>
       <dep package="libffi"/>
diff --git a/patches/0001-Restore-gl_GLIBC21-to-configure-needed-for-libcharse.patch 
b/patches/0001-Restore-gl_GLIBC21-to-configure-needed-for-libcharse.patch
new file mode 100644
index 0000000..b6f2533
--- /dev/null
+++ b/patches/0001-Restore-gl_GLIBC21-to-configure-needed-for-libcharse.patch
@@ -0,0 +1,24 @@
+From 859b3aa3dc2af5b73145424c8290ce058f5d8346 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Fri, 4 Oct 2013 11:45:47 -0700
+Subject: [PATCH] Restore gl_GLIBC21 to configure; needed for libcharset
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1dde875..d014238 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -878,6 +878,7 @@ AC_STRUCT_DIRENT_D_TYPE
+ AM_LANGINFO_CODESET
+ AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+ AC_CHECK_FUNCS(setlocale)
++gl_GLIBC21
+ 
+ # check additional type sizes
+ AC_CHECK_SIZEOF(size_t)
+-- 
+1.8.3.rc0
+


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