[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1023868: caja-seahorse: FTBFS against libgpgme-dev >= 1.18.0-2 [checking for gpgme-config... failed]



Package: caja-seahorse
Version: 1.18.5-1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)

Hello,

caja-seahorse FTBFS due to removal of gpgme-config. Since caja-seahorse
already requires pkgconfig you can simply use this for gpgme, too.

cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru caja-seahorse-1.18.5/debian/changelog caja-seahorse-1.18.5/debian/changelog
--- caja-seahorse-1.18.5/debian/changelog	2020-08-24 10:00:41.000000000 +0200
+++ caja-seahorse-1.18.5/debian/changelog	2022-11-11 18:45:09.000000000 +0100
@@ -1,3 +1,11 @@
+caja-seahorse (1.18.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * 1010_gpgme_pkgconfig.diff: Use pkgconfig to locate gpgme instead of
+    gpgme-config fixing FTBFS with libgpgme-dev >= 1.18.0-2.
+
+ -- Andreas Metzler <ametzler@debian.org>  Fri, 11 Nov 2022 18:45:09 +0100
+
 caja-seahorse (1.18.5-1) unstable; urgency=medium
 
   [ Simon Quigley ]
diff -Nru caja-seahorse-1.18.5/debian/patches/1010_gpgme_pkgconfig.diff caja-seahorse-1.18.5/debian/patches/1010_gpgme_pkgconfig.diff
--- caja-seahorse-1.18.5/debian/patches/1010_gpgme_pkgconfig.diff	1970-01-01 01:00:00.000000000 +0100
+++ caja-seahorse-1.18.5/debian/patches/1010_gpgme_pkgconfig.diff	2022-11-11 18:45:09.000000000 +0100
@@ -0,0 +1,54 @@
+Description: Use pkgconfig to locate gpgme instead of gpgme-config.
+Author: Andreas Metzler <ametzler@debian.org>
+Origin: vendor
+Last-Update: 2022-11-11
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,45 +85,11 @@
+ 	else
+ 		AC_MSG_ERROR([Appropriate version of GnuPG not found. Please install one of versions: $accepted_versions])
+ 	fi
+ fi
+ 
+-ok="no"
+-min_gpgme_version=1.0.0
+-AC_PATH_PROG(GPGME_CONFIG, gpgme-config, "failed")
+-if test $GPGME_CONFIG != "failed" ; then
+-	AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+-	req_major=`echo $min_gpgme_version | \
+-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+-	req_minor=`echo $min_gpgme_version | \
+-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+-	req_micro=`echo $min_gpgme_version | \
+-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+-	gpgme_config_version=`$GPGME_CONFIG --version`
+-	major=`echo $gpgme_config_version | \
+-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+-	minor=`echo $gpgme_config_version | \
+-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+-	micro=`echo $gpgme_config_version | \
+-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+-
+-	if test "$major" -eq "$req_major"; then
+-		if test "$minor" -ge "$req_minor"; then
+-			if test "$micro" -ge "$req_micro"; then
+-				ok="yes"
+-			fi
+-		fi
+-	fi
+-fi
+-
+-if test $ok = "yes"; then
+-	GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
+-	GPGME_LIBS=`$GPGME_CONFIG --libs`
+-	AC_MSG_RESULT(yes)
+-else
+-	AC_MSG_ERROR(GPGME $min_gpgme_version or later needed)
+-fi
++PKG_CHECK_MODULES([GPGME], [gpgme >= 1.0.0])
+ 
+ SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GPGME_CFLAGS"
+ SEAHORSE_LIBS="$SEAHORSE_LIBS $GPGME_LIBS"
+ 
+ # -----------------------------------------------------------------------------
diff -Nru caja-seahorse-1.18.5/debian/patches/series caja-seahorse-1.18.5/debian/patches/series
--- caja-seahorse-1.18.5/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ caja-seahorse-1.18.5/debian/patches/series	2022-11-11 18:43:29.000000000 +0100
@@ -0,0 +1 @@
+1010_gpgme_pkgconfig.diff

Reply to: