-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qtkeychain-qt5: update to 0.11.1, adopt
closes #26275
- Loading branch information
Showing
3 changed files
with
27 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters