user/kgpg: add patch to find gpgme. fixes #1003.

2 files changed, 74 insertions, 3 deletions

diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD
index cbf091aa6..b589824e9 100644
--- a/user/kgpg/APKBUILD
+++ b/user/kgpg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kgpg
 pkgver=22.04.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple interface for GnuPG, a powerful encryption utility"
 url="https://utils.kde.org/projects/kgpg/"
 arch="all"
@@ -15,7 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kcodecs-dev
 	ktextwidgets-dev kxmlgui-dev kwidgetsaddons-dev kwindowsystem-dev
 	akonadi-contacts-dev kcontacts-dev gpgme-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/release-service/$pkgver/src/kgpg-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kgpg-$pkgver.tar.xz
+	find-gpgme-with-pkg-config-first.patch
+	"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -40,4 +42,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4b707902d6b7777b053caa9aa9e8be7b22ab0abe9dc37a9d894b2836a3b574acb4e30ad8bf7e1ef69f55ea72f229e97b1512266d6ca93edfdd2b483c16cb8ed1  kgpg-22.04.2.tar.xz"
+sha512sums="4b707902d6b7777b053caa9aa9e8be7b22ab0abe9dc37a9d894b2836a3b574acb4e30ad8bf7e1ef69f55ea72f229e97b1512266d6ca93edfdd2b483c16cb8ed1  kgpg-22.04.2.tar.xz
+33de21b93ba60823203a05b948671a28f698aaf3ed74583286cff1437b516b68688d8651227e7520995532785774f3a79446cf9816b9b37b11ec253e2418efaa  find-gpgme-with-pkg-config-first.patch"
diff --git a/user/kgpg/find-gpgme-with-pkg-config-first.patch b/user/kgpg/find-gpgme-with-pkg-config-first.patch
new file mode 100644
index 000000000..0073f5731
--- /dev/null
+++ b/user/kgpg/find-gpgme-with-pkg-config-first.patch
@@ -0,0 +1,68 @@
+From 7d6023e1a9d7899f618b1490f2907eff8efe48a5 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <kde@opensource.sf-tec.de>
+Date: Thu, 22 Dec 2022 16:19:07 +0100
+Subject: [PATCH] CMake: search for gpgme with pkg-config first
+
+FIXES: 461720
+---
+ cmake/FindGpgme.cmake | 29 ++++++++++++++---------------
+ 1 file changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/FindGpgme.cmake b/cmake/FindGpgme.cmake
+index e3e177f2..81117a9b 100644
+--- a/cmake/FindGpgme.cmake
++++ b/cmake/FindGpgme.cmake
+@@ -27,6 +27,8 @@
+ # Any changes here likely apply there, too.
+ #
+ 
++find_package(PkgConfig)
++
+ #if this is built-in, please replace, if it isn't, export into a MacroToBool.cmake of it's own
+ macro( macro_bool_to_bool FOUND_VAR )
+   foreach( _current_VAR ${ARGN} )
+@@ -49,8 +51,14 @@ MACRO(MACRO_BOOL_TO_01 FOUND_VAR )
+    ENDFOREACH(_current_VAR)
+ ENDMACRO(MACRO_BOOL_TO_01)
+ 
++pkg_search_module(PC_GPGME gpgme)
+ 
+-if ( WIN32 )
++if (PC_GPGME_FOUND)
++  set(GPGME_INCLUDES ${PC_GPGME_INCLUDE_DIRS})
++  set(GPGME_LIBRARIES ${PC_GPGME_LINK_LIBRARIES})
++  set(GPGME_VERSION ${PC_GPGME_VERSION})
++  set(GPGME_LIBRARY_DIR ${PC_GPGME_LIBRARY_DIR})
++elseif ( WIN32 )
+ 
+   # On Windows, we don't have a gpgme-config script, so we need to
+   # look for the stuff ourselves:
+@@ -353,20 +361,11 @@ foreach(_currentFlavour vanilla glib qt pth pthread)
+    endif()
+ endforeach()
+ 
+-if ( NOT Gpgme_FIND_QUIETLY )
+-
+-  if ( GPGME_FOUND )
+-    message( STATUS "Usable gpgme flavors found: ${_gpgme_flavours}" )
+-  else()
+-    message( STATUS "No usable gpgme flavors found." )
+-  endif()
+-
+-endif()
+-
+-if ( Gpgme_FIND_REQUIRED AND NOT GPGME_FOUND )
+-  message( FATAL_ERROR "Did not find GPGME" )
+-endif()
+-
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Gpgme
++                                  REQUIRED_VARS GPGME_LIBRARIES
++                                  VERSION_VAR GPGME_VERSION
++                                  )
+ 
+ if ( WIN32 )
+   set( _gpgme_homepage "https://www.gpg4win.org" )
+-- 
+GitLab
+