MSVC compatibility patch

3 files changed, 20 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d8750128345..be1ae76ec098 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-gettext
 	pkgdesc = GNU internationalization library (mingw-w64)
 	pkgver = 0.19.4
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.gnu.org/software/gettext
 	arch = any
 	license = GPL
@@ -20,12 +20,14 @@ pkgbase = mingw-w64-gettext
 	source = 05-always-use-libintl-vsnprintf.mingw.patch
 	source = 06-dont-include-ctype-after-gnulibs-wctype.mingw.patch
 	source = 07-fix-asprintf-conflict.mingw.patch
+	source = 08-vs-compatible.patch
 	md5sums = d3511af1e604a3478900d2c2b4a4a48e
 	md5sums = SKIP
 	md5sums = 397d7d6d4abd15a70edb3c9f2bab4cd2
 	md5sums = 27852a388b8cf38188dc392c244230ff
 	md5sums = f69747f43f279b8a81286cfe5916b82f
 	md5sums = 3ebccf730ec3377b068027eb2283afb2
+	md5sums = f5b611172ae58f1e4589a8d0c1d53414
 
 pkgname = mingw-w64-gettext
 
diff --git a/08-vs-compatible.patch b/08-vs-compatible.patch
new file mode 100644
index 000000000000..d6413ad50882
--- /dev/null
+++ b/08-vs-compatible.patch
@@ -0,0 +1,11 @@
+--- gettext-runtime/intl/libgnuintl.in.h.old	2015-06-15 10:40:11.594942600 +0200
++++ gettext-runtime/intl/libgnuintl.in.h	2015-06-15 10:40:50.579345400 +0200
+@@ -336,7 +336,7 @@ extern int vfprintf (FILE *, const char
+ 
+ #if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
+ #undef printf
+-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
++#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER
+ /* Don't break __attribute__((format(printf,M,N))).
+    This redefinition is only possible because the libc in NetBSD, Cygwin,
+    mingw does not have a function __printf__.
diff --git a/PKGBUILD b/PKGBUILD
index 5ddc26b4bd8c..764fbddb064e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 pkgname=mingw-w64-gettext
 pkgver=0.19.4
-pkgrel=4
+pkgrel=5
 arch=(any)
 pkgdesc="GNU internationalization library (mingw-w64)"
 depends=(mingw-w64-crt mingw-w64-libiconv mingw-w64-termcap mingw-w64-libunistring)
@@ -13,13 +13,15 @@ source=("http://ftp.gnu.org/pub/gnu/gettext/gettext-${pkgver}.tar.gz"{,.sig}
 "00-relocatex-libintl-0.18.3.1.patch"
 "05-always-use-libintl-vsnprintf.mingw.patch"
 "06-dont-include-ctype-after-gnulibs-wctype.mingw.patch"
-"07-fix-asprintf-conflict.mingw.patch")
+"07-fix-asprintf-conflict.mingw.patch"
+"08-vs-compatible.patch")
 md5sums=('d3511af1e604a3478900d2c2b4a4a48e'
          'SKIP'
          '397d7d6d4abd15a70edb3c9f2bab4cd2'
          '27852a388b8cf38188dc392c244230ff'
          'f69747f43f279b8a81286cfe5916b82f'
-         '3ebccf730ec3377b068027eb2283afb2')
+         '3ebccf730ec3377b068027eb2283afb2'
+         'f5b611172ae58f1e4589a8d0c1d53414')
 validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -30,6 +32,7 @@ prepare() {
   patch -p0 -i ${srcdir}/05-always-use-libintl-vsnprintf.mingw.patch
   patch -p0 -i ${srcdir}/06-dont-include-ctype-after-gnulibs-wctype.mingw.patch
   patch -p0 -i ${srcdir}/07-fix-asprintf-conflict.mingw.patch
+  patch -p0 -i ${srcdir}/08-vs-compatible.patch
 }
 
 build() {