[gtk-builder-win/wip/merge] wip

From: Ignacio Casal Quinteiro <icq src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-builder-win/wip/merge] wip
Date: Mon, 21 Jul 2014 09:26:18 +0000 (UTC)
commit 9b47d5f549f69f983bdbace0ab256a186e6ee311
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Jul 16 20:42:52 2014 +0200

    wip

 win32/libs/11_libffi.bat => libs/11_libffi.sh      |    2 +-
 win32/libs/12_glib.bat => libs/12_glib.sh          |    2 +-
 ...2-do-not-rely-on-__argc-and-__argv-global.patch |    0
 {win32/libs => libs}/12_glib/revert_rand_s.patch   |    0
 .../13_pkg-config.bat => libs/13_pkg-config.sh     |    2 +-
 .../14_gobject-introspection.sh                    |    2 +-
 win32/libs/1_zlib.bat => libs/1_zlib.sh            |    0
 {win32/libs => libs}/1_zlib/zlib.pc                |    0
 win32/libs/21_atk.bat => libs/21_atk.sh            |    2 +-
 {win32/libs => libs}/21_atk/export-regex.patch     |    0
 win32/libs/2_xz.bat => libs/2_xz.sh                |    2 +-
 win32/libs/31_libpng.bat => libs/31_libpng.sh      |    2 +-
 .../32_libfreetype.bat => libs/32_libfreetype.sh   |    2 +-
 .../33_libfontconfig.sh                            |    2 +-
 .../libs => libs}/33_libfontconfig/fcatomic.patch  |    0
 win32/libs/34_pixman.bat => libs/34_pixman.sh      |    2 +-
 win32/libs/35_cairo.bat => libs/35_cairo.sh        |    2 +-
 win32/libs/36_pango.bat => libs/36_pango.sh        |    2 +-
 win32/libs/3_libxml2.bat => libs/3_libxml2.sh      |    2 +-
 win32/libs/41_libjpeg.bat => libs/41_libjpeg.sh    |    2 +-
 .../libs/42_libjasper.bat => libs/42_libjasper.sh  |    2 +-
 .../42_libjasper/jasper-1.900.1-win32_sleep.patch  |    0
 {win32/libs => libs}/42_libjasper/libtool          |    0
 win32/libs/43_libtiff.bat => libs/43_libtiff.sh    |    2 +-
 .../44_gdk-pixbuf.bat => libs/44_gdk-pixbuf.sh     |    2 +-
 win32/libs/4_libxslt.bat => libs/4_libxslt.sh      |    4 +-
 .../libxslt-1.1.28-fix-mkdir-for-mingw.patch       |   41 +++++++++
 win32/libs/51_gtk3.bat => libs/51_gtk3.sh          |    2 +-
 {win32/libs => libs}/51_gtk3/remove-def.patch      |    0
 win32/libs/52_gtk2.bat => libs/52_gtk2.sh          |    2 +-
 .../libs => libs}/52_gtk2/modules-input-makefile   |    0
 .../53_gtksourceview3.sh                           |    2 +-
 libs/5_m4.sh                                       |   21 +++++
 win32/libs/61_libcroco.bat => libs/61_libcroco.sh  |    2 +-
 win32/libs/62_librsvg.bat => libs/62_librsvg.sh    |    2 +-
 {win32/libs => libs}/62_librsvg/realpath.c         |    0
 {win32/libs => libs}/62_librsvg/rsvg-base.diff     |    0
 libs/6_autoconf.sh                                 |   21 +++++
 .../71_icon-naming-utils.sh                        |    2 +-
 .../72_hicolor-icon-theme.sh                       |    2 +-
 .../73_gnome-icon-theme.sh                         |    2 +-
 .../74_gnome-icon-theme-symbolic.sh                |    2 +-
 win32/libs/5_automake.bat => libs/7_automake.sh    |   10 +-
 win32/libs/BUILD_ALL.BAT => libs/BUILD_ALL.sh      |    0
 win32/README.txt                                   |    1 -
 ...gw-get-0.6.2-mingw32-beta-20131004-1-bin.tar.xz |  Bin 266512 -> 0 bytes
 win32/z_Install/setup.bat                          |   64 --------------
 {win32/z_Install => z_Install}/INSTRUCTIONS.txt    |    0
 z_Install/Tools/7Z.DLL                             |  Bin 0 -> 914432 bytes
 z_Install/Tools/7Z.EXE                             |  Bin 0 -> 163840 bytes
 {win32/z_Install => z_Install}/Tools/BZIP2.EXE     |  Bin 73728 -> 73728 bytes
 {win32/z_Install => z_Install}/Tools/GZIP.EXE      |  Bin 91648 -> 91648 bytes
 {win32/z_Install => z_Install}/Tools/TAR.EXE       |  Bin 352256 -> 352256 bytes
 {win32/z_Install => z_Install}/Tools/UNZIP.EXE     |  Bin 159744 -> 159744 bytes
 {win32/z_Install => z_Install}/Tools/WGET.EXE      |  Bin 401408 -> 401408 bytes
 {win32/z_Install => z_Install}/Tools/XZ.EXE        |  Bin 2299797 -> 2299797 bytes
 .../Tools/python3.4-config                         |    0
 z_Install/setup.bat                                |   90 ++++++++++++++++++++
 58 files changed, 207 insertions(+), 97 deletions(-)
