community/gpgme: upgrade to 1.14.0

2 files changed, 4 insertions, 78 deletions

diff --git a/community/gpgme/APKBUILD b/community/gpgme/APKBUILD
index 042f3e0dd17..aa18dd6b5cc 100644
--- a/community/gpgme/APKBUILD
+++ b/community/gpgme/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gpgme
-pkgver=1.13.1
-pkgrel=2
+pkgver=1.14.0
+pkgrel=0
 pkgdesc="gnupg made easy"
 url="https://www.gnupg.org/related_software/gpgme/"
 arch="all"
@@ -11,8 +11,7 @@ depends="gnupg"
 depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev python3-dev py3-setuptools swig libgpg-error-dev libassuan-dev"
 subpackages="$pkgname-dev $pkgname-doc gpgmepp py3-gpgme:py3 q$pkgname $pkgname-lisp:lisp:noarch"
-source="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$pkgver.tar.bz2
-	disable-json-test.patch"
+source="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$pkgver.tar.bz2"
 
 case "$CARCH" in
 x86|arm*) options="!check";;
@@ -65,5 +64,4 @@ qgpgme() {
 	mv "$pkgdir"/usr/lib/libqgpgme.so* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8  gpgme-1.13.1.tar.bz2
-3efd694a94ac8c3ddc64ccf8707f72dad2ae3f4e21eb183368d3766d1811c20c95b8784d4a96ef5c23a4a0764126041f74d8106f5e4d85763b4cbb35988ea404  disable-json-test.patch"
+sha512sums="b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668  gpgme-1.14.0.tar.bz2"
diff --git a/community/gpgme/disable-json-test.patch b/community/gpgme/disable-json-test.patch
deleted file mode 100644
index 4c674255aeb..00000000000
--- a/community/gpgme/disable-json-test.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-The t-json test fails due to an unpatched upstream bug. Due to the
-importance of this package, we do not want to disable the entire test
-suite. Instead we only disable the t-json test but patching the
-autogenerated Makefile.in.
-
-Remove this patch as soon as the bug has been resolved upstream.
-
-See: https://dev.gnupg.org/T4820
-
-diff -upr gpgme-1.13.1.orig/tests/json/Makefile.in gpgme-1.13.1/tests/json/Makefile.in
---- gpgme-1.13.1.orig/tests/json/Makefile.in	2020-05-02 12:28:44.526707197 +0200
-+++ gpgme-1.13.1/tests/json/Makefile.in	2020-05-02 12:29:07.393394561 +0200
-@@ -129,11 +129,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/b
- CONFIG_HEADER = $(top_builddir)/conf/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
--am__EXEEXT_1 = t-json$(EXEEXT)
- PROGRAMS = $(noinst_PROGRAMS)
--am_t_json_OBJECTS = t-json.$(OBJEXT)
--t_json_OBJECTS = $(am_t_json_OBJECTS)
--t_json_DEPENDENCIES = ../../src/cJSON.o ../../src/libgpgme.la
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -172,8 +168,6 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo "  CCLD    " $@;
- am__v_CCLD_1 = 
--SOURCES = $(t_json_SOURCES)
--DIST_SOURCES = $(t_json_SOURCES)
- am__can_run_installinfo = \
-   case $$AM_UPDATE_INFO_DIR in \
-     n|no|NO) false;; \
-@@ -427,7 +421,6 @@ GNUPGHOME = $(abs_builddir)
- TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) LC_ALL=C GPG_AGENT_INFO= \
-                     top_srcdir=$(top_srcdir) gpgme_json=$(GPGME_JSON)
- 
--c_tests = t-json
- CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
- 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
- 	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp \
-@@ -463,11 +456,8 @@ EXTRA_DIST = initial.test final.test \
- BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
-            gpg-sample.stamp
- 
--t_json_SOURCES = t-json.c
- AM_LDFLAGS = -no-install
- LDADD = ../../src/libgpgme.la @LDADD_FOR_TESTS_KLUDGE@
--t_json_LDADD = ../../src/cJSON.o -lm ../../src/libgpgme.la @GPG_ERROR_LIBS@ \
--	       @LDADD_FOR_TESTS_KLUDGE@
- 
- AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
- all: $(BUILT_SOURCES)
-@@ -514,18 +504,12 @@ clean-noinstPROGRAMS:
- 	echo " rm -f" $$list; \
- 	rm -f $$list
- 
--t-json$(EXEEXT): $(t_json_OBJECTS) $(t_json_DEPENDENCIES) $(EXTRA_t_json_DEPENDENCIES) 
--	@rm -f t-json$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(t_json_OBJECTS) $(t_json_LDADD) $(LIBS)
--
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-json.Po@am__quote@
--
- .c.o:
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po