From 1938283e2c5c033b7b9beabd5a34b6c5b8da46aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sat, 2 May 2020 12:31:58 +0200
Subject: community/gpgme: disable t-json test

Fails due to an unfixed upstream bug.

Fixes #11473
---
 community/gpgme/APKBUILD                |  6 ++-
 community/gpgme/disable-json-test.patch | 72 +++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 community/gpgme/disable-json-test.patch

(limited to 'community')

diff --git a/community/gpgme/APKBUILD b/community/gpgme/APKBUILD
index 0e8b6a4439..27dd2724fd 100644
--- a/community/gpgme/APKBUILD
+++ b/community/gpgme/APKBUILD
@@ -11,7 +11,8 @@ 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"
+source="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$pkgver.tar.bz2
+	disable-json-test.patch"
 
 case "$CARCH" in
 mips*)	options="!check";;
@@ -63,4 +64,5 @@ qgpgme() {
 	mv "$pkgdir"/usr/lib/libqgpgme.so* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8  gpgme-1.13.1.tar.bz2"
+sha512sums="11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8  gpgme-1.13.1.tar.bz2
+3efd694a94ac8c3ddc64ccf8707f72dad2ae3f4e21eb183368d3766d1811c20c95b8784d4a96ef5c23a4a0764126041f74d8106f5e4d85763b4cbb35988ea404  disable-json-test.patch"
diff --git a/community/gpgme/disable-json-test.patch b/community/gpgme/disable-json-test.patch
new file mode 100644
index 0000000000..4c674255ae
--- /dev/null
+++ b/community/gpgme/disable-json-test.patch
@@ -0,0 +1,72 @@
+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
-- 
cgit v1.2.3