---
diff --git a/win32/libs/11_libffi.bat b/libs/11_libffi.sh
similarity index 87%
rename from win32/libs/11_libffi.bat
rename to libs/11_libffi.sh
index f61afb8..00cb63d 100644
--- a/win32/libs/11_libffi.bat
+++ b/libs/11_libffi.sh
@@ -10,7 +10,7 @@ cd libffi-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/11_libffi-make.log
 make install 2>&1 | tee ../../logs/11_libffi-makeinstall.log
diff --git a/win32/libs/12_glib.bat b/libs/12_glib.sh
similarity index 89%
rename from win32/libs/12_glib.bat
rename to libs/12_glib.sh
index 41ec45f..a0b3eed 100644
--- a/win32/libs/12_glib.bat
+++ b/libs/12_glib.sh
@@ -35,7 +35,7 @@ export CFLAGS="$CFLAGS -mms-bitfields -mthreads"
 
 echo Compile...
 
-./configure --enable-shared --with-pcre=internal --prefix=$PREFIX
+./configure $HOST_OPTION --enable-shared --with-pcre=internal --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/12_glib-make.log
 make install 2>&1 | tee ../../logs/12_glib-makeinstall.log
diff --git a/win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch 
b/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
similarity index 100%
rename from win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
rename to libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
diff --git a/win32/libs/12_glib/revert_rand_s.patch b/libs/12_glib/revert_rand_s.patch
similarity index 100%
rename from win32/libs/12_glib/revert_rand_s.patch
rename to libs/12_glib/revert_rand_s.patch
diff --git a/win32/libs/13_pkg-config.bat b/libs/13_pkg-config.sh
similarity index 90%
rename from win32/libs/13_pkg-config.bat
rename to libs/13_pkg-config.sh
index d987581..a3720f7 100644
--- a/win32/libs/13_pkg-config.bat
+++ b/libs/13_pkg-config.sh
@@ -15,7 +15,7 @@ export GLIB_LIBS=-lglib-2.0
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/13_pkg-config-make.log
 make install 2>&1 | tee ../../logs/13_pkg-config-makeinstall.log
diff --git a/win32/libs/14_gobject-introspection.bat b/libs/14_gobject-introspection.sh
similarity index 91%
rename from win32/libs/14_gobject-introspection.bat
rename to libs/14_gobject-introspection.sh
index 1b3187b..c0f6463 100644
--- a/win32/libs/14_gobject-introspection.bat
+++ b/libs/14_gobject-introspection.sh
@@ -13,7 +13,7 @@ cd gobject-introspection-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/14_gobject-introspection-make.log
 make install 2>&1 | tee ../../logs/14_gobject-introspection-makeinstall.log
diff --git a/win32/libs/1_zlib.bat b/libs/1_zlib.sh
similarity index 100%
rename from win32/libs/1_zlib.bat
rename to libs/1_zlib.sh
diff --git a/win32/libs/1_zlib/zlib.pc b/libs/1_zlib/zlib.pc
similarity index 100%
rename from win32/libs/1_zlib/zlib.pc
rename to libs/1_zlib/zlib.pc
diff --git a/win32/libs/21_atk.bat b/libs/21_atk.sh
similarity index 85%
rename from win32/libs/21_atk.bat
rename to libs/21_atk.sh
index 1194432..51672dc 100644
--- a/win32/libs/21_atk.bat
+++ b/libs/21_atk.sh
@@ -15,7 +15,7 @@ patch -p1 < ../export-regex.patch
 
 echo Compile...
 
-./configure --enable-static --enable-shared --prefix=$PREFIX
+./configure $HOST_OPTION --enable-static --enable-shared --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/21_atk-make.log
 make install 2>&1 | tee ../../logs/21_atk-makeinstall.log
