qtkeychain, bump versions for Qt5/Qt6 to 0.15.0 (#12059)

dev-libs/qtkeychain-qt6/patches/258.patch

@@ -1,25 +0,0 @@
-From 2de524ebbb2fb41a0650e9fd574ab7f6f10f30be Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Fri, 15 Nov 2024 17:17:14 -0500
-Subject: [PATCH] Fix read password job on Haiku
-
-There seems to be a breaking change in how QString::fromUtf8 works in Qt6, and this affects QtKeychain handling on Haiku. If we use QByteArray with an explicit size, it messes with the null termination handling and the application is given a QString with a null terminator, which fails.
-
-But this actually isn't needed at all, letting QByteArray figure out where the password data ends is good enough and lets Qt6 applications work again on Haiku.
----
- qtkeychain/keychain_haiku.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtkeychain/keychain_haiku.cpp b/qtkeychain/keychain_haiku.cpp
-index 16abe1c..153ebe7 100644
---- a/keychain_haiku.cpp
-+++ b/keychain_haiku.cpp
-@@ -86,7 +86,7 @@ void ReadPasswordJobPrivate::scheduledStart()
-                                       q->key().toUtf8().constData(),
-                                       false, password);
- 
--    data = QByteArray(reinterpret_cast<const char*>(password.Data()), password.DataLength());
-+    data = QByteArray(reinterpret_cast<const char*>(password.Data()));
- 
-     switch ( result ) {
-     case B_OK:

dev-libs/qtkeychain-qt6/qtkeychain_qt6-0.15.0.recipe

@@ -5,12 +5,11 @@ How the data is stored depends on the platform."
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
 COPYRIGHT="2011-2016 Frank Osterfeld, Mathias Hasselmann"
 LICENSE="BSD (2-clause)" #XXX: modified
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7"
+CHECKSUM_SHA256="f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22"
 SOURCE_FILENAME="qtkeychain-$portVersion.tar.gz"
 SOURCE_DIR="qtkeychain-$portVersion"
-PATCHES="258.patch"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -19,7 +18,7 @@ libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	qtkeychain_qt6${secondaryArchSuffix} = $portVersion
+	qtkeychain_qt6$secondaryArchSuffix = $portVersion
 	lib:libqt6keychain$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="

dev-libs/qtkeychain/qtkeychain-0.15.0.recipe

@@ -5,11 +5,10 @@ How the data is stored depends on the platform."
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
 COPYRIGHT="2011-2016 Frank Osterfeld, Mathias Hasselmann"
 LICENSE="BSD (2-clause)" #XXX: modified
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c"
+CHECKSUM_SHA256="f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22"
 SOURCE_FILENAME="qtkeychain-$portVersion.tar.gz"
-SOURCE_DIR="qtkeychain-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"