From 5e3efc8e15a1ceed498dfa2f1ebab6feb6be84d7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 18 Aug 2010 20:37:02 +0200 Subject: [PATCH] Contribs: Keep an older libgpg-error as release is broken on Windows As reported by xxcv --- extras/contrib/src/Makefile | 4 ++-- extras/contrib/src/packages.mak | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 6d6fcd04b5..1632a6843a 100644 --- 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 df5d03cd7a..eab3b7d56c 100644 --- 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 -- 2.39.2