[PR PATCH] qtkeychain-qt6: update to 0.14.3.

[PR PATCH] qtkeychain-qt6: update to 0.14.3.

[tornaria]

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

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages qtkeychain
https://github.com/void-linux/void-packages/pull/50420

qtkeychain-qt6: update to 0.14.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 1ade99e392da56dbf278ab2c7169e83de7354c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 18 May 2024 16:33:14 -0300
Subject: [PATCH] qtkeychain-qt6: update to 0.14.3.

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

diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
index 66dfc6836ac346..188bc64188e4fb 100644
--- a/srcpkgs/qtkeychain-qt6/template
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -1,6 +1,6 @@
 # Template file for 'qtkeychain-qt6'
 pkgname=qtkeychain-qt6
-version=0.14.2
+version=0.14.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_WITH_QT6=ON
@@ -12,7 +12,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-2-Clause"
 homepage="https://github.com/frankosterfeld/qtkeychain"
 distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
-checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
+checksum=a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7
 
 post_patch() {
 	# ensure it's not used (see dedicated patch)

Re: qtkeychain-qt6: update to 0.14.3.

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/50420#issuecomment-2119135048

Comment:
Hi, here (https://github.com/void-linux/void-packages/blob/1ade99e392da56dbf278ab2c7169e83de7354c9c/srcpkgs/qtkeychain-qt6/template#L8) kwallet is qt5 version, it can be replaced with kf6-kwallet

Re: [PR PATCH] [Updated] qtkeychain-qt6: update to 0.14.3.

[tornaria]

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

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

https://github.com/tornaria/void-packages qtkeychain
https://github.com/void-linux/void-packages/pull/50420

qtkeychain-qt6: update to 0.14.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From cc1775f673e2859c94681b05877cfda82eadec11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 18 May 2024 16:33:14 -0300
Subject: [PATCH] qtkeychain-qt6: update to 0.14.3.

---
 .../patches/use-kwallet-dbus-def.patch            | 15 ---------------
 srcpkgs/qtkeychain-qt6/template                   | 11 +++--------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch

diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
deleted file mode 100644
index 44368a4d891902..00000000000000
--- a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use kwallet interface definition from the kwallet package,
-instead of using the out-of-date provided in qtkeychain package
-see https://github.com/frankosterfeld/qtkeychain/issues/172
-
---- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
-+++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
-@@ -169,7 +169,7 @@
- 
-     add_definitions(-DKEYCHAIN_DBUS=1)
-     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
--    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
-+    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
-     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
- endif()
- 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
index 66dfc6836ac346..93253da8f87e6a 100644
--- a/srcpkgs/qtkeychain-qt6/template
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -1,23 +1,18 @@
 # Template file for 'qtkeychain-qt6'
 pkgname=qtkeychain-qt6
-version=0.14.2
+version=0.14.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_WITH_QT6=ON
  -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
-hostmakedepends="qt6-base qt6-tools pkg-config kwallet"
+hostmakedepends="qt6-base qt6-tools pkg-config"
 makedepends="qt6-base-devel libsecret-devel"
 short_desc="Platform-independent Qt6 API for storing passwords securely"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-2-Clause"
 homepage="https://github.com/frankosterfeld/qtkeychain"
 distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
-checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
-
-post_patch() {
-	# ensure it's not used (see dedicated patch)
-	rm org.kde.KWallet.xml
-}
+checksum=a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7
 
 post_install() {
 	vlicense COPYING

Re: qtkeychain-qt6: update to 0.14.3.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/50420#issuecomment-2119377620

Comment:
> Hi, here (
> 
> https://github.com/void-linux/void-packages/blob/1ade99e392da56dbf278ab2c7169e83de7354c9c/srcpkgs/qtkeychain-qt6/template#L8
> ) kwallet is qt5 version, it can be replaced with kf6-kwallet

Thanks. In fact, kwallet is not needed to build anymore. See #46675 and https://github.com/frankosterfeld/qtkeychain/pull/215.

In principle, 0.14.2+ is supposed to work with kwallet 6 (see https://github.com/frankosterfeld/qtkeychain/blob/main/ChangeLog). But I only use it with gnome-keyring so I don't know.

Re: [PR PATCH] [Updated] qtkeychain-qt6: update to 0.14.3.

[tornaria]

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

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

https://github.com/tornaria/void-packages qtkeychain
https://github.com/void-linux/void-packages/pull/50420

qtkeychain-qt6: update to 0.14.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From e841eda7a6c926a8531b32edec557137cb4a6a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 18 May 2024 16:33:14 -0300
Subject: [PATCH] qtkeychain-qt6: update to 0.14.3.

---
 .../patches/use-kwallet-dbus-def.patch            | 15 ---------------
 srcpkgs/qtkeychain-qt6/template                   | 12 ++++--------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch

diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
deleted file mode 100644
index 44368a4d891902..00000000000000
--- a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use kwallet interface definition from the kwallet package,
-instead of using the out-of-date provided in qtkeychain package
-see https://github.com/frankosterfeld/qtkeychain/issues/172
-
---- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
-+++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
-@@ -169,7 +169,7 @@
- 
-     add_definitions(-DKEYCHAIN_DBUS=1)
-     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
--    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
-+    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
-     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
- endif()
- 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
index 66dfc6836ac346..8df8df2da81931 100644
--- a/srcpkgs/qtkeychain-qt6/template
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -1,23 +1,19 @@
 # Template file for 'qtkeychain-qt6'
 pkgname=qtkeychain-qt6
-version=0.14.2
+version=0.14.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_WITH_QT6=ON
  -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
-hostmakedepends="qt6-base qt6-tools pkg-config kwallet"
+hostmakedepends="qt6-base qt6-tools pkg-config"
 makedepends="qt6-base-devel libsecret-devel"
 short_desc="Platform-independent Qt6 API for storing passwords securely"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-2-Clause"
 homepage="https://github.com/frankosterfeld/qtkeychain"
+changelog="https://raw.githubusercontent.com/frankosterfeld/qtkeychain/main/ChangeLog"
 distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
-checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
-
-post_patch() {
-	# ensure it's not used (see dedicated patch)
-	rm org.kde.KWallet.xml
-}
+checksum=a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7
 
 post_install() {
 	vlicense COPYING

Re: [PR PATCH] [Merged]: qtkeychain-qt6: update to 0.14.3.

[sgn]

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

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

qtkeychain-qt6: update to 0.14.3.
https://github.com/void-linux/void-packages/pull/50420

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->