From: yopito <yopito@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qtkeychain-qt5: update to 0.11.1
Date: Fri, 20 Nov 2020 23:08:47 +0100 [thread overview]
Message-ID: <20201120220847.puN7tEnIIGJz9NtvNxpon_Z8AeCIPKL1eo7b4zZdSqc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26497@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages qtkeychain.0111
https://github.com/void-linux/void-packages/pull/26497
qtkeychain-qt5: update to 0.11.1
* build is fine
* fix: detect and launch correctly gnome-keyring if available (deprecated libgnome-keyring uneeded)
* works with nextcloud client 3.0.2 for both GNOME keyring and kwallet5
A patch file from https://github.com/void-linux/void-packages/pull/26497.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtkeychain.0111-26497.patch --]
[-- Type: text/x-diff, Size: 3298 bytes --]
From ee1d66da9bf6327d2e18d485b1ce4bbdd12800bc Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Fri, 20 Nov 2020 23:08:28 +0100
Subject: [PATCH] qtkeychain-qt5: update to 0.11.1
closes #26275
---
srcpkgs/qtkeychain-qt5/INSTALL.msg | 2 +-
.../patches/use-kwallet-dbus-def.patch | 15 +++++++++++++++
srcpkgs/qtkeychain-qt5/template | 14 ++++++++++----
3 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
diff --git a/srcpkgs/qtkeychain-qt5/INSTALL.msg b/srcpkgs/qtkeychain-qt5/INSTALL.msg
index 87e12556a84..b358ca1a984 100644
--- a/srcpkgs/qtkeychain-qt5/INSTALL.msg
+++ b/srcpkgs/qtkeychain-qt5/INSTALL.msg
@@ -1,2 +1,2 @@
To actually use qtkeychain-qt5 you need to either have kwallet or
-libgnome-keyring installed.
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 00000000000..d97fcc7890b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+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
+
+--- CMakeLists.txt.ORIG 2020-09-08 15:13:16.000000000 +0200
++++ 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 9bac2f766d0..7abe507b208 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,22 +1,27 @@
# Template file for 'qtkeychain-qt5'
pkgname=qtkeychain-qt5
-version=0.9.1
-revision=2
+version=0.11.1
+revision=1
wrksrc="${pkgname%-*}-${version}"
build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config kwallet"
makedepends="libsecret-devel qt5-tools-devel"
short_desc="Platform-independent Qt5 API for storing passwords securely"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/frankosterfeld/qtkeychain"
distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum=9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e
+checksum=77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d
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
}
@@ -28,5 +33,6 @@ qtkeychain-qt5-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/*.so
+ vmove usr/lib/qt5/mkspecs
}
}
next prev parent reply other threads:[~2020-11-20 22:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 23:32 [PR PATCH] " yopito
2020-11-19 0:36 ` [PR PATCH] [Updated] " yopito
2020-11-19 0:45 ` yopito
2020-11-20 22:08 ` yopito [this message]
2020-11-20 22:10 ` yopito
2020-11-20 22:30 ` ericonr
2020-11-20 22:38 ` Duncaen
2020-11-20 22:38 ` Duncaen
2020-11-20 22:40 ` ericonr
2020-11-21 18:52 ` yopito
2020-11-21 18:55 ` [PR PATCH] [Updated] " yopito
2020-11-21 20:20 ` [PR PATCH] [Merged]: " ericonr
2020-11-21 20:20 ` ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201120220847.puN7tEnIIGJz9NtvNxpon_Z8AeCIPKL1eo7b4zZdSqc@z \
--to=yopito@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).