- fix for locale SUBLANG definitions which conflicts with mingw headers

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6ee99c8aef41e8332478e978c1a0bc263dde8891..f9204aff51ac94b9a317fd40f0a586f0c8ff353d 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -409,6 +409,9 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz
 ifdef HAVE_DARWIN_OS
        patch -p 0 < Patches/gettext-macosx.patch 
 endif
+ifdef HAVE_WIN32
+       patch -p 0 < Patches/gettext-win32.patch
+endif
 
 .intl: gettext .iconv
 ifdef HAVE_WIN32
@@ -1514,6 +1517,9 @@ libgpg-error-$(GPGERROR_VERSION).tar.gz:
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p 0 < Patches/libgpg-error.patch
+ifdef HAVE_WIN32
+       patch -p 0 < Patches/libgpg-error-win32.patch
+endif
 
 .gpg-error: libgpg-error
 ifeq ($(HOST),i686-apple-darwin8)

diff --git a/extras/contrib/src/Patches/gettext-win32.patch b/extras/contrib/src/Patches/gettext-win32.patch
new file mode 100644 (file)
index 0000000..cc2c726
--- /dev/null
+++ b/extras/contrib/src/Patches/gettext-win32.patch
@@ -0,0 +1,62 @@
+--- gettext/gettext-runtime/intl/localename.c.orig     2006-11-22 12:14:26.041794800 +0000
++++ gettext/gettext-runtime/intl/localename.c  2006-11-22 12:25:50.425554800 +0000
+@@ -494,10 +494,10 @@
+ # define SUBLANG_AZERI_CYRILLIC 0x02
+ # endif
+ # ifndef SUBLANG_BENGALI_INDIA
+-# define SUBLANG_BENGALI_INDIA 0x00
++# define SUBLANG_BENGALI_INDIA 0x01
+ # endif
+ # ifndef SUBLANG_BENGALI_BANGLADESH
+-# define SUBLANG_BENGALI_BANGLADESH 0x01
++# define SUBLANG_BENGALI_BANGLADESH 0x02
+ # endif
+ # ifndef SUBLANG_CHINESE_MACAU
+ # define SUBLANG_CHINESE_MACAU 0x05
+@@ -590,16 +590,16 @@
+ # define SUBLANG_NEPALI_INDIA 0x02
+ # endif
+ # ifndef SUBLANG_PUNJABI_INDIA
+-# define SUBLANG_PUNJABI_INDIA 0x00
++# define SUBLANG_PUNJABI_INDIA 0x01
+ # endif
+ # ifndef SUBLANG_PUNJABI_PAKISTAN
+-# define SUBLANG_PUNJABI_PAKISTAN 0x01
++# define SUBLANG_PUNJABI_PAKISTAN 0x02
+ # endif
+ # ifndef SUBLANG_ROMANIAN_ROMANIA
+-# define SUBLANG_ROMANIAN_ROMANIA 0x00
++# define SUBLANG_ROMANIAN_ROMANIA 0x01
+ # endif
+ # ifndef SUBLANG_ROMANIAN_MOLDOVA
+-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
++# define SUBLANG_ROMANIAN_MOLDOVA 0x02
+ # endif
+ # ifndef SUBLANG_SERBIAN_LATIN
+ # define SUBLANG_SERBIAN_LATIN 0x02
+@@ -608,10 +608,10 @@
+ # define SUBLANG_SERBIAN_CYRILLIC 0x03
+ # endif
+ # ifndef SUBLANG_SINDHI_INDIA
+-# define SUBLANG_SINDHI_INDIA 0x00
++# define SUBLANG_SINDHI_INDIA 0x01
+ # endif
+ # ifndef SUBLANG_SINDHI_PAKISTAN
+-# define SUBLANG_SINDHI_PAKISTAN 0x01
++# define SUBLANG_SINDHI_PAKISTAN 0x02
+ # endif
+ # ifndef SUBLANG_SPANISH_GUATEMALA
+ # define SUBLANG_SPANISH_GUATEMALA 0x04
+@@ -674,10 +674,10 @@
+ # define SUBLANG_TAMAZIGHT_LATIN 0x02
+ # endif
+ # ifndef SUBLANG_TIGRINYA_ETHIOPIA
+-# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
++# define SUBLANG_TIGRINYA_ETHIOPIA 0x01
+ # endif
+ # ifndef SUBLANG_TIGRINYA_ERITREA
+-# define SUBLANG_TIGRINYA_ERITREA 0x01
++# define SUBLANG_TIGRINYA_ERITREA 0x02
+ # endif
+ # ifndef SUBLANG_URDU_PAKISTAN
+ # define SUBLANG_URDU_PAKISTAN 0x01

diff --git a/extras/contrib/src/Patches/libgpg-error-win32.patch b/extras/contrib/src/Patches/libgpg-error-win32.patch
new file mode 100644 (file)
index 0000000..49a9d1e
--- /dev/null
+++ b/extras/contrib/src/Patches/libgpg-error-win32.patch
@@ -0,0 +1,36 @@
+--- libgpg-error/src/w32-gettext.c     2005-12-18 15:24:34.000000000 +0000
++++ libgpg-error.new/src/w32-gettext.c 2006-11-22 12:56:15.745793600 +0000
+@@ -522,10 +522,10 @@
+ # define SUBLANG_AZERI_CYRILLIC 0x02
+ # endif
+ # ifndef SUBLANG_BENGALI_INDIA
+-# define SUBLANG_BENGALI_INDIA 0x00
++# define SUBLANG_BENGALI_INDIA 0x01
+ # endif
+ # ifndef SUBLANG_BENGALI_BANGLADESH
+-# define SUBLANG_BENGALI_BANGLADESH 0x01
++# define SUBLANG_BENGALI_BANGLADESH 0x02
+ # endif
+ # ifndef SUBLANG_CHINESE_MACAU
+ # define SUBLANG_CHINESE_MACAU 0x05
+@@ -618,16 +618,16 @@
+ # define SUBLANG_NEPALI_INDIA 0x02
+ # endif
+ # ifndef SUBLANG_PUNJABI_INDIA
+-# define SUBLANG_PUNJABI_INDIA 0x00
++# define SUBLANG_PUNJABI_INDIA 0x01
+ # endif
+ # ifndef SUBLANG_PUNJABI_PAKISTAN
+-# define SUBLANG_PUNJABI_PAKISTAN 0x01
++# define SUBLANG_PUNJABI_PAKISTAN 0x02
+ # endif
+ # ifndef SUBLANG_ROMANIAN_ROMANIA
+-# define SUBLANG_ROMANIAN_ROMANIA 0x00
++# define SUBLANG_ROMANIAN_ROMANIA 0x01
+ # endif
+ # ifndef SUBLANG_ROMANIAN_MOLDOVA
+-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
++# define SUBLANG_ROMANIAN_MOLDOVA 0x02
+ # endif
+ # ifndef SUBLANG_SERBIAN_LATIN
+ # define SUBLANG_SERBIAN_LATIN 0x02