kwallet: bump version

This commit is contained in:
Gerasim Troeglazov
2024-03-01 23:42:47 +10:00
parent f37d3c0beb
commit 477f67a791
3 changed files with 57 additions and 30 deletions

View File

@@ -1,11 +1,11 @@
SUMMARY="The KWallet Framework"
DESCRIPTION="Safe desktop-wide storage for passwords."
HOMEPAGE="https://github.com/KDE/kwallet/"
COPYRIGHT="2010-2022 KDE Organisation"
HOMEPAGE="https://invent.kde.org/frameworks/kwallet/"
COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://github.com/KDE/kwallet/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="ce48bcabe295f0ad528d2af85f87362b741ced3f1359b3eda8c3e633aa921fcc"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwallet-${portVersion}.tar.xz"
CHECKSUM_SHA256="f2b3fc21c89440c9290703929a8bcb77461fa510fd060c33d64787c9e0eaef3d"
PATCHES="kwallet-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -21,6 +21,7 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libgcrypt$secondaryArchSuffix
lib:libgpgmepp$secondaryArchSuffix
lib:libKF5Auth$secondaryArchSuffix
lib:libKF5Codecs$secondaryArchSuffix
lib:libKF5ConfigCore$secondaryArchSuffix
@@ -34,11 +35,12 @@ REQUIRES="
lib:libKF5Service$secondaryArchSuffix
lib:libKF5WidgetsAddons$secondaryArchSuffix
lib:libKF5WindowSystem$secondaryArchSuffix
lib:libqca_qt5$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
"
PROVIDES_devel="
@@ -54,6 +56,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= $portVersion
devel:libgcrypt$secondaryArchSuffix
devel:libgpgmepp$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix == $portVersion
devel:libKF5Codecs$secondaryArchSuffix == $portVersion
devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
@@ -67,6 +70,7 @@ BUILD_REQUIRES="
devel:libKF5Service$secondaryArchSuffix == $portVersion
devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
devel:libqca_qt5$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5DBus$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
@@ -78,7 +82,7 @@ BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:python2
cmd:python3.10
"
PATCH()

View File

@@ -0,0 +1,47 @@
From cfdf70b988d1d9743118fefac481b341dd252626 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 15 Sep 2021 11:17:06 +0300
Subject: Fix build on Haiku
diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt
index 80a242f..c4bbbdd 100644
--- a/src/runtime/kwalletd/CMakeLists.txt
+++ b/src/runtime/kwalletd/CMakeLists.txt
@@ -131,6 +131,10 @@ endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kwalletd5.service
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+if (HAIKU)
+ target_link_libraries(kwalletd5 network)
+endif ()
+
target_link_libraries(kwalletd5
kwalletbackend5
KF5Wallet
--
2.43.2
From e0c6d415cd8c23eb57299d7a9de60eacb9cb980a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 22:49:23 +1000
Subject: Disable X11 for Haiku
diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp
index 4cadddf..b074a83 100644
--- a/src/runtime/kwalletd/kwalletd.cpp
+++ b/src/runtime/kwalletd/kwalletd.cpp
@@ -35,7 +35,7 @@
#include <kwalletentry.h>
#include <kwindowsystem.h>
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
#define HAVE_X11 1
#include <KX11Extras>
#else
--
2.43.2

View File

@@ -1,24 +0,0 @@
From 4f47167c92342ce7a01f91900e66decbf1758407 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 15 Sep 2021 11:17:06 +0300
Subject: Fix build on Haiku
diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt
index 72220e6..1d5451e 100644
--- a/src/runtime/kwalletd/CMakeLists.txt
+++ b/src/runtime/kwalletd/CMakeLists.txt
@@ -103,6 +103,10 @@ endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kwalletd5.service
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+if (HAIKU)
+ target_link_libraries(kwalletd5 network)
+endif ()
+
target_link_libraries(kwalletd5
kwalletbackend5
KF5Wallet
--
2.30.2