[PR PATCH] qtkeychain-qt5: remove obsoleted patch

[PR PATCH] qtkeychain-qt5: remove obsoleted patch

[rookiejet]

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

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

https://github.com/rookiejet/void-packages qtkeychain
https://github.com/void-linux/void-packages/pull/46675

qtkeychain-qt5: remove obsoleted patch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Patch is no longer required as it has been fixed in upstream: https://github.com/frankosterfeld/qtkeychain/pull/215.

cc: @yopito 

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

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

From 3fa6888e69c36fd668b6b934c246916c3560f130 Mon Sep 17 00:00:00 2001
From: Mazin Fadl <mazen@illumed.net>
Date: Fri, 13 Oct 2023 12:43:46 -0400
Subject: [PATCH] qtkeychain-qt5: remove obsoleted patch

---
 .../patches/use-kwallet-dbus-def.patch            | 15 ---------------
 srcpkgs/qtkeychain-qt5/template                   |  9 ++-------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch

diff --git a/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
deleted file mode 100644
index 44368a4d89190..0000000000000
--- a/srcpkgs/qtkeychain-qt5/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-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 597b712d92b94..dcf74761f90fa 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,9 +1,9 @@
 # Template file for 'qtkeychain-qt5'
 pkgname=qtkeychain-qt5
 version=0.14.1
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="pkg-config kwallet"
+hostmakedepends="pkg-config"
 makedepends="libsecret-devel qt5-tools-devel"
 short_desc="Platform-independent Qt5 API for storing passwords securely"
 maintainer="yopito <pierre.bourgin@free.fr>"
@@ -16,11 +16,6 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"
 fi
 
-post_patch() {
-	# ensure it's not used (see dedicated patch)
-	rm org.kde.KWallet.xml
-}
-
 post_install() {
 	vlicense COPYING
 	vdoc "${FILESDIR}/README.voidlinux"

Re: [PR PATCH] [Merged]: qtkeychain-qt5: remove obsoleted patch

[classabbyamp]

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

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

qtkeychain-qt5: remove obsoleted patch
https://github.com/void-linux/void-packages/pull/46675

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

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

<!--
#### 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
-->

Patch is no longer required as it has been fixed in upstream: https://github.com/frankosterfeld/qtkeychain/pull/215.

cc: @yopito