From c91c5df45125c0470f50f9c2f05de6c6b056f554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 19 Feb 2018 15:32:22 +0100 Subject: [PATCH] kwallet/gpgme: Use current oe-core version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should have been fixed long ago - my bad. Signed-off-by: Andreas Müller --- .../gpgme/0001-return-unknown-as-host.patch | 33 --- extends-oe-core/gpgme/gpgme.pc | 10 - extends-oe-core/gpgme/pkgconfig.patch | 279 ------------------ extends-oe-core/gpgme_%.bbappend | 6 + extends-oe-core/gpgme_1.6.0.bb | 46 --- recipes-kde/kf5/tier3/kwallet/kwallet.bb | 3 - 6 files changed, 6 insertions(+), 371 deletions(-) delete mode 100644 extends-oe-core/gpgme/0001-return-unknown-as-host.patch delete mode 100644 extends-oe-core/gpgme/gpgme.pc delete mode 100644 extends-oe-core/gpgme/pkgconfig.patch create mode 100644 extends-oe-core/gpgme_%.bbappend delete mode 100644 extends-oe-core/gpgme_1.6.0.bb diff --git a/extends-oe-core/gpgme/0001-return-unknown-as-host.patch b/extends-oe-core/gpgme/0001-return-unknown-as-host.patch deleted file mode 100644 index 7dabd981..00000000 --- a/extends-oe-core/gpgme/0001-return-unknown-as-host.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 84427b2fd68f6c56f3919fdddad63cf5b5541730 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 4 Dec 2014 13:31:15 +0100 -Subject: [PATCH] return unknown as host -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this is intended for native build which cannot know target host - -Upstream-Status: Inappropriate [cross build specific] - -Signed-off-by: Andreas Müller ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 92375e6..4564c05 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -989,7 +989,7 @@ AH_BOTTOM([ - # Substitution used for gpgme-config - GPGME_CONFIG_LIBS="-lgpgme" - GPGME_CONFIG_CFLAGS="" --GPGME_CONFIG_HOST="$host" -+GPGME_CONFIG_HOST="unknown" - AC_SUBST(GPGME_CONFIG_API_VERSION) - AC_SUBST(GPGME_CONFIG_LIBS) - AC_SUBST(GPGME_CONFIG_CFLAGS) --- -1.8.3.1 - diff --git a/extends-oe-core/gpgme/gpgme.pc b/extends-oe-core/gpgme/gpgme.pc deleted file mode 100644 index 30a4d56d..00000000 --- a/extends-oe-core/gpgme/gpgme.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: gpgme -Description: GNU Privacy Guard Made Easy -Version: 1.4.3 -Requires: -Libs: -L${libdir} -lgpgme -lassuan -lgpg-error -Cflags: -I${includedir} diff --git a/extends-oe-core/gpgme/pkgconfig.patch b/extends-oe-core/gpgme/pkgconfig.patch deleted file mode 100644 index e2f1f4ff..00000000 --- a/extends-oe-core/gpgme/pkgconfig.patch +++ /dev/null @@ -1,279 +0,0 @@ -Update gpgme to use pkgconfig instead of -config files since its -simpler and less error prone when cross compiling. - -Upstream-Status: Denied [Upstream not interested in pkg-config support] -RP 2015/4/17 - -diff --git a/configure.ac b/configure.ac -index 298a22b..c778b61 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -622,6 +622,7 @@ AC_CONFIG_FILES(Makefile src/Makefile - src/versioninfo.rc - src/gpgme.h) - AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) -+AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) - AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) - AC_OUTPUT - -diff --git a/src/Makefile.am b/src/Makefile.am -index 58922f9..40d0dca 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -20,11 +20,13 @@ - - # Note: moc_kdpipeiodevice should actually be a dependecy below. - EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ -- gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp -+ gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in - - bin_SCRIPTS = gpgme-config - m4datadir = $(datadir)/aclocal - m4data_DATA = gpgme.m4 -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc - nodist_include_HEADERS = gpgme.h - - bin_PROGRAMS = gpgme-tool -diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in -new file mode 100644 -index 0000000..980a48e ---- /dev/null -+++ b/src/gpgme-pthread.pc.in -@@ -0,0 +1,15 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+# API info -+api_version=@GPGME_CONFIG_API_VERSION@ -+host=@GPGME_CONFIG_HOST@ -+ -+Name: gpgme -+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (threaded version) -+Version: @VERSION@ -+Libs: -L${libdir} -lgpgme-pthread -lpthread -+Cflags: -I${includedir} -+Requires: libassuan gpg-error -diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 6c2be44..d8a75cb 100644 ---- a/src/gpgme.m4 -+++ b/src/gpgme.m4 -@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script - dnl is added to the gpg_config_script_warn variable. - dnl - AC_DEFUN([AM_PATH_GPGME], --[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl -+[ - tmp=ifelse([$1], ,1:0.4.2,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME], - min_gpgme_version="$tmp" - fi - -- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) -- ok=no -- if test "$GPGME_CONFIG" != "no" ; then -- 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/'` -- if test "$gpgme_version_major" -gt "$req_major"; then -- ok=yes -- else -- if test "$gpgme_version_major" -eq "$req_major"; then -- if test "$gpgme_version_minor" -gt "$req_minor"; then -- ok=yes -- else -- if test "$gpgme_version_minor" -eq "$req_minor"; then -- if test "$gpgme_version_micro" -ge "$req_micro"; then -- ok=yes -- fi -- fi -- fi -- fi -- fi -- fi -+ PKG_CHECK_MODULES(GPGME, [gpgme >= $min_gpgme_version], [ok=yes], [ok=no]) - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then -- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` -+ tmp=`$PKG_CONFIG --variable=api_version gpgme 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no -@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME], - fi - fi - if test $ok = yes; then -- GPGME_CFLAGS=`$GPGME_CONFIG --cflags` -- GPGME_LIBS=`$GPGME_CONFIG --libs` -- AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - _AM_PATH_GPGME_CONFIG_HOST_CHECK - else -- GPGME_CFLAGS="" -- GPGME_LIBS="" -- AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi -- AC_SUBST(GPGME_CFLAGS) -- AC_SUBST(GPGME_LIBS) - ]) - - dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, -@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS - dnl and GPGME_PTHREAD_LIBS. - dnl - AC_DEFUN([AM_PATH_GPGME_PTHREAD], --[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl -+[ - tmp=ifelse([$1], ,1:0.4.2,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], - min_gpgme_version="$tmp" - fi - -- AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) -- ok=no -- if test "$GPGME_CONFIG" != "no" ; then -- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then -- 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/'` -- if test "$gpgme_version_major" -gt "$req_major"; then -- ok=yes -- else -- if test "$gpgme_version_major" -eq "$req_major"; then -- if test "$gpgme_version_minor" -gt "$req_minor"; then -- ok=yes -- else -- if test "$gpgme_version_minor" -eq "$req_minor"; then -- if test "$gpgme_version_micro" -ge "$req_micro"; then -- ok=yes -- fi -- fi -- fi -- fi -- fi -- fi -- fi -+ PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then -- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` -+ tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no -@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], - fi - fi - if test $ok = yes; then -- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` -- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` -- AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - _AM_PATH_GPGME_CONFIG_HOST_CHECK - else -- GPGME_PTHREAD_CFLAGS="" -- GPGME_PTHREAD_LIBS="" -- AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi -- AC_SUBST(GPGME_PTHREAD_CFLAGS) -- AC_SUBST(GPGME_PTHREAD_LIBS) - ]) - - -@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], - min_gpgme_version="$tmp" - fi - -- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) -- ok=no -- if test "$GPGME_CONFIG" != "no" ; then -- 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/'` -- if test "$gpgme_version_major" -gt "$req_major"; then -- ok=yes -- else -- if test "$gpgme_version_major" -eq "$req_major"; then -- if test "$gpgme_version_minor" -gt "$req_minor"; then -- ok=yes -- else -- if test "$gpgme_version_minor" -eq "$req_minor"; then -- if test "$gpgme_version_micro" -ge "$req_micro"; then -- ok=yes -- fi -- fi -- fi -- fi -- fi -- fi -+ PKG_CHECK_MODULES(GPGME_GLIB, [gpgme >= $min_gpgme_version glib-2.0], [ok=yes], [ok=no]) - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then -- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` -+ tmp=`$PKG_CONFIG --variable=api_version gpgme 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no -@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], - fi - fi - if test $ok = yes; then -- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` -- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` -- AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - _AM_PATH_GPGME_CONFIG_HOST_CHECK - else -- GPGME_GLIB_CFLAGS="" -- GPGME_GLIB_LIBS="" -- AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi -- AC_SUBST(GPGME_GLIB_CFLAGS) -- AC_SUBST(GPGME_GLIB_LIBS) - ]) -diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -new file mode 100644 -index 0000000..b69539f ---- /dev/null -+++ b/src/gpgme.pc.in -@@ -0,0 +1,15 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+# API info -+api_version=@GPGME_CONFIG_API_VERSION@ -+host=@GPGME_CONFIG_HOST@ -+ -+Name: gpgme -+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program. -+Version: @VERSION@ -+Libs: -L${libdir} -lgpgme -+Cflags: -I${includedir} -+Requires: libassuan gpg-error -\ No newline at end of file diff --git a/extends-oe-core/gpgme_%.bbappend b/extends-oe-core/gpgme_%.bbappend new file mode 100644 index 00000000..d0d59000 --- /dev/null +++ b/extends-oe-core/gpgme_%.bbappend @@ -0,0 +1,6 @@ +inherit cmake_lib + +CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore" + +CMAKE_ALIGN_SYSROOT[1] = "Gpgmepp, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}" +CMAKE_ALIGN_SYSROOT[2] = "Gpgmepp, -S${libdir}, -s${OE_QMAKE_PATH_HOST_LIBS}/" diff --git a/extends-oe-core/gpgme_1.6.0.bb b/extends-oe-core/gpgme_1.6.0.bb deleted file mode 100644 index 92beaabe..00000000 --- a/extends-oe-core/gpgme_1.6.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "High-level GnuPG encryption/signing API" -DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" -HOMEPAGE = "http://www.gnupg.org/gpgme.html" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=5027eec93a996272a9a0a6a86cf35775 \ - file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \ - file://gpgme.pc \ - file://pkgconfig.patch \ - " - -SRC_URI_append_class-native = " file://0001-return-unknown-as-host.patch" - -SRC_URI[md5sum] = "60d730d22e8065fd5de309e8b98e304b" -SRC_URI[sha256sum] = "b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d" - -DEPENDS = "libgpg-error libassuan" - -inherit autotools texinfo pkgconfig - -PACKAGES =+ "${PN}-pthread" -FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*" -FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" - -CFLAGS_append_libc-musl = " -D__error_t_defined " -do_configure_prepend () { - # Else these could be used in preference to those in aclocal-copy - rm -f ${S}/m4/gpg-error.m4 - rm -f ${S}/m4/libassuan.m4 -} - -do_install_append () { - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/gpgme.pc ${D}${libdir}/pkgconfig/ -} - -do_install_append_class-native () { - sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${bindir}/gpgme-config -} - -BBCLASSEXTEND = "native" diff --git a/recipes-kde/kf5/tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb index 1cc07a4a..30666e78 100644 --- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb +++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb @@ -9,7 +9,6 @@ inherit kde-kf5 DEPENDS += " \ libgcrypt \ gpgme \ - gpgme-native \ kconfig \ kconfig-native \ kcoreaddons \ @@ -26,8 +25,6 @@ DEPENDS += " \ kauth-native \ " -# TBD: add KF5Gpgmepp with PACKAGECONFIG?? - PV = "${KF5_VERSION}" SRC_URI[md5sum] = "43173ebb19608ca56e3b1a1c737b3716" SRC_URI[sha256sum] = "b26abb94566441df1e87d950bc26960f2a0917c37b06b59bb9f3dd650da0bd06"