Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qtkeychain-qt5: update to 0.11.1 #26497

Merged
merged 1 commit into from
Nov 21, 2020
Merged

qtkeychain-qt5: update to 0.11.1 #26497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion srcpkgs/qtkeychain-qt5/INSTALL.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
To actually use qtkeychain-qt5 you need to either have kwallet or
libgnome-keyring installed.
gnome-keyring installed.
15 changes: 15 additions & 0 deletions srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()

16 changes: 11 additions & 5 deletions srcpkgs/qtkeychain-qt5/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>"
maintainer="yopito <pierre.bourgin@free.fr>"
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
}
Expand All @@ -28,5 +33,6 @@ qtkeychain-qt5-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/*.so
vmove usr/lib/qt5/mkspecs
}
}