diff --git a/win32/libs/21_atk/export-regex.patch b/libs/21_atk/export-regex.patch
similarity index 100%
rename from win32/libs/21_atk/export-regex.patch
rename to libs/21_atk/export-regex.patch
diff --git a/win32/libs/2_xz.bat b/libs/2_xz.sh
similarity index 85%
rename from win32/libs/2_xz.bat
rename to libs/2_xz.sh
index a543b86..16fe843 100644
--- a/win32/libs/2_xz.bat
+++ b/libs/2_xz.sh
@@ -10,7 +10,7 @@ cd xz-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/2_xz-make.log
 make install 2>&1 | tee ../../logs/2_xz-makeinstall.log
diff --git a/win32/libs/31_libpng.bat b/libs/31_libpng.sh
similarity index 87%
rename from win32/libs/31_libpng.bat
rename to libs/31_libpng.sh
index 19c7e8e..da0999a 100644
--- a/win32/libs/31_libpng.bat
+++ b/libs/31_libpng.sh
@@ -10,7 +10,7 @@ cd libpng-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/31_libpng-make.log
 make install 2>&1 | tee ../../logs/31_libpng-makeinstall.log
diff --git a/win32/libs/32_libfreetype.bat b/libs/32_libfreetype.sh
similarity index 88%
rename from win32/libs/32_libfreetype.bat
rename to libs/32_libfreetype.sh
index 7586c23..3130adc 100644
--- a/win32/libs/32_libfreetype.bat
+++ b/libs/32_libfreetype.sh
@@ -10,7 +10,7 @@ cd freetype-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/32_libfreetype-make.log
 make install 2>&1 | tee ../../logs/32_libfreetype-makeinstall.log
diff --git a/win32/libs/33_libfontconfig.bat b/libs/33_libfontconfig.sh
similarity index 91%
rename from win32/libs/33_libfontconfig.bat
rename to libs/33_libfontconfig.sh
index 837ef1e..5294a3e 100644
--- a/win32/libs/33_libfontconfig.bat
+++ b/libs/33_libfontconfig.sh
@@ -14,7 +14,7 @@ cd fontconfig-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/33_libfontconfig-make.log
 make install 2>&1 | tee ../../logs/33_libfontconfig-makeinstall.log
diff --git a/win32/libs/33_libfontconfig/fcatomic.patch b/libs/33_libfontconfig/fcatomic.patch
similarity index 100%
rename from win32/libs/33_libfontconfig/fcatomic.patch
rename to libs/33_libfontconfig/fcatomic.patch
diff --git a/win32/libs/34_pixman.bat b/libs/34_pixman.sh
similarity index 87%
rename from win32/libs/34_pixman.bat
rename to libs/34_pixman.sh
index 4a064d9..e338ec3 100644
--- a/win32/libs/34_pixman.bat
+++ b/libs/34_pixman.sh
@@ -10,7 +10,7 @@ cd pixman-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/34_pixman-make.log
 make install 2>&1 | tee ../../logs/34_pixman-makeinstall.log
diff --git a/win32/libs/35_cairo.bat b/libs/35_cairo.sh
similarity index 79%
rename from win32/libs/35_cairo.bat
rename to libs/35_cairo.sh
index b1865d8..90068a3 100644
--- a/win32/libs/35_cairo.bat
+++ b/libs/35_cairo.sh
@@ -10,7 +10,7 @@ cd cairo-$MODVER
 
 echo Compile...
 
-./configure --enable-win32=yes --enable-win32-font=yes --enable-png=yes --enable-ft=yes --enable-fc=yes 
--prefix=$PREFIX
+./configure $HOST_OPTION --enable-win32=yes --enable-win32-font=yes --enable-png=yes --enable-ft=yes 
--enable-fc=yes --prefix=$PREFIX
 # this avoid an error building see: http://lists.cairographics.org/archives/cairo/2012-October/023675.html
 echo "#define _SSIZE_T_DEFINED 1" >> config.h
 make clean
diff --git a/win32/libs/36_pango.bat b/libs/36_pango.sh
similarity index 85%
rename from win32/libs/36_pango.bat
rename to libs/36_pango.sh
index 47bad47..06d7cec 100644
--- a/win32/libs/36_pango.bat
+++ b/libs/36_pango.sh
@@ -18,7 +18,7 @@ export LDFLAGS="$LDFLAGS -lgobject-2.0 -lgmodule-2.0"
 
 echo Compile...
 
-./configure --with-included-modules=yes --with-dynamic-modules=yes --prefix=$PREFIX
+./configure $HOST_OPTION --with-included-modules=yes --with-dynamic-modules=yes --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/36_pango-make.log
 make install 2>&1 | tee ../../logs/36_pango-makeinstall.log
