aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGonzalo TornarĂ­a <tornaria@cmat.edu.uy>2023-10-08 21:25:14 +0000
committerAndrew J. Hesford <ajh@sideband.org>2024-04-05 11:23:31 +0000
commit640fb9f6068e5532ede7749e0a816f584d11b1da (patch)
treeb755e07b34ae26e723f61b98b7acb7760ffef5ed
parent10b86b16681a8b9e079d43a3515417159f0a5d74 (diff)
downloadvoid-packages-640fb9f6068e5532ede7749e0a816f584d11b1da.tar
void-packages-640fb9f6068e5532ede7749e0a816f584d11b1da.tar.gz
void-packages-640fb9f6068e5532ede7749e0a816f584d11b1da.tar.bz2
void-packages-640fb9f6068e5532ede7749e0a816f584d11b1da.tar.lz
void-packages-640fb9f6068e5532ede7749e0a816f584d11b1da.tar.xz
void-packages-640fb9f6068e5532ede7749e0a816f584d11b1da.tar.zst
void-packages-640fb9f6068e5532ede7749e0a816f584d11b1da.zip
New package: qtkeychain-qt6-0.14.2
-rw-r--r--common/shlibs1
l---------srcpkgs/qtkeychain-qt6-devel1
-rw-r--r--srcpkgs/qtkeychain-qt6/files/README.voidlinux2
-rw-r--r--srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch14
-rw-r--r--srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch15
-rw-r--r--srcpkgs/qtkeychain-qt6/template36
6 files changed, 69 insertions, 0 deletions
diff --git a/common/shlibs b/common/shlibs
index 760a012b6bb..aa9b771de29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libfreshclam.so.2 clamav-0.103.1_2
libqca-qt5.so.2 qca-qt5-2.1.3_1
libqca-qt6.so.2 qca-qt6-2.3.8_1
libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
libphonon4qt5.so.4 phonon-qt5-4.8.3_1
libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
libphonon4qt6.so.4 phonon-4.12.0_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 00000000000..189f5693ff6
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6 \ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 00000000000..f3cdf6594ae
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 00000000000..8f24b3dd686
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt 2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt 2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+
+ include(FindPkgConfig)
+
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 00000000000..44368a4d891
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/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
+
+--- 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
new file mode 100644
index 00000000000..66dfc6836ac
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.2
+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"
+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
+}
+
+post_install() {
+ vlicense COPYING
+ vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/*.so
+ vmove usr/lib/qt6/mkspecs
+ }
+}