[gimp] build/win: Fix building iconv on recent gcc versions.



commit dae608dfdfc4dbaf791aea71db9b91b3e2aaaac0
Author: Michael Henning <drawoc darkrefraction com>
Date:   Sat Jun 6 12:41:33 2015 -0400

    build/win: Fix building iconv on recent gcc versions.

 build/windows/jhbuild/glib.moduleset               |    1 +
 .../windows/jhbuild/patches/iconv-fix-inline.patch |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/build/windows/jhbuild/glib.moduleset b/build/windows/jhbuild/glib.moduleset
index 076763c..87a7107 100644
--- a/build/windows/jhbuild/glib.moduleset
+++ b/build/windows/jhbuild/glib.moduleset
@@ -11,6 +11,7 @@
        <branch version="1.14" repo="gnu.org"
                        module="libiconv/libiconv-1.14.tar.gz"
                        hash="sha256:72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613">
+               <patch file="iconv-fix-inline.patch" strip="1"/>
        </branch>
 </autotools>
 
diff --git a/build/windows/jhbuild/patches/iconv-fix-inline.patch 
b/build/windows/jhbuild/patches/iconv-fix-inline.patch
new file mode 100644
index 0000000..93e2add
--- /dev/null
+++ b/build/windows/jhbuild/patches/iconv-fix-inline.patch
@@ -0,0 +1,12 @@
+--- a/lib/iconv.c      2015-06-06 12:37:05.267944000 -0400
++++ b/lib/iconv.c      2015-06-06 12:37:27.311277142 -0400
+@@ -176,9 +176,6 @@
+ #include "aliases2.h"
+ #undef S
+ };
+-#ifdef __GNUC__
+-__inline
+-#endif
+ const struct alias *
+ aliases2_lookup (register const char *str)
+ {


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