Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3

[Justinizer <Justinizer@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]

There is an updated pull request by Justinizer against master on the void-packages repository

https://github.com/Justinizer/void-packages master
https://github.com/void-linux/void-packages/pull/29605

New package: kleopatra:20.12.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

-----------------

- [ ] I had an issue with pinentry-qt. I had to insert into `~/.gnupg/gpg-agent.conf` following line:
` pinentry-program /usr/bin/pinentry-qt `

Otherwise kleopatra will throw errors in generating keys. Maybe this can be solved somehow.
According to the packager-README.md of the source files kleopatra doesn't work with pinentry-curses. But VoidLinux is using pinentry-curses per default, so this has to be changed for kleopatra.

A patch file from https://github.com/void-linux/void-packages/pull/29605.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29605.patch --]
[-- Type: text/x-diff, Size: 12372 bytes --]

From 8ed5b30c727e8a027131dc5155d494627e4dafd0 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@JustinPC.fritz.box>
Date: Sat, 20 Mar 2021 04:59:23 +0100
Subject: [PATCH 01/12] New package: kleopatra:20.12.3

---
 srcpkgs/kleopatra/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/kleopatra/template

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
new file mode 100644
index 000000000000..f79c201778cd
--- /dev/null
+++ b/srcpkgs/kleopatra/template
@@ -0,0 +1,20 @@
+# Template file for 'kleopatra'
+pkgname=kleopatra
+version=20.12.3
+revision=1
+archs="x86_64"
+build_style=cmake
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="extra-cmake-modules kdoctools boost"
+makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
+depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
+short_desc="Certificate Manager and Unified Crypto GUI"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
+homepage="https://www.kde.org/applications/utilities/kleopatra/"
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
+checksum="bf30f99bc6abd44d512ca8c53a7e81af625db72547a33df5c581101d787feaa0"

From 65de2b7bcabf3fe87c57f0b1d2fa0f3f9213c72c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sat, 20 Mar 2021 16:15:24 +0100
Subject: [PATCH 02/12] Resolve the commits by Johnnynator

---
 srcpkgs/kleopatra/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index f79c201778cd..92cbfee5a352 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -2,14 +2,8 @@
 pkgname=kleopatra
 version=20.12.3
 revision=1
-archs="x86_64"
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="extra-cmake-modules kdoctools boost"
+hostmakedepends="extra-cmake-modules kdoctools"
 makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
 depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
 short_desc="Certificate Manager and Unified Crypto GUI"

From d09e302592cc1714ce64620f932bf4e9371bd342 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sat, 20 Mar 2021 18:03:09 +0100
Subject: [PATCH 03/12] add qt5-qmake as dependency

---
 srcpkgs/kleopatra/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 92cbfee5a352..26642d5b43d6 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -2,9 +2,10 @@
 pkgname=kleopatra
 version=20.12.3
 revision=1
+archs="x86_64,x86_64-musl,i686"
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools"
-makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
+makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel qt5-qmake"
 depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
 short_desc="Certificate Manager and Unified Crypto GUI"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"

From 1144706b6432b3eb500ccef6c2269ed2c085233d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sat, 20 Mar 2021 18:04:03 +0100
Subject: [PATCH 04/12] remove archs

---
 srcpkgs/kleopatra/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 26642d5b43d6..dfbc99989f4b 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -2,7 +2,6 @@
 pkgname=kleopatra
 version=20.12.3
 revision=1
-archs="x86_64,x86_64-musl,i686"
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools"
 makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel qt5-qmake"

From 586537431b5ef8e982bd2ba8247428825f2a3cb8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 07:20:14 +0100
Subject: [PATCH 05/12] Add qt5-qmake and qt5-host-tools to hostmakedepends.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index dfbc99989f4b..b92f9219bcd0 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -3,8 +3,8 @@ pkgname=kleopatra
 version=20.12.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kdoctools"
-makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel qt5-qmake"
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools"
+makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
 depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
 short_desc="Certificate Manager and Unified Crypto GUI"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"

From ccfa9bd5d1d5497669163a90db46c7390f5b5971 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 07:46:09 +0100
Subject: [PATCH 06/12] Add kcoreaddons to hostmakedepends.

---
 srcpkgs/kleopatra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index b92f9219bcd0..dd49bd1be8a3 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -3,7 +3,7 @@ pkgname=kleopatra
 version=20.12.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools"
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons"
 makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
 depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
 short_desc="Certificate Manager and Unified Crypto GUI"

From 357fe2d46724398899cf032d8a14b8cd4a7535fc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 10:38:59 +0100
Subject: [PATCH 07/12] move gettext to hostdepends

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index dd49bd1be8a3..aac7898688c3 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -3,8 +3,8 @@ pkgname=kleopatra
 version=20.12.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons"
-makedepends="kcmutils-devel AppStream gettext kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext"
+makedepends="kcmutils-devel AppStream kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
 depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
 short_desc="Certificate Manager and Unified Crypto GUI"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"

From a1ff13d844c0a2b7bcbb392c3506da9ae53a85b6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 10:47:03 +0100
Subject: [PATCH 08/12] add kconfig

---
 srcpkgs/kleopatra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index aac7898688c3..3204d172eac9 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -3,7 +3,7 @@ pkgname=kleopatra
 version=20.12.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
 makedepends="kcmutils-devel AppStream kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
 depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
 short_desc="Certificate Manager and Unified Crypto GUI"

From b6e1f4da89906a6bf4133a836a63e94b7e192318 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 11:15:18 +0100
Subject: [PATCH 09/12] add export offscreen

---
 srcpkgs/kleopatra/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 3204d172eac9..72c5f738f4e5 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -12,3 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
 checksum="bf30f99bc6abd44d512ca8c53a7e81af625db72547a33df5c581101d787feaa0"
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

From 4af96d19102f73b45900a2d0b1083e2645e9fc01 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:06:17 +0100
Subject: [PATCH 10/12] remove unnecessaries depends and rewrite pre_check to
 do_check

---
 srcpkgs/kleopatra/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 72c5f738f4e5..896eed60334e 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
 makedepends="kcmutils-devel AppStream kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
-depends="hicolor-icon-theme libkleo kcmutils kmime gnupg2 gnupg2-scdaemon pinentry-qt"
+depends="dbus gnupg2 gnupg2-scdaemon pinentry-qt"
 short_desc="Certificate Manager and Unified Crypto GUI"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
@@ -13,6 +13,7 @@ homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
 checksum="bf30f99bc6abd44d512ca8c53a7e81af625db72547a33df5c581101d787feaa0"
 
-pre_check() {
-	export QT_QPA_PLATFORM=offscreen
+do_check() {
+    QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ninja -C build test
 }

From 1be3a25ea328f1e38c6b4dd17354cdb03a78b0c2 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:09:56 +0100
Subject: [PATCH 11/12] use tabs

---
 srcpkgs/kleopatra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 896eed60334e..4fe7afc0f50b 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -15,5 +15,5 @@ checksum="bf30f99bc6abd44d512ca8c53a7e81af625db72547a33df5c581101d787feaa0"
 
 do_check() {
     QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
-		dbus-run-session ninja -C build test
+        dbus-run-session ninja -C build test
 }

From a75fee38d57c8714642c203ff92b41ecd9c9b585 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:12:59 +0100
Subject: [PATCH 12/12] change tab to spaces

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 4fe7afc0f50b..81150aab0555 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -14,6 +14,6 @@ distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.
 checksum="bf30f99bc6abd44d512ca8c53a7e81af625db72547a33df5c581101d787feaa0"
 
 do_check() {
-    QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
-        dbus-run-session ninja -C build test
+ QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+  dbus-run-session ninja -C build test
 }