use fig2dev and GPG

4 files changed, 77 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ef7b1d91c75..5e60ab72cb43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,27 @@
 # Generated by mksrcinfo v8
-# Fri Aug 19 21:21:25 UTC 2016
+# Wed Sep 28 22:36:14 UTC 2016
 pkgbase = mingw-w64-libgcrypt
 	pkgdesc = General purpose cryptographic library based on the code from GnuPG (mingw-w64)
 	pkgver = 1.7.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gnupg.org
 	arch = any
 	license = LGPL
 	makedepends = mingw-w64-configure
-	makedepends = transfig
+	makedepends = fig2dev
 	makedepends = ghostscript
 	depends = mingw-w64-libgpg-error
 	options = staticlibs
 	options = !buildflags
 	options = !strip
 	source = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.7.3.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.7.3.tar.bz2.sig
 	source = libgcrypt-use-correct-def-file.patch
-	md5sums = c869e542cc13a1c28d8055487bf7f5c4
-	md5sums = 531e089caca74b5daf130b7173c2a5c5
+	source = Smarter-fig2dev-detection.all.patch
+	sha1sums = 5a034291e7248592605db448481478e6c963aa9c
+	sha1sums = SKIP
+	sha1sums = ccd4860aabc08793174376cffa357a7d094ae451
+	sha1sums = 3613a5454aeaef8d264011f2bc9f2303248fb933
 
 pkgname = mingw-w64-libgcrypt
 
diff --git a/.gitignore b/.gitignore
index 886033bef767..d6a576c6d1bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 pkg/
 src/
 *.bz2
+*.sig
 *.tar
 *.xz
diff --git a/PKGBUILD b/PKGBUILD
index 5397a524fad0..b2b7608e335a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,28 @@
 pkgname=mingw-w64-libgcrypt
 pkgver=1.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose cryptographic library based on the code from GnuPG (mingw-w64)"
 arch=("any")
 url="http://www.gnupg.org"
 license=("LGPL")
 depends=(mingw-w64-libgpg-error)
-makedepends=(mingw-w64-configure transfig ghostscript)
+makedepends=(mingw-w64-configure fig2dev ghostscript)
 options=(staticlibs !buildflags !strip)
-source=("ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${pkgver}.tar.bz2"
-"libgcrypt-use-correct-def-file.patch")
-md5sums=('c869e542cc13a1c28d8055487bf7f5c4'
-         '531e089caca74b5daf130b7173c2a5c5')
+source=("ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${pkgver}.tar.bz2"{,.sig}
+"libgcrypt-use-correct-def-file.patch"
+"Smarter-fig2dev-detection.all.patch")
+sha1sums=('5a034291e7248592605db448481478e6c963aa9c'
+          'SKIP'
+          'ccd4860aabc08793174376cffa357a7d094ae451'
+          '3613a5454aeaef8d264011f2bc9f2303248fb933')
+validpgpkeys=('031EC2536E580D8EA286A9F22071B08A33BD3F06' # "NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>"
+              'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/libgcrypt-${pkgver}"
   patch -p0 -i "$srcdir"/libgcrypt-use-correct-def-file.patch
+  patch -p1 -i "${srcdir}"/Smarter-fig2dev-detection.all.patch
   autoreconf -fi
 }
 
@@ -25,15 +31,9 @@ build() {
   unset LDFLAGS
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    configure_args=""
-    if test "${_arch}" = "x86_64-w64-mingw32"
-    then
-      configure_args="ac_cv_sys_symbol_underscore=no --disable-padlock-support"
-    fi
     ${_arch}-configure \
-      --enable-pubkey-ciphers='dsa elgamal rsa ecc' \
       --with-gpg-error-prefix=/usr/${_arch} \
-      --disable-padlock-support $configure_args
+      --disable-padlock-support
     make
     popd
   done
diff --git a/Smarter-fig2dev-detection.all.patch b/Smarter-fig2dev-detection.all.patch
new file mode 100644
index 000000000000..d00fe5afe0b7
--- /dev/null
+++ b/Smarter-fig2dev-detection.all.patch
@@ -0,0 +1,54 @@
+From 15cad0ff53ad39e569b796474ad534687ea33e32 Mon Sep 17 00:00:00 2001
+From: <lrn1986@gmial.com>
+Date: Wed, 20 Mar 2013 20:31:57 +0400
+Subject: [PATCH 2/3] Smarter fig2dev detection
+
+---
+ configure.ac    | 5 +++++
+ doc/Makefile.am | 8 ++++----
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7afd83d..a6d8bdc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -654,6 +654,11 @@ AC_SUBST(PTH_CFLAGS)
+ AC_SUBST(PTH_LIBS)
+ 
+ #
++# Find fig2dev
++#
++AC_PATH_PROG([FIG2DEV], [fig2dev], [false])
++
++#
+ # Check whether pthreads is available
+ #
+ if test "$have_w32_system" != yes; then
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 30330bb..42c7d4f 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -45,16 +45,16 @@ yat2m: yat2m.c
+ 	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+ 
+ .fig.png:
+-	fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
++	$(FIG2DEV) -L png `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
+ 
+ .fig.jpg:
+-	fig2dev -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@
++	$(FIG2DEV) -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
+ 
+ .fig.eps:
+-	fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@
++	$(FIG2DEV) -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
+ 
+ .fig.pdf:
+-	fig2dev -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@
++	$(FIG2DEV) -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
+ 
+ yat2m-stamp: $(myman_sources)
+ 	@rm -f yat2m-stamp.tmp
+-- 
+1.7.11
+