diff --git a/win32/libs/3_libxml2.bat b/libs/3_libxml2.sh
similarity index 87%
rename from win32/libs/3_libxml2.bat
rename to libs/3_libxml2.sh
index 65afffd..e3aab3c 100644
--- a/win32/libs/3_libxml2.bat
+++ b/libs/3_libxml2.sh
@@ -10,7 +10,7 @@ cd libxml2-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/3_libxml2-make.log
 make install 2>&1 | tee ../../logs/3_libxml2-makeinstall.log
diff --git a/win32/libs/41_libjpeg.bat b/libs/41_libjpeg.sh
similarity index 87%
rename from win32/libs/41_libjpeg.bat
rename to libs/41_libjpeg.sh
index 61a55e5..5cdd6d7 100644
--- a/win32/libs/41_libjpeg.bat
+++ b/libs/41_libjpeg.sh
@@ -10,7 +10,7 @@ cd jpeg-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/41_libjpeg-make.log
 make install 2>&1 | tee ../../logs/41_libjpeg-makeinstall.log
diff --git a/win32/libs/42_libjasper.bat b/libs/42_libjasper.sh
similarity index 85%
rename from win32/libs/42_libjasper.bat
rename to libs/42_libjasper.sh
index aff8ffa..abfb359 100644
--- a/win32/libs/42_libjasper.bat
+++ b/libs/42_libjasper.sh
@@ -13,7 +13,7 @@ cd ..
 patch -p0 < jasper-1.900.1-win32_sleep.patch
 cd jasper-1.900.1
 
-./configure --enable-shared --enable-static --prefix=$PREFIX
+./configure $HOST_OPTION --enable-shared --enable-static --prefix=$PREFIX
 
 echo Correct libtool for the undefined symbols problem,
 echo which prevents shared DLL creation
diff --git a/win32/libs/42_libjasper/jasper-1.900.1-win32_sleep.patch 
b/libs/42_libjasper/jasper-1.900.1-win32_sleep.patch
similarity index 100%
rename from win32/libs/42_libjasper/jasper-1.900.1-win32_sleep.patch
rename to libs/42_libjasper/jasper-1.900.1-win32_sleep.patch
diff --git a/win32/libs/42_libjasper/libtool b/libs/42_libjasper/libtool
similarity index 100%
rename from win32/libs/42_libjasper/libtool
rename to libs/42_libjasper/libtool
diff --git a/win32/libs/43_libtiff.bat b/libs/43_libtiff.sh
similarity index 87%
rename from win32/libs/43_libtiff.bat
rename to libs/43_libtiff.sh
index badbf9f..f1f8d89 100644
--- a/win32/libs/43_libtiff.bat
+++ b/libs/43_libtiff.sh
@@ -10,7 +10,7 @@ cd tiff-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/43_libtiff-make.log
 make install 2>&1 | tee ../../logs/43_libtiff-makeinstall.log
diff --git a/win32/libs/44_gdk-pixbuf.bat b/libs/44_gdk-pixbuf.sh
similarity index 86%
rename from win32/libs/44_gdk-pixbuf.bat
rename to libs/44_gdk-pixbuf.sh
index d98e430..cfb54e6 100644
--- a/win32/libs/44_gdk-pixbuf.bat
+++ b/libs/44_gdk-pixbuf.sh
@@ -12,7 +12,7 @@ cd gdk-pixbuf-$MODVER
 
 echo Compile...
 
-./configure --with-included-loaders --prefix=$PREFIX
+./configure $HOST_OPTION --with-included-loaders --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/44_gdk-pixbuf-make.log
 make install 2>&1 | tee ../../logs/44_gdk-pixbuf-makeinstall.log
diff --git a/win32/libs/4_libxslt.bat b/libs/4_libxslt.sh
similarity index 73%
rename from win32/libs/4_libxslt.bat
rename to libs/4_libxslt.sh
index 693eac1..a384bf9 100644
--- a/win32/libs/4_libxslt.bat
+++ b/libs/4_libxslt.sh
@@ -7,10 +7,12 @@ gzip -d -f -c libxslt-$MODVER.tar.gz > libxslt-$MODVER.tar
 tar -xf libxslt-$MODVER.tar
 cd libxslt-$MODVER
 
+# see bug: https://bugzilla.gnome.org/show_bug.cgi?id=676511
+patch -p1 < ../libxslt-1.1.28-fix-mkdir-for-mingw.patch
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/4_libxslt-make.log
 make install 2>&1 | tee ../../logs/4_libxslt-makeinstall.log
