[pkg-gnupg-maint] Bug#953800: gpgme1.0: don't fail checky2106 on 32bit systems

[Gianfranco Costamagna]

Source: gpgme1.0
Version: 1.13.1-7
Severity: serious
Justification: test failure on release architecture
Tags: patch


Hello, looks like checky2106 is obviously failing on 32bit architectures. I suggest to just ignore
the test results on that architectures.

Patch:

diff -Nru gpgme1.0-1.13.1/debian/changelog gpgme1.0-1.13.1/debian/changelog
--- gpgme1.0-1.13.1/debian/changelog	2020-03-09 20:24:25.000000000 +0000
+++ gpgme1.0-1.13.1/debian/changelog	2020-03-12 16:52:51.000000000 +0000
@@ -1,3 +1,9 @@
+gpgme1.0 (1.13.1-7ubuntu2) focal; urgency=medium
+
+  * Don't fail a test that is supposed to fail on 32bit systems
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 12 Mar 2020 17:52:51 +0100
+
 gpgme1.0 (1.13.1-7ubuntu1) focal; urgency=medium
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru gpgme1.0-1.13.1/debian/tests/checky2106 gpgme1.0-1.13.1/debian/tests/checky2106
--- gpgme1.0-1.13.1/debian/tests/checky2106	2020-01-28 16:42:41.000000000 +0000
+++ gpgme1.0-1.13.1/debian/tests/checky2106	2020-03-12 16:52:50.000000000 +0000
@@ -1,4 +1,5 @@
 #!/bin/bash
+if [ "`dpkg-architecture -qDEB_HOST_ARCH_BITS`" != 32 ]; then
 set -e
 workdir=$(mktemp -d)
 cleanup() {
@@ -23,3 +24,7 @@
 " "$sz" "$limit"
     exit 1
 fi
+else
+    echo "this test will obviously fail on 32bit systems"
+    exit 0
+fi


also, taking this patch would be so appreciated.

+gpgme1.0 (1.13.1-7ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/0006-PIC-and-shared.patch: Libs are -fPIC and -shared.
+    - Add in libgpgme-dev a libgpgme-pthread.so pointing to libgpgme.so, this
+      will fix the build failures of kf5-kdepim-apps-libs when built against
+      this gpgme package.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 09 Mar 2020 21:24:25 +0100


diff -pruN 1.13.1-7/debian/libgpgme-dev.links 1.13.1-7ubuntu2/debian/libgpgme-dev.links
--- 1.13.1-7/debian/libgpgme-dev.links	1970-01-01 00:00:00.000000000 +0000
+++ 1.13.1-7ubuntu2/debian/libgpgme-dev.links	2017-02-18 21:22:02.000000000 +0000
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libgpgme.so usr/lib/${DEB_HOST_MULTIARCH}/libgpgme-pthread.so
diff -pruN 1.13.1-7/debian/patches/0006-PIC-and-shared.patch 1.13.1-7ubuntu2/debian/patches/0006-PIC-and-shared.patch
--- 1.13.1-7/debian/patches/0006-PIC-and-shared.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.13.1-7ubuntu2/debian/patches/0006-PIC-and-shared.patch	2017-05-12 07:22:23.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Use -fPIC instead of -fpic.
+Author: Adam Conrad <adconrad at ubuntu.com>
+Last-Update: 2017-05-12
+
+Index: gpgme1.0-1.8.0/m4/qt.m4
+===================================================================
+--- gpgme1.0-1.8.0.orig/m4/qt.m4
++++ gpgme1.0-1.8.0/m4/qt.m4
+@@ -24,8 +24,9 @@ AC_DEFUN([FIND_QT],
+                     [have_qt5test_libs="no"])
+ 
+   if ! test "$have_w32_system" = yes; then
++    GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -shared"
+     if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+-      GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fpic"
++      GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fPIC"
+     fi
+   fi
+   if test "$have_qt5_libs" = "yes"; then
diff -pruN 1.13.1-7/debian/patches/series 1.13.1-7ubuntu2/debian/patches/series
--- 1.13.1-7/debian/patches/series	2020-01-30 16:37:46.000000000 +0000
+++ 1.13.1-7ubuntu2/debian/patches/series	2020-02-14 00:43:13.000000000 +0000
@@ -5,3 +5,4 @@
 0005-tests-json-Bravo-key-does-not-have-secret-key-materi.patch
 0006-gpg-Send-with-keygrip-when-listing-keys.patch
 0007-use-FULL_PATH_NAMES-NO-for-reproducible-doxygen-docu.patch
+0006-PIC-and-shared.patch


(you can use pull-lp-source gpgme1.0 to pull the ubuntu patches!)

thanks

Gianfranco