Update gpgme to 1.7.0 beta
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 12 Jul 2016 13:42:31 +0000 (15:42 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 12 Jul 2016 13:50:12 +0000 (15:50 +0200)
* configure.ac: Build gpgme after qtbase.
* src/Makefile.am (gpg4win_pkg_gpgme_configure),
(gpg4win_pkg_gpgme_ex_configure): Don't build languages for now.
* packages/packages.current: Switch to unreleased gpgme version.

--
GpgME is moved after qtbase as we want to build qgpgme from there
in the future but for now we disable the languages to avoid
confilicts. Should be changed once libkleo and gpgmepp no
longer contain these parts.

configure.ac
packages/packages.current
src/Makefile.am

index 2a6f35e..0210f43 100644 (file)
@@ -316,7 +316,7 @@ GPG4WIN_SPKG([bzip2])
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
 GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
 GPG4WIN_SPKG([pinentry], [qtbase libiconv gtk+])
-GPG4WIN_SPKG([gpgme], [libgpg-error glib])
+GPG4WIN_SPKG([gpgme], [libgpg-error glib qtbase])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 GPG4WIN_SPKG([paperkey])
index ef14af3..2b602f1 100644 (file)
@@ -295,15 +295,17 @@ name gnupg-w32-2.1.13-20160616-src.tar.xz
 file binary/gnupg-w32-2.1.13_20160616.tar.xz
 chk  f928e680770f3754b22ee6bfb0532307a4fa1f871a726656e028e6e95095bf2d
 
+# TODO: Switch back to released version
 # last changed: 2015-12-11
 # by: ah
 #file pinentry/pinentry-0.9.7.tar.bz2
 #chk  6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
 
+# TODO: Switch back to released version
 # last changed: 2015-08-26
 # by: ah
-file gpgme/gpgme-1.6.0.tar.bz2
-chk  b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d
+file gpgme/gpgme-1.6.0.tar.bz2
+chk  b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d
 
 # last changed: 2015-09-09
 # by: ah
@@ -497,6 +499,12 @@ server http://files.intevation.de/projects/gpg4all
 file pinentry/pinentry-0.9.8-beta18.tar.bz2
 chk 67b017001928ad072f57435b72d473a961f64bfb17c792e42984dc31f72ae7d1
 
+# ditto for gpgme.
+# by: ah
+# verified: tarball created by ah
+file gpgme/gpgme-1.7.0-beta225.tar.bz2
+chk c70f1699fc9af870d9225f57878385b49f9d571b2a8cfd17c73613b7ea983c56
+
 # Gpgmepp
 # last changed: 2016-01-21
 # by: ah
index fbec3b9..c0fe8a6 100644 (file)
@@ -237,13 +237,15 @@ gpg4win_pkg_pinentry_configure = \
 gpg4win_pkg_gpgme_configure = --silent \
   --with-gpg-error-prefix=$(idir) --enable-static \
   `test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
-  --disable-w32-qt CFLAGS=-I$(idir)/include/glib-2.0/ \
-  LDFLAGS=-L$(idir)/lib
+  CFLAGS=-I$(idir)/include/glib-2.0/ \
+  LDFLAGS=-L$(idir)/lib \
+  --enable-languages=no
 
 gpg4win_pkg_gpgme_ex_configure = --silent \
   --with-gpg-error-prefix=$(ex_idir) --enable-static \
   --with-libassuan-prefix=$(ex_idir) \
-  LDFLAGS=-L$(ex_idir)/lib
+  LDFLAGS=-L$(ex_idir)/lib \
+  --enable-languages=no
 
 gpg4win_pkg_gpa_configure = --silent \
   --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \