Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: kleopatra:20.12.3
@ 2021-03-20  4:05 Justinizer
  2021-03-20  5:17 ` cinerea0
                   ` (43 more replies)
  0 siblings, 44 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20  4:05 UTC (permalink / raw)
  To: ml

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

There is a new 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

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: 1428 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] 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"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
@ 2021-03-20  5:17 ` cinerea0
  2021-03-20 14:30 ` [PR REVIEW] " Johnnynator
                   ` (42 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: cinerea0 @ 2021-03-20  5:17 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-803251887

Comment:
I'm going to ping @Johnnynator here because he's the guy who handles most of the KDE stuff.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
  2021-03-20  5:17 ` cinerea0
@ 2021-03-20 14:30 ` Johnnynator
  2021-03-20 14:30 ` Johnnynator
                   ` (41 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-03-20 14:30 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598118324

Comment:
`boost` looks wrong here

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
  2021-03-20  5:17 ` cinerea0
  2021-03-20 14:30 ` [PR REVIEW] " Johnnynator
@ 2021-03-20 14:30 ` Johnnynator
  2021-03-20 14:30 ` Johnnynator
                   ` (40 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-03-20 14:30 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598118391

Comment:
Remove these template comments

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (2 preceding siblings ...)
  2021-03-20 14:30 ` Johnnynator
@ 2021-03-20 14:30 ` Johnnynator
  2021-03-20 15:15 ` [PR PATCH] [Updated] " Justinizer
                   ` (39 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-03-20 14:30 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598118473

Comment:
There shouldn't be any inherent reason why `kleopatra` shouldn't work on any other arch.
So remove and either fix problem that might crop up or ask for help.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (3 preceding siblings ...)
  2021-03-20 14:30 ` Johnnynator
@ 2021-03-20 15:15 ` Justinizer
  2021-03-20 15:17 ` [PR REVIEW] " Justinizer
                   ` (38 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 15:15 UTC (permalink / raw)
  To: ml

[-- 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: 2491 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 1/2] 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 2/2] 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"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (4 preceding siblings ...)
  2021-03-20 15:15 ` [PR PATCH] [Updated] " Justinizer
@ 2021-03-20 15:17 ` Justinizer
  2021-03-20 15:29 ` Justinizer
                   ` (37 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 15:17 UTC (permalink / raw)
  To: ml

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

New review comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598123389

Comment:
Sorry, this is my first build on void linux. I just used to do some aur package for archlinux before. Thank you for your help! :-)

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (5 preceding siblings ...)
  2021-03-20 15:17 ` [PR REVIEW] " Justinizer
@ 2021-03-20 15:29 ` Justinizer
  2021-03-20 15:32 ` Justinizer
                   ` (36 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 15:29 UTC (permalink / raw)
  To: ml

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

New review comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598124716

Comment:
It seems to work on x86_64, x86_64-musl and i686 only. I will add this to archs and hope it is fine.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (6 preceding siblings ...)
  2021-03-20 15:29 ` Justinizer
@ 2021-03-20 15:32 ` Justinizer
  2021-03-20 15:32 ` ericonr
                   ` (35 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 15:32 UTC (permalink / raw)
  To: ml

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

New review comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598124716

Comment:
It seems to work on x86_64, x86_64-musl and i686 only. I will add this to archs and hope it is fine.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (7 preceding siblings ...)
  2021-03-20 15:32 ` Justinizer
@ 2021-03-20 15:32 ` ericonr
  2021-03-20 15:33 ` ericonr
                   ` (34 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-03-20 15:32 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598125037

Comment:
If it isn't working on ARM, it's likely due to something missing for a cross build, and not anything special about x86.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (8 preceding siblings ...)
  2021-03-20 15:32 ` ericonr
@ 2021-03-20 15:33 ` ericonr
  2021-03-20 15:34 ` Justinizer
                   ` (33 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-03-20 15:33 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598125078

Comment:
Remove the line entirely so we can see the errors that it spits out.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (9 preceding siblings ...)
  2021-03-20 15:33 ` ericonr
@ 2021-03-20 15:34 ` Justinizer
  2021-03-20 15:43 ` Justinizer
                   ` (32 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 15:34 UTC (permalink / raw)
  To: ml

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

New review comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598125160

Comment:
Sorry, i deleted my comment now because I did see it by myself. There is something wrong with qmake. Maybe I need to add as a dependency.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (10 preceding siblings ...)
  2021-03-20 15:34 ` Justinizer
@ 2021-03-20 15:43 ` Justinizer
  2021-03-20 16:13 ` Johnnynator
                   ` (31 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 15:43 UTC (permalink / raw)
  To: ml

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

New review comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598126140

Comment:
I did remove the line. 


^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (11 preceding siblings ...)
  2021-03-20 15:43 ` Justinizer
@ 2021-03-20 16:13 ` Johnnynator
  2021-03-20 17:03 ` [PR PATCH] [Updated] " Justinizer
                   ` (30 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-03-20 16:13 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598129553

Comment:
```
  "/usr/lib/qt5/bin/qmake"

  but this file does not exist.  Possible reasons include:
```
Yep, that message says that qmake is needed, which would be provided by `qt5-qmake`.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (12 preceding siblings ...)
  2021-03-20 16:13 ` Johnnynator
@ 2021-03-20 17:03 ` Justinizer
  2021-03-20 17:04 ` Justinizer
                   ` (29 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 17:03 UTC (permalink / raw)
  To: ml

[-- 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: 3548 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 1/3] 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 2/3] 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 3/3] 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>"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (13 preceding siblings ...)
  2021-03-20 17:03 ` [PR PATCH] [Updated] " Justinizer
@ 2021-03-20 17:04 ` Justinizer
  2021-03-20 17:36 ` [PR REVIEW] " Justinizer
                   ` (28 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 17:04 UTC (permalink / raw)
  To: ml

[-- 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: 4265 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 1/4] 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 2/4] 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 3/4] 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 4/4] 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"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (14 preceding siblings ...)
  2021-03-20 17:04 ` Justinizer
@ 2021-03-20 17:36 ` Justinizer
  2021-03-21  5:43 ` sgn
                   ` (27 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-20 17:36 UTC (permalink / raw)
  To: ml

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

New review comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598138526

Comment:
I did add qt5-qmake as a dependency ... But still won't work. Is there something messed up with qt5-qmake in armv7l ? 

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (15 preceding siblings ...)
  2021-03-20 17:36 ` [PR REVIEW] " Justinizer
@ 2021-03-21  5:43 ` sgn
  2021-03-21  6:20 ` [PR PATCH] [Updated] " Justinizer
                   ` (26 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2021-03-21  5:43 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598225225

Comment:
qt5-qmake and qt5-host-tools in hostmakedepends.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (16 preceding siblings ...)
  2021-03-21  5:43 ` sgn
@ 2021-03-21  6:20 ` Justinizer
  2021-03-21  6:46 ` Justinizer
                   ` (25 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21  6:20 UTC (permalink / raw)
  To: ml

[-- 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: 5388 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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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>"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (17 preceding siblings ...)
  2021-03-21  6:20 ` [PR PATCH] [Updated] " Justinizer
@ 2021-03-21  6:46 ` Justinizer
  2021-03-21  7:00 ` [PR REVIEW] " Justinizer
                   ` (24 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21  6:46 UTC (permalink / raw)
  To: ml

[-- 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: 6357 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 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (18 preceding siblings ...)
  2021-03-21  6:46 ` Justinizer
@ 2021-03-21  7:00 ` Justinizer
  2021-03-21  7:22 ` sgn
                   ` (23 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21  7:00 UTC (permalink / raw)
  To: ml

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

New review comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598232543

Comment:
`/usr/armv7l-linux-gnueabihf/usr/bin/msgfmt: /usr/armv7l-linux-gnueabihf/usr/bin/msgfmt: cannot execute binary file`
whatever

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (19 preceding siblings ...)
  2021-03-21  7:00 ` [PR REVIEW] " Justinizer
@ 2021-03-21  7:22 ` sgn
  2021-03-21  9:39 ` [PR PATCH] [Updated] " Justinizer
                   ` (22 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2021-03-21  7:22 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-803524963

Comment:
On 2021-03-21 00:00:26-0700, Justinizer ***@***.***> wrote:
> @Justinizer commented on this pull request.
> 
> 
> 
> > @@ -0,0 +1,20 @@
> +# Template file for 'kleopatra'
> +pkgname=kleopatra
> +version=20.12.3
> +revision=1
> +archs="x86_64"
> 
> `/usr/armv7l-linux-gnueabihf/usr/bin/msgfmt: /usr/armv7l-linux-gnueabihf/usr/bin/msgfmt: cannot execute binary file`
> whatever

Move gettext to hostmakedepends


^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (20 preceding siblings ...)
  2021-03-21  7:22 ` sgn
@ 2021-03-21  9:39 ` Justinizer
  2021-03-21  9:47 ` Justinizer
                   ` (21 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21  9:39 UTC (permalink / raw)
  To: ml

[-- 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: 7494 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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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>"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (21 preceding siblings ...)
  2021-03-21  9:39 ` [PR PATCH] [Updated] " Justinizer
@ 2021-03-21  9:47 ` Justinizer
  2021-03-21 10:00 ` Justinizer
                   ` (20 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21  9:47 UTC (permalink / raw)
  To: ml

[-- 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: 8467 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 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (22 preceding siblings ...)
  2021-03-21  9:47 ` Justinizer
@ 2021-03-21 10:00 ` Justinizer
  2021-03-21 10:04 ` sgn
                   ` (19 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 10:00 UTC (permalink / raw)
  To: ml

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

New comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-803546075

Comment:
Thank you for your help! 
Seems to work right now... The 3 errors are because there isn't a (virutal) display connected. I think this is normal for a GUI.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (23 preceding siblings ...)
  2021-03-21 10:00 ` Justinizer
@ 2021-03-21 10:04 ` sgn
  2021-03-21 10:05 ` sgn
                   ` (18 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2021-03-21 10:04 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-803546706

Comment:
` export QT_QPA_PLATFORM=offscreen`

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (24 preceding siblings ...)
  2021-03-21 10:04 ` sgn
@ 2021-03-21 10:05 ` sgn
  2021-03-21 10:15 ` [PR PATCH] [Updated] " Justinizer
                   ` (17 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2021-03-21 10:05 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-803546706

Comment:
` export QT_QPA_PLATFORM=offscreen`, and please squash all changes into one.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (25 preceding siblings ...)
  2021-03-21 10:05 ` sgn
@ 2021-03-21 10:15 ` Justinizer
  2021-03-21 11:40 ` [PR REVIEW] " Johnnynator
                   ` (16 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 10:15 UTC (permalink / raw)
  To: ml

[-- 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: 9282 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 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (26 preceding siblings ...)
  2021-03-21 10:15 ` [PR PATCH] [Updated] " Justinizer
@ 2021-03-21 11:40 ` Johnnynator
  2021-03-21 11:40 ` Johnnynator
                   ` (15 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-03-21 11:40 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598265365

Comment:
```suggestion
depends="gnupg2 gnupg2-scdaemon pinentry-qt"
```
Is the smartcard daemon actually a hard dependency? This sounds more like smth that users just should install if they use smartcards?

The Kde libs are auto detected by xbps-src, no need to manually specify them. (See `04-generate-runtime-deps` stage in the logs)
`hicolor-icon-theme` is also not a really required dependecy, you just need some icons, but xbps doesn't have the ability to express that.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (27 preceding siblings ...)
  2021-03-21 11:40 ` [PR REVIEW] " Johnnynator
@ 2021-03-21 11:40 ` Johnnynator
  2021-03-21 15:06 ` [PR PATCH] [Updated] " Justinizer
                   ` (14 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-03-21 11:40 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#discussion_r598265499

Comment:
```suggestion
	QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
		dbus-run-session ninja -C build test
```
move this to `do_check` instead of `pre_check`

Also you will probably need at least `gnupg2 dbus` in `checkdepends`

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (28 preceding siblings ...)
  2021-03-21 11:40 ` Johnnynator
@ 2021-03-21 15:06 ` Justinizer
  2021-03-21 15:10 ` Justinizer
                   ` (13 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 15:06 UTC (permalink / raw)
  To: ml

[-- 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: 10791 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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
 }

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (29 preceding siblings ...)
  2021-03-21 15:06 ` [PR PATCH] [Updated] " Justinizer
@ 2021-03-21 15:10 ` Justinizer
  2021-03-21 15:13 ` Justinizer
                   ` (12 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 15:10 UTC (permalink / raw)
  To: ml

[-- 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: 11503 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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
 }

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (30 preceding siblings ...)
  2021-03-21 15:10 ` Justinizer
@ 2021-03-21 15:13 ` Justinizer
  2021-03-21 15:26 ` Justinizer
                   ` (11 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 15:13 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (31 preceding siblings ...)
  2021-03-21 15:13 ` Justinizer
@ 2021-03-21 15:26 ` Justinizer
  2021-03-21 15:28 ` Justinizer
                   ` (10 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 15:26 UTC (permalink / raw)
  To: ml

[-- 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: 13237 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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
 }

From 178b0ff78141a50bb6501ed7412aab5127d9290b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:26:28 +0100
Subject: [PATCH 13/13] use tabsgit add .!

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 81150aab0555..4e790b72f411 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
+	export QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ninja -C build test
 }

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (32 preceding siblings ...)
  2021-03-21 15:26 ` Justinizer
@ 2021-03-21 15:28 ` Justinizer
  2021-03-21 15:39 ` Justinizer
                   ` (9 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 15:28 UTC (permalink / raw)
  To: ml

[-- 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: 14265 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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
 }

From 178b0ff78141a50bb6501ed7412aab5127d9290b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:26:28 +0100
Subject: [PATCH 13/14] use tabsgit add .!

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 81150aab0555..4e790b72f411 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
+	export QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ninja -C build test
 }

From 445d20fa701a240df879031f9f5ddb06cbcca802 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:28:10 +0100
Subject: [PATCH 14/14] use checkdepends for dbus and gnupg

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 4e790b72f411..96de5ab27c3d 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -5,7 +5,8 @@ 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="dbus gnupg2 gnupg2-scdaemon pinentry-qt"
+depends="gnupg2 gnupg2-scdaemon pinentry-qt"
+checkdepends="dbus gnupg2"
 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"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (33 preceding siblings ...)
  2021-03-21 15:28 ` Justinizer
@ 2021-03-21 15:39 ` Justinizer
  2021-03-21 15:55 ` Justinizer
                   ` (8 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 15:39 UTC (permalink / raw)
  To: ml

[-- 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: 15081 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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
 }

From 178b0ff78141a50bb6501ed7412aab5127d9290b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:26:28 +0100
Subject: [PATCH 13/15] use tabsgit add .!

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 81150aab0555..4e790b72f411 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
+	export QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ninja -C build test
 }

From 445d20fa701a240df879031f9f5ddb06cbcca802 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:28:10 +0100
Subject: [PATCH 14/15] use checkdepends for dbus and gnupg

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 4e790b72f411..96de5ab27c3d 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -5,7 +5,8 @@ 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="dbus gnupg2 gnupg2-scdaemon pinentry-qt"
+depends="gnupg2 gnupg2-scdaemon pinentry-qt"
+checkdepends="dbus gnupg2"
 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"

From 0af62997c24f25573dd24df5fd65bc189083bce5 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:39:29 +0100
Subject: [PATCH 15/15] Remove export

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

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

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (34 preceding siblings ...)
  2021-03-21 15:39 ` Justinizer
@ 2021-03-21 15:55 ` Justinizer
  2021-03-21 16:32 ` Justinizer
                   ` (7 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 15:55 UTC (permalink / raw)
  To: ml

[-- 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: 16732 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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
 }

From 178b0ff78141a50bb6501ed7412aab5127d9290b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:26:28 +0100
Subject: [PATCH 13/16] use tabsgit add .!

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 81150aab0555..4e790b72f411 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
+	export QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ninja -C build test
 }

From 445d20fa701a240df879031f9f5ddb06cbcca802 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:28:10 +0100
Subject: [PATCH 14/16] use checkdepends for dbus and gnupg

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

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 4e790b72f411..96de5ab27c3d 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -5,7 +5,8 @@ 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="dbus gnupg2 gnupg2-scdaemon pinentry-qt"
+depends="gnupg2 gnupg2-scdaemon pinentry-qt"
+checkdepends="dbus gnupg2"
 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"

From 0af62997c24f25573dd24df5fd65bc189083bce5 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:39:29 +0100
Subject: [PATCH 15/16] Remove export

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

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

From a918abe43afcb67bcccdc75f49b588a2dbe31f1f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 21 Mar 2021 16:54:45 +0100
Subject: [PATCH 16/16] add install.msg and short dependencies

---
 srcpkgs/kleopatra/INSTALL.msg | 11 +++++++++++
 srcpkgs/kleopatra/template    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kleopatra/INSTALL.msg

diff --git a/srcpkgs/kleopatra/INSTALL.msg b/srcpkgs/kleopatra/INSTALL.msg
new file mode 100644
index 000000000000..7e2a0f6c9eff
--- /dev/null
+++ b/srcpkgs/kleopatra/INSTALL.msg
@@ -0,0 +1,11 @@
+Kleopatra is using pinentry for entering passphrases.
+To avoid errors for key-generation, please install one of the following dependencies:
+
+	pinentry-qt (For QT - used by KDE desktops)
+	pinentry-gnome (Gnome)
+	pinentry-gtk2 (For GTK2 desktops)
+
+You have to set it as as default pinentry, for example:
+	echo "pinentry-program /usr/bin/pinentry-qt" > ~/.gnupg/gpg-agent.conf
+
+LogOut and LogIn your user again.
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index dfbd72384ca2..2fbe963f3bdc 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="gnupg2 gnupg2-scdaemon pinentry-qt"
+depends="gnupg2"
 checkdepends="dbus gnupg2"
 short_desc="Certificate Manager and Unified Crypto GUI"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (35 preceding siblings ...)
  2021-03-21 15:55 ` Justinizer
@ 2021-03-21 16:32 ` Justinizer
  2021-03-21 17:00 ` [PR PATCH] [Merged]: " Johnnynator
                   ` (6 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-21 16:32 UTC (permalink / raw)
  To: ml

[-- 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: 2123 bytes --]

From a8bf10612ba43f5c6f54ff5b82a3a544eb93175c 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] New package: kleopatra:20.12.3

---
 srcpkgs/kleopatra/INSTALL.msg | 11 +++++++++++
 srcpkgs/kleopatra/template    | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/kleopatra/INSTALL.msg
 create mode 100644 srcpkgs/kleopatra/template

diff --git a/srcpkgs/kleopatra/INSTALL.msg b/srcpkgs/kleopatra/INSTALL.msg
new file mode 100644
index 000000000000..7e2a0f6c9eff
--- /dev/null
+++ b/srcpkgs/kleopatra/INSTALL.msg
@@ -0,0 +1,11 @@
+Kleopatra is using pinentry for entering passphrases.
+To avoid errors for key-generation, please install one of the following dependencies:
+
+	pinentry-qt (For QT - used by KDE desktops)
+	pinentry-gnome (Gnome)
+	pinentry-gtk2 (For GTK2 desktops)
+
+You have to set it as as default pinentry, for example:
+	echo "pinentry-program /usr/bin/pinentry-qt" > ~/.gnupg/gpg-agent.conf
+
+LogOut and LogIn your user again.
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
new file mode 100644
index 000000000000..2fbe963f3bdc
--- /dev/null
+++ b/srcpkgs/kleopatra/template
@@ -0,0 +1,20 @@
+# Template file for 'kleopatra'
+pkgname=kleopatra
+version=20.12.3
+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="gnupg2"
+checkdepends="dbus gnupg2"
+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"
+
+do_check() {
+	QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ninja -C build test
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Merged]: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (36 preceding siblings ...)
  2021-03-21 16:32 ` Justinizer
@ 2021-03-21 17:00 ` Johnnynator
  2021-03-24  0:34 ` ericonr
                   ` (5 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-03-21 17:00 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

New package: kleopatra:20.12.3
https://github.com/void-linux/void-packages/pull/29605

Description:
<!-- 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
-->

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

- [x] 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.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (37 preceding siblings ...)
  2021-03-21 17:00 ` [PR PATCH] [Merged]: " Johnnynator
@ 2021-03-24  0:34 ` ericonr
  2021-03-24  5:19 ` Justinizer
                   ` (4 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-03-24  0:34 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-805379868

Comment:
Would be nice to remove the INSTALL.msg and move to README.voidlinux, since it isn't urgent information.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (38 preceding siblings ...)
  2021-03-24  0:34 ` ericonr
@ 2021-03-24  5:19 ` Justinizer
  2021-03-24  6:00 ` Justinizer
                   ` (3 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-24  5:19 UTC (permalink / raw)
  To: ml

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

New comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-805506701

Comment:
> Would be nice to remove the INSTALL.msg and move to README.voidlinux, since it isn't urgent information.

Hmm personally I think this are urgent informations, because passphrases are an essential part to genrate keys. You can't generate keys without using passphrases, you can't import keys with passphrases etc.... So kleopatra without this would be a dummy.
This is similar to the vulkan driver for steam... You can use steam without it but there is no sense because 90% of the games need vulkan driver...

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (39 preceding siblings ...)
  2021-03-24  5:19 ` Justinizer
@ 2021-03-24  6:00 ` Justinizer
  2021-03-24 11:42 ` ericonr
                   ` (2 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-24  6:00 UTC (permalink / raw)
  To: ml

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

New comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-805506701

Comment:
> Would be nice to remove the INSTALL.msg and move to README.voidlinux, since it isn't urgent information.

Hmm personally I think this are urgent informations, because passphrases are an essential part to genrate keys. You can't generate keys without using passphrases, you can't import keys with passphrases etc.... So kleopatra without this would be a dummy.
This is similar to the vulkan driver for steam... You can use steam without it but there is no sense because 90% of the games need vulkan driver...

Edit: But I can move it to README.voidlinux if you want. Is this shown after an installation?

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (40 preceding siblings ...)
  2021-03-24  6:00 ` Justinizer
@ 2021-03-24 11:42 ` ericonr
  2021-03-24 19:06 ` Justinizer
  2021-03-24 19:08 ` ericonr
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-03-24 11:42 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-805754124

Comment:
> Edit: But I can move it to README.voidlinux if you want. Is this shown after an installation?

It isn't. But INSTALL.msg should be used for things like "this openssh update requires a service restart", which other install.msg in the same transaction will make it harder to see. So putting things in a dedicated file helps.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (41 preceding siblings ...)
  2021-03-24 11:42 ` ericonr
@ 2021-03-24 19:06 ` Justinizer
  2021-03-24 19:08 ` ericonr
  43 siblings, 0 replies; 45+ messages in thread
From: Justinizer @ 2021-03-24 19:06 UTC (permalink / raw)
  To: ml

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

New comment by Justinizer on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-806081753

Comment:
Well I can't push here anymore, because it is merged.
But if you want to change it you are welcome to. :-)

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: New package: kleopatra:20.12.3
  2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
                   ` (42 preceding siblings ...)
  2021-03-24 19:06 ` Justinizer
@ 2021-03-24 19:08 ` ericonr
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-03-24 19:08 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29605#issuecomment-806082812

Comment:
@Justinizer just open a new PR ;)

^ permalink raw reply	[flat|nested] 45+ messages in thread

end of thread, other threads:[~2021-03-24 19:08 UTC | newest]

Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-20  4:05 [PR PATCH] New package: kleopatra:20.12.3 Justinizer
2021-03-20  5:17 ` cinerea0
2021-03-20 14:30 ` [PR REVIEW] " Johnnynator
2021-03-20 14:30 ` Johnnynator
2021-03-20 14:30 ` Johnnynator
2021-03-20 15:15 ` [PR PATCH] [Updated] " Justinizer
2021-03-20 15:17 ` [PR REVIEW] " Justinizer
2021-03-20 15:29 ` Justinizer
2021-03-20 15:32 ` Justinizer
2021-03-20 15:32 ` ericonr
2021-03-20 15:33 ` ericonr
2021-03-20 15:34 ` Justinizer
2021-03-20 15:43 ` Justinizer
2021-03-20 16:13 ` Johnnynator
2021-03-20 17:03 ` [PR PATCH] [Updated] " Justinizer
2021-03-20 17:04 ` Justinizer
2021-03-20 17:36 ` [PR REVIEW] " Justinizer
2021-03-21  5:43 ` sgn
2021-03-21  6:20 ` [PR PATCH] [Updated] " Justinizer
2021-03-21  6:46 ` Justinizer
2021-03-21  7:00 ` [PR REVIEW] " Justinizer
2021-03-21  7:22 ` sgn
2021-03-21  9:39 ` [PR PATCH] [Updated] " Justinizer
2021-03-21  9:47 ` Justinizer
2021-03-21 10:00 ` Justinizer
2021-03-21 10:04 ` sgn
2021-03-21 10:05 ` sgn
2021-03-21 10:15 ` [PR PATCH] [Updated] " Justinizer
2021-03-21 11:40 ` [PR REVIEW] " Johnnynator
2021-03-21 11:40 ` Johnnynator
2021-03-21 15:06 ` [PR PATCH] [Updated] " Justinizer
2021-03-21 15:10 ` Justinizer
2021-03-21 15:13 ` Justinizer
2021-03-21 15:26 ` Justinizer
2021-03-21 15:28 ` Justinizer
2021-03-21 15:39 ` Justinizer
2021-03-21 15:55 ` Justinizer
2021-03-21 16:32 ` Justinizer
2021-03-21 17:00 ` [PR PATCH] [Merged]: " Johnnynator
2021-03-24  0:34 ` ericonr
2021-03-24  5:19 ` Justinizer
2021-03-24  6:00 ` Justinizer
2021-03-24 11:42 ` ericonr
2021-03-24 19:06 ` Justinizer
2021-03-24 19:08 ` ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).