From e509ead680cc1c0bde35dfd467d18b8288cc1b86 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 29 Dec 2016 13:17:24 +0100
Subject: Buildbot: Update Gettext version (#4971)

---
 util/buildbot/buildwin32.sh | 9 ++++-----
 util/buildbot/buildwin64.sh | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'util')

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index e58c25ccc..d807003d2 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -17,7 +17,7 @@ irrlicht_version=1.8.4
 ogg_version=1.3.2
 vorbis_version=1.3.5
 curl_version=7.50.3
-gettext_version=0.14.4
+gettext_version=0.19.8.1
 freetype_version=2.7
 sqlite3_version=3.14.2
 luajit_version=2.1.0-beta2
@@ -40,7 +40,7 @@ cd $builddir
 	-c -O $packagedir/libvorbis-$vorbis_version.zip
 [ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
 	-c -O $packagedir/curl-$curl_version.zip
-[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version.zip \
+[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip \
 	-c -O $packagedir/gettext-$gettext_version.zip
 [ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
 	-c -O $packagedir/freetype2-$freetype_version.zip
@@ -130,10 +130,9 @@ cmake .. \
 	-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
 	-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
 	\
-	-DCUSTOM_GETTEXT_PATH=$libdir/gettext \
 	-DGETTEXT_MSGFMT=`which msgfmt` \
-	-DGETTEXT_DLL=$libdir/gettext/bin/libintl3.dll \
-	-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv2.dll \
+	-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
+	-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
 	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
 	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
 	\
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 1c31fe4bd..3d6965f1e 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -17,7 +17,7 @@ irrlicht_version=1.8.4
 ogg_version=1.3.2
 vorbis_version=1.3.5
 curl_version=7.50.3
-gettext_version=0.18.2
+gettext_version=0.19.8.1
 freetype_version=2.7
 sqlite3_version=3.14.2
 luajit_version=2.1.0-beta2
@@ -131,7 +131,6 @@ cmake .. \
 	-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
 	-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
 	\
-	-DCUSTOM_GETTEXT_PATH=$libdir/gettext \
 	-DGETTEXT_MSGFMT=`which msgfmt` \
 	-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
 	-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
-- 
cgit v1.2.3