Contribs: Keep an older libgpg-error as release is broken on Windows

As reported by xxcv

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6d6fcd04b57757ad5ed97e352ee8bd675c71034a..1632a6843a933bc669a89fda121985702cb196aa 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1786,8 +1786,8 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2:
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
-       patch -p 0 < Patches/libgpg-error-win32.patch
-       (cd $@; ./autogen.sh)
+#      patch -p 0 < Patches/libgpg-error-win32.patch
+#      (cd $@; ./autogen.sh)
 endif
 
 .gpg-error: libgpg-error

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index df5d03cd7a79bfe07f48e9d299dd155c9bf67761..eab3b7d56c198f3c797ad3adf47ece08e9a6f145 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -139,7 +139,7 @@ CDIO_VERSION=0.80
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.4.3
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
-GPGERROR_VERSION=1.9
+GPGERROR_VERSION=1.7
 #GPGERROR_URL=$(CONTRIB_VIDEOLAN)/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GCRYPT_VERSION=1.4.6