Contribs: libgpg-error version bump.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index aac22177b9578882223f11caecc05ef883e509f3..1be389f62a5742133460cf596e3a57c3e9500187 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1753,9 +1753,6 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2:
 
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/libgpg-error-win32.patch
-endif
 
 .gpg-error: libgpg-error
 ifdef HAVE_DARWIN_OS_ON_INTEL

diff --git a/extras/contrib/src/Patches/libgpg-error-win32.patch b/extras/contrib/src/Patches/libgpg-error-win32.patch
deleted file mode 100644 (file)
index 49a9d1e..0000000
--- a/extras/contrib/src/Patches/libgpg-error-win32.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index e6a42ecd4a1ac259170b092e11c68869b5008589..3162301737640c573908f7cc7b0937b22f4ffdf5 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -131,7 +131,7 @@ CDIO_VERSION=0.79
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.2.23
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
-GPGERROR_VERSION=1.5
+GPGERROR_VERSION=1.6
 GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GCRYPT_VERSION=1.2.3
 GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2