diff --git a/libs/4_libxslt/libxslt-1.1.28-fix-mkdir-for-mingw.patch 
b/libs/4_libxslt/libxslt-1.1.28-fix-mkdir-for-mingw.patch
new file mode 100644
index 0000000..c38e91f
--- /dev/null
+++ b/libs/4_libxslt/libxslt-1.1.28-fix-mkdir-for-mingw.patch
@@ -0,0 +1,41 @@
+From a7ff3f0043f02d4ade966b6ac05b8be39166daa7 Mon Sep 17 00:00:00 2001
+From: Lars Kanis <lars greiz-reinsdorf de>
+Date: Sun, 6 Oct 2013 22:04:46 +0200
+Subject: [PATCH] Use mkdir macro also in case if mingw32.
+
+This fixes bug 676511.
+---
+ libxslt/libxslt.h     | 6 ++++++
+ libxslt/win32config.h | 1 -
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libxslt/libxslt.h b/libxslt/libxslt.h
+index 2f6f20d..e6d4c83 100644
+--- a/libxslt/libxslt.h
++++ b/libxslt/libxslt.h
+@@ -27,4 +27,10 @@
+ #endif
+ #endif
+ 
++#if defined(_MSC_VER) || defined(__MINGW32__)
++#include <io.h>
++#include <direct.h>
++#define mkdir(p,m) _mkdir(p)
++#endif
++
+ #endif /* ! __XSLT_LIBXSLT_H__ */
+diff --git a/libxslt/win32config.h b/libxslt/win32config.h
+index 9f60e55..e1ceae1 100644
+--- a/libxslt/win32config.h
++++ b/libxslt/win32config.h
+@@ -78,7 +78,6 @@ static int isnan (double d) {
+ 
+ #include <direct.h>
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+-#define mkdir(p,m) _mkdir(p)
+ #define snprintf _snprintf
+ #if _MSC_VER < 1500
+ #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+-- 
+1.8.3.2
+
diff --git a/win32/libs/51_gtk3.bat b/libs/51_gtk3.sh
similarity index 87%
rename from win32/libs/51_gtk3.bat
rename to libs/51_gtk3.sh
index d78a22b..ba50583 100644
--- a/win32/libs/51_gtk3.bat
+++ b/libs/51_gtk3.sh
@@ -29,7 +29,7 @@ cd gtk+-$MODVER
 
 echo Compile...
 
-./configure --enable-win32-backend --with-included-immodules --prefix=$PREFIX
+./configure $HOST_OPTION --enable-win32-backend --with-included-immodules --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/51_gtk3-make.log
 make install 2>&1 | tee ../../logs/51_gtk3-makeinstall.log
diff --git a/win32/libs/51_gtk3/remove-def.patch b/libs/51_gtk3/remove-def.patch
similarity index 100%
rename from win32/libs/51_gtk3/remove-def.patch
rename to libs/51_gtk3/remove-def.patch
diff --git a/win32/libs/52_gtk2.bat b/libs/52_gtk2.sh
similarity index 84%
rename from win32/libs/52_gtk2.bat
rename to libs/52_gtk2.sh
index b88824b..6aefda7 100644
--- a/win32/libs/52_gtk2.bat
+++ b/libs/52_gtk2.sh
@@ -27,7 +27,7 @@ cp ../modules-input-makefile modules/input/Makefile
 
 echo Compile...
 
-./configure --with-gdktarget=win32 --with-included-immodules --disable-cups --disable-papi --prefix=$PREFIX
+./configure $HOST_OPTION --with-gdktarget=win32 --with-included-immodules --disable-cups --disable-papi 
--prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/52_gtk2-make.log
 make install 2>&1 | tee ../../logs/52_gtk2-makeinstall.log
diff --git a/win32/libs/52_gtk2/modules-input-makefile b/libs/52_gtk2/modules-input-makefile
similarity index 100%
rename from win32/libs/52_gtk2/modules-input-makefile
rename to libs/52_gtk2/modules-input-makefile
diff --git a/win32/libs/53_gtksourceview3.bat b/libs/53_gtksourceview3.sh
similarity index 90%
rename from win32/libs/53_gtksourceview3.bat
rename to libs/53_gtksourceview3.sh
index 7482fd0..9f85459 100644
--- a/win32/libs/53_gtksourceview3.bat
+++ b/libs/53_gtksourceview3.sh
@@ -12,7 +12,7 @@ cd gtksourceview-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/53_gtksourceview3-make.log
 make install 2>&1 | tee ../../logs/53_gtksourceview3-makeinstall.log
diff --git a/libs/5_m4.sh b/libs/5_m4.sh
new file mode 100644
index 0000000..3c2d222
--- /dev/null
+++ b/libs/5_m4.sh
@@ -0,0 +1,21 @@
+MODVER=1.4.17
+
+mkdir -p 5_m4
+cd 5_m4
+test -f m4-$MODVER.tar.gz || wget http://ftp.gnu.org/gnu/m4/m4-$MODVER.tar.gz
+gzip -d -f -c m4-$MODVER.tar.gz > m4-$MODVER.tar
+tar -xf m4-$MODVER.tar
+cd m4-$MODVER
+
+echo Compile...
+
+# note install in the same prefix as mingw
+./configure $HOST_OPTION --prefix=/mingw
+make clean
+make 2>&1 | tee ../../logs/5_m4-make.log
+make install 2>&1 | tee ../../logs/5_m4-makeinstall.log
+
+
+cd ..
+rm -rf m4-$MODVER
+rm -f m4-$MODVER.tar
diff --git a/win32/libs/61_libcroco.bat b/libs/61_libcroco.sh
similarity index 88%
rename from win32/libs/61_libcroco.bat
rename to libs/61_libcroco.sh
index 5c0b3fb..cc21ee7 100644
--- a/win32/libs/61_libcroco.bat
+++ b/libs/61_libcroco.sh
@@ -13,7 +13,7 @@ cd libcroco-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/61_libcroco-make.log
 make install 2>&1 | tee ../../logs/61_libcroco-makeinstall.log
diff --git a/win32/libs/62_librsvg.bat b/libs/62_librsvg.sh
similarity index 80%
rename from win32/libs/62_librsvg.bat
rename to libs/62_librsvg.sh
index c59f73b..c01f1a2 100644
--- a/win32/libs/62_librsvg.bat
+++ b/libs/62_librsvg.sh
@@ -15,7 +15,7 @@ patch -p0 < ../rsvg-base.diff
 
 echo Compile...
 
-./configure --disable-gtk-theme --enable-pixbuf-loader --enable-introspection=no --prefix=$PREFIX
+./configure $HOST_OPTION --disable-gtk-theme --enable-pixbuf-loader --enable-introspection=no 
--prefix=$PREFIX
 make clean
 make 2>&1 | tee ../../logs/62_librsvg-make.log
 make install 2>&1 | tee ../../logs/62_librsvg-makeinstall.log
diff --git a/win32/libs/62_librsvg/realpath.c b/libs/62_librsvg/realpath.c
similarity index 100%
rename from win32/libs/62_librsvg/realpath.c
rename to libs/62_librsvg/realpath.c
diff --git a/win32/libs/62_librsvg/rsvg-base.diff b/libs/62_librsvg/rsvg-base.diff
similarity index 100%
rename from win32/libs/62_librsvg/rsvg-base.diff
rename to libs/62_librsvg/rsvg-base.diff
diff --git a/libs/6_autoconf.sh b/libs/6_autoconf.sh
new file mode 100644
index 0000000..381dc3d
--- /dev/null
+++ b/libs/6_autoconf.sh
@@ -0,0 +1,21 @@
+MODVER=2.69
+
+mkdir -p 6_autoconf
+cd 6_autoconf
+test -f autoconf-$MODVER.tar.gz || wget http://ftp.gnu.org/gnu/autoconf/autoconf-$MODVER.tar.gz
+gzip -d -f -c autoconf-$MODVER.tar.gz > autoconf-$MODVER.tar
+tar -xf autoconf-$MODVER.tar
+cd autoconf-$MODVER
+
+echo Compile...
+
+# note install in the same prefix as mingw
+./configure $HOST_OPTION --prefix=/mingw
+make clean
+make 2>&1 | tee ../../logs/6_autoconf-make.log
+make install 2>&1 | tee ../../logs/6_autoconf-makeinstall.log
+
+
+cd ..
+rm -rf autoconf-$MODVER
+rm -f autoconf-$MODVER.tar
diff --git a/win32/libs/71_icon-naming-utils.bat b/libs/71_icon-naming-utils.sh
similarity index 90%
rename from win32/libs/71_icon-naming-utils.bat
rename to libs/71_icon-naming-utils.sh
index 32f7932..a8824da 100644
--- a/win32/libs/71_icon-naming-utils.bat
+++ b/libs/71_icon-naming-utils.sh
@@ -10,7 +10,7 @@ cd icon-naming-utils-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make 2>&1 | tee ../../logs/71_icon-naming-utils-make.log
 make install 2>&1 | tee ../../logs/71_icon-naming-utils-makeinstall.log
 
diff --git a/win32/libs/72_hicolor-icon-theme.bat b/libs/72_hicolor-icon-theme.sh
similarity index 90%
rename from win32/libs/72_hicolor-icon-theme.bat
rename to libs/72_hicolor-icon-theme.sh
index 3eefaa2..a426e17 100644
--- a/win32/libs/72_hicolor-icon-theme.bat
+++ b/libs/72_hicolor-icon-theme.sh
@@ -10,7 +10,7 @@ cd hicolor-icon-theme-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make 2>&1 | tee ../../logs/72_hicolor-icon-theme-make.log
 make install 2>&1 | tee ../../logs/72_hicolor-icon-theme-makeinstall.log
 
diff --git a/win32/libs/73_gnome-icon-theme.bat b/libs/73_gnome-icon-theme.sh
similarity index 90%
rename from win32/libs/73_gnome-icon-theme.bat
rename to libs/73_gnome-icon-theme.sh
index d729ff7..b611362 100644
--- a/win32/libs/73_gnome-icon-theme.bat
+++ b/libs/73_gnome-icon-theme.sh
@@ -12,7 +12,7 @@ cd gnome-icon-theme-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make 2>&1 | tee ../../logs/73_gnome-icon-theme-make.log
 make install 2>&1 | tee ../../logs/73_gnome-icon-theme-makeinstall.log
 
diff --git a/win32/libs/74_gnome-icon-theme-symbolic.bat b/libs/74_gnome-icon-theme-symbolic.sh
similarity index 91%
rename from win32/libs/74_gnome-icon-theme-symbolic.bat
rename to libs/74_gnome-icon-theme-symbolic.sh
index 1547b0d..a674999 100644
--- a/win32/libs/74_gnome-icon-theme-symbolic.bat
+++ b/libs/74_gnome-icon-theme-symbolic.sh
@@ -12,7 +12,7 @@ cd gnome-icon-theme-symbolic-$MODVER
 
 echo Compile...
 
-./configure --prefix=$PREFIX
+./configure $HOST_OPTION --prefix=$PREFIX
 make 2>&1 | tee ../../logs/74_gnome-icon-theme-symbolic-make.log
 make install 2>&1 | tee ../../logs/74_gnome-icon-theme-symbolic-makeinstall.log
 
diff --git a/win32/libs/5_automake.bat b/libs/7_automake.sh
similarity index 63%
rename from win32/libs/5_automake.bat
rename to libs/7_automake.sh
index c43e3e2..9efcd1c 100644
--- a/win32/libs/5_automake.bat
+++ b/libs/7_automake.sh
@@ -1,7 +1,7 @@
 MODVER=1.11.6
 
-mkdir -p 4_automake
-cd 4_automake
+mkdir -p 7_automake
+cd 7_automake
 test -f automake-$MODVER.tar.gz || wget http://ftp.gnu.org/gnu/automake/automake-$MODVER.tar.gz
 gzip -d -f -c automake-$MODVER.tar.gz > automake-$MODVER.tar
 tar -xf automake-$MODVER.tar
@@ -11,10 +11,10 @@ cd automake-$MODVER
 echo Compile...
 
 # note install in the same prefix as mingw
-./configure --prefix=/mingw
+./configure $HOST_OPTION --prefix=/mingw
 make clean
-make 2>&1 | tee ../../logs/4_automake-make.log
-make install 2>&1 | tee ../../logs/4_automake-makeinstall.log
+make 2>&1 | tee ../../logs/7_automake-make.log
+make install 2>&1 | tee ../../logs/7_automake-makeinstall.log
 
 
 cd ..
diff --git a/win32/libs/BUILD_ALL.BAT b/libs/BUILD_ALL.sh
similarity index 100%
rename from win32/libs/BUILD_ALL.BAT
rename to libs/BUILD_ALL.sh
diff --git a/win32/z_Install/INSTRUCTIONS.txt b/z_Install/INSTRUCTIONS.txt
similarity index 100%
rename from win32/z_Install/INSTRUCTIONS.txt
rename to z_Install/INSTRUCTIONS.txt
diff --git a/z_Install/Tools/7Z.DLL b/z_Install/Tools/7Z.DLL
new file mode 100644
index 0000000..2bdaed6
Binary files /dev/null and b/z_Install/Tools/7Z.DLL differ
diff --git a/z_Install/Tools/7Z.EXE b/z_Install/Tools/7Z.EXE
new file mode 100644
index 0000000..101884c
Binary files /dev/null and b/z_Install/Tools/7Z.EXE differ
diff --git a/win32/z_Install/Tools/python2.7-config b/z_Install/Tools/python3.4-config
similarity index 100%
rename from win32/z_Install/Tools/python2.7-config
rename to z_Install/Tools/python3.4-config
diff --git a/z_Install/setup.bat b/z_Install/setup.bat
new file mode 100644
index 0000000..b0547ab
--- /dev/null
+++ b/z_Install/setup.bat
@@ -0,0 +1,90 @@
+rem Feel free to customize this
+set MINGWDIR=c:\mingw
+
+mkdir %MINGWDIR%
+
+cd Tools
+WGET.exe --no-check-certificate "http://downloads.sourceforge.net/project/mingw-w64/Toolchains targetting 
Win64/Personal Builds/mingw-builds/4.9.0/threads-win32/seh/x86_64-4.9.0-release-win32-seh-rt_v3-rev2.7z"
+
+WGET.exe --no-check-certificate "http://sourceforge.net/projects/mingw-w64/files/Toolchains targetting 
Win64/Personal Builds/ray_linn/64bit-libraries/gettext/gettext-0.18.2.7z"
+
+WGET.exe --no-check-certificate "http://sourceforge.net/projects/mingw-w64/files/External binary packages 
(Win64 hosted)/libiconv/libiconv-1.13.1-win64-20100707.zip"
+
+WGET.exe --no-check-certificate 
"http://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.tar.xz";
+
+mkdir cache
+xcopy x86_64-4.9.0-release-win32-seh-rt_v3-rev2.7z cache
+xcopy gettext-0.18.2.7z cache
+xcopy libiconv-1.13.1-win64-20100707.zip cache
+xcopy mingw-get-0.6.2-mingw32-beta-20131004-1-bin.tar.xz cache
+cd cache
+..\7z x -o".\" *.7z
+xcopy /e /r /h /c /y mingw64\* %MINGWDIR%
+rmdir /q /s mingw64
+
+xcopy /e /r /h /c /y gettext-0.18.2\* %MINGWDIR%
+rmdir /q /s gettext-0.18.2
+rem the latest version of gettext is broken, see: 
http://stackoverflow.com/questions/23637991/building-lzma-linker-errors
+del /q %MINGWDIR%\lib\*.la
+
+..\unzip -o *.zip
+xcopy /e /r /h /c /y mingw64\bin\*.* %MINGWDIR%\bin
+xcopy /e /r /h /c /y mingw64\share\*.* %MINGWDIR%\share
+xcopy /e /r /h /c /y mingw64\include\*.* %MINGWDIR%\x86_64-w64-mingw32\include
+xcopy /e /r /h /c /y mingw64\lib\*.* %MINGWDIR%\x86_64-w64-mingw32\lib
+del /q %MINGWDIR%\x86_64-w64-mingw32\lib\libiconv.la
+
+..\xz -d *.xz
+for %%i in (*.tar) do ..\tar -xf %%i -C %MINGWDIR%
+del /q *.tar
+cd ..
+
+rem Install python
+WGET.exe --no-check-certificate https://www.python.org/ftp/python/3.4.1/python-3.4.1.amd64.msi
+python-3.4.1.amd64.msi
+xcopy python3.4-config c:\Python34
+xcopy python3.4-config c:\Python34\python-config
+
+rem Install all the required packages
+cd %MINGWDIR%\bin
+mingw-get.exe update
+mingw-get.exe install mingw-get
+copy ..\var\lib\mingw-get\data\defaults.xml ..\var\lib\mingw-get\data\profile.xml
+mingw-get.exe install msys-core
+mingw-get.exe install msys-base
+mingw-get.exe install msys-perl
+mingw-get.exe install msys-vim
+mingw-get.exe install msys-patch
+mingw-get.exe install msys-wget
+mingw-get.exe install msys-unzip
+mingw-get.exe install msys-libiconv
+mingw-get.exe install msys-libexpat
+mingw-get.exe install msys-expat
+
+rem Set the right exports
+set PREFIX=opt
+
+echo export PREFIX="/%PREFIX%" >> %MINGWDIR%\msys\1.0\etc\profile
+
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\bin
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\etc
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\include
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\lib
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\lib\pkgconfig
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\share
+
+
+echo export PATH="$PATH:/%PREFIX%/bin:/c/Python34" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export CFLAGS="-I/%PREFIX%/include" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export CPPFLAGS="-I/%PREFIX%/include" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export LDFLAGS="-L/%PREFIX%/lib" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export PKG_CONFIG_PATH="/%PREFIX%/lib/pkgconfig" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export XDG_DATA_DIRS="/%PREFIX%/share" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export ACLOCAL_FLAGS="-I /opt/share/aclocal" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export ACLOCAL_PATH="/opt/share/aclocal" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export LIBRARY_PATH="/opt/lib" >> %MINGWDIR%\msys\1.0\etc\profile
+
+rem Set the proper HOST_OPTION which should depend on the architecture
+rem hardcode to x86_64 for now
+echo export HOST_OPTION="--host=x86_64-w64-mingw32" >> %MINGWDIR%\msys\1.0\etc\profile
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]