Commit 0d0d4544 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update gpg-error to 1.10

parent a6e2468e
6cf5138e05fb6ee320035d86c71ff9aa940b0f16e4787eb832a781d5d97d0e865eac0b988c251657a0e77dffced1d9ef3e7f4d0cdf806cb18abfbbcf07f27a72 libgpg-error-1.7.tar.bz2
438f922a3a4fa7db22ba9b68deab18c663afbc8166ddeee487b7eb0a9ee04ce84bbc871ad31bf11a7c77322948869a2dc5014cf6a73b68d8f10fcf7e24d165d5 libgpg-error-1.10.tar.bz2
# GPGERROR
GPGERROR_VERSION := 1.7
GPGERROR_VERSION := 1.10
GPGERROR_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
$(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:
......@@ -9,10 +9,13 @@ $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:
libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error
$(UNPACK)
ifdef HAVE_WIN32
$(APPLY) $(SRC)/gpg-error/windres-make.patch
endif
$(MOVE)
.gpg-error: libgpg-error
#$(RECONF)
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls --disable-shared --disable-languages
cd $< && $(MAKE) install
touch $@
--- libgpg-error/src/Makefile.am 2010-04-14 11:16:44.000000000 +0200
+++ libgpg-error.new/src/Makefile.am 2010-08-09 11:21:56.000000000 +0200
@@ -60,7 +60,7 @@
arch_sources = w32-gettext.c
RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
+ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
SUFFIXES = .rc .lo
......@@ -1820,8 +1820,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 $@; autoreconf -ivf)
endif
.gpg-error: libgpg-error
......
......@@ -134,7 +134,7 @@ CDIO_VERSION=0.80
CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
PNG_VERSION=1.4.8
PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.7
GPGERROR_VERSION=1.10
#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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment