KDE frameworks, bump to 6.25.0 part3 (#13941)

This commit is contained in:
Schrijvers Luc
2026-04-14 08:49:11 +02:00
committed by GitHub
parent 69919ac963
commit ee1efee6bc
12 changed files with 54 additions and 51 deletions

View File

@@ -5,11 +5,11 @@ using the XBEL format.
The most common use for bookmarks is web browsers, but this can also be \
useful in any application where local files or URLs can be saved as bookmarks."
HOMEPAGE="https://invent.kde.org/frameworks/kbookmarks"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kbookmarks-${portVersion}.tar.xz"
CHECKSUM_SHA256="7a3d7fdbfe4c7787b1a1941ecbfa261fd44fa7bd4d8275672e0d22c2a3504390"
CHECKSUM_SHA256="5c4a8c1f8499f6ff1cdd035b56f6fe321244913b1894a8c6001c3acf082c5bd6"
SOURCE_DIR="kbookmarks-$portVersion"
ARCHITECTURES="all !x86_gcc2"

View File

@@ -3,11 +3,11 @@ DESCRIPTION="KConfigWidgets provides easy-to-use classes to create configuration
dialogs, as well as a set of widgets which uses KConfig \
to store their settings."
HOMEPAGE="https://invent.kde.org/frameworks/kconfigwidgets"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kconfigwidgets-${portVersion}.tar.xz"
CHECKSUM_SHA256="1d785b68307c054a6133b8e4e462b569f02ec7adb8aafe1b95f49531b9a87f7c"
CHECKSUM_SHA256="c45ee1f4b2ede987efc8deac48710d87d9d37bb8355f0d7e130d557dfb2029a2"
SOURCE_DIR="kconfigwidgets-$portVersion"
ARCHITECTURES="all !x86_gcc2"

View File

@@ -3,11 +3,11 @@ DESCRIPTION="KGlobalAccel allows you to have global accelerators that are \
independent of the focused window. Unlike regular shortcuts, the \
application\'s window does not need focus for them to be activated."
HOMEPAGE="https://invent.kde.org/frameworks/kglobalaccel"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kglobalaccel-${portVersion}.tar.xz"
CHECKSUM_SHA256="1bbe7502658319767c048039e8dac2bd17bc120422d8e58ef6f22ba63840ae49"
CHECKSUM_SHA256="81f9842f13db8e2d4384c0f02650cd076441d2fba9540820901fffe1d2f4897f"
SOURCE_DIR="kglobalaccel-$portVersion"
ARCHITECTURES="all !x86_gcc2"

View File

@@ -11,13 +11,13 @@ The framework can also be used to bridge a native protocol to a file-based inter
This makes the data accessible in all applications using the KDE file dialog or any \
other KIO enabled infrastructure."
HOMEPAGE="https://invent.kde.org/frameworks/kio"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kio-${portVersion}.tar.xz"
CHECKSUM_SHA256="2f0ea7af4ca227031f0f0341a232d186d40db001d5bb6287ef9fa4bca127ee3f"
CHECKSUM_SHA256="bf71b2227016df6566665cead6cb468726d7cc708059e812daee7ea54f405378"
SOURCE_DIR="kio-$portVersion"
PATCHES="kio-$portVersion.patchset"
PATCHES="kio6-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,11 +1,11 @@
From c0ac6de846282c134a2ca316a1a1511a49a7be2e Mon Sep 17 00:00:00 2001
From b43e42a34a7f5263dff495cf98fb303bb7ab0e94 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 17 May 2022 21:28:27 +1000
Subject: Add OpenWith handler for Haiku
diff --git a/src/gui/openurljob.cpp b/src/gui/openurljob.cpp
index 5a44c3d..dd1377f 100644
index 25a4093..015bd0e 100644
--- a/src/gui/openurljob.cpp
+++ b/src/gui/openurljob.cpp
@@ -165,7 +165,7 @@ void KIO::OpenUrlJob::start()
@@ -18,10 +18,10 @@ index 5a44c3d..dd1377f 100644
// For Windows and MacOS, the mimetypes handling is different, so use QDesktopServices
qtOpenUrl();
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index a88dfcf..3ce32a1 100644
index 1882f3a..ddc8100 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -138,6 +138,10 @@ if(ACL_FOUND)
@@ -137,6 +137,10 @@ if(ACL_FOUND)
target_link_libraries(KF6KIOWidgets PRIVATE ${ACL_LIBS})
endif()
@@ -101,17 +101,17 @@ index 0000000..9614b87
+ return false;
+}
--
2.51.0
2.52.0
From a3b31f0086b9f245acdf3022598070af962b504b Mon Sep 17 00:00:00 2001
From 18fa9e5716d9bc084c1f8230553bd4b937fe1874 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 23:14:26 +1000
Subject: Fix build
diff --git a/src/kioworkers/file/file_unix.cpp b/src/kioworkers/file/file_unix.cpp
index cd37a6b..dcd3b25 100644
index 554210b..ef34ede 100644
--- a/src/kioworkers/file/file_unix.cpp
+++ b/src/kioworkers/file/file_unix.cpp
@@ -63,6 +63,15 @@
@@ -131,10 +131,10 @@ index cd37a6b..dcd3b25 100644
/* 512 kB */
--
2.51.0
2.52.0
From 7d8f183c04044032de9063723f77fc7d6a2b34e0 Mon Sep 17 00:00:00 2001
From 6f82b72586fb207a3a96101923c39c36b9dc05ed Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 10 Mar 2024 15:28:06 +1000
Subject: Disable threads kio_file support for now. It's totally broken on
@@ -142,10 +142,10 @@ Subject: Disable threads kio_file support for now. It's totally broken on
diff --git a/src/core/worker.cpp b/src/core/worker.cpp
index 4f72eaf..3201891 100644
index 069e08c..68dfce3 100644
--- a/src/core/worker.cpp
+++ b/src/core/worker.cpp
@@ -429,7 +429,7 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro
@@ -372,7 +372,7 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro
const auto useThreads = []() {
return qgetenv("KIO_ENABLE_WORKER_THREADS") != "0";
};
@@ -155,5 +155,5 @@ index 4f72eaf..3201891 100644
// Threads have performance benefits, but degrade robustness
// (a worker crashing kills the app). So let's only enable the feature for kio_file, for now.
--
2.51.0
2.52.0

View File

@@ -6,11 +6,11 @@ user interfaces for different form-factors are supported and recommended for opt
experience). It extends the touch-friendly Qt Quick Controls 2 with larger application \
building blocks, following the design philosophy laid out in the KDE Human Interface Guidelines."
HOMEPAGE="https://invent.kde.org/frameworks/kirigami"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kirigami-${portVersion}.tar.xz"
CHECKSUM_SHA256="8c6685dde55f001cc621b38c61486d0e9e2ef7fb1d502ca5dd049112229ea7cc"
CHECKSUM_SHA256="da7f3b733557b19975bb6b122e05d2f4d9214a70a81e2bb6e71c65761a3c6b43"
SOURCE_DIR="kirigami-$portVersion"
ARCHITECTURES="all !x86_gcc2"
@@ -22,6 +22,7 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
kirigami6$secondaryArchSuffix = $portVersion
lib:libKirigami$secondaryArchSuffix = $libVersionCompat
lib:libKirigamiControls$secondaryArchSuffix = $libVersionCompat
lib:libKirigamiDelegates$secondaryArchSuffix = $libVersionCompat
lib:libKirigamiDialogs$secondaryArchSuffix = $libVersionCompat
lib:libKirigamiLayouts$secondaryArchSuffix = $libVersionCompat
@@ -48,6 +49,7 @@ REQUIRES="
PROVIDES_devel="
kirigami6${secondaryArchSuffix}_devel = $portVersion
devel:libKirigami$secondaryArchSuffix = $libVersionCompat
devel:libKirigamiControls$secondaryArchSuffix = $libVersionCompat
devel:libKirigamiDelegates$secondaryArchSuffix = $libVersionCompat
devel:libKirigamiDialogs$secondaryArchSuffix = $libVersionCompat
devel:libKirigamiLayouts$secondaryArchSuffix = $libVersionCompat
@@ -62,11 +64,11 @@ REQUIRES_devel="
kirigami6$secondaryArchSuffix == $portVersion base
"
#ARCHITECTURES_doc="any"
ARCHITECTURES_doc="any"
#PROVIDES_doc="
# kirigami6_doc = $portVersion
# "
PROVIDES_doc="
kirigami6_doc = $portVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -80,7 +82,7 @@ BUILD_REQUIRES="
devel:libQt6Svg$secondaryArchSuffix
"
BUILD_PREREQUIRES="
# kde_qdoc_common
kde_qdoc_common
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
@@ -104,19 +106,20 @@ BUILD()
-Wno-dev
make -C build $jobArgs
# cmake --build build --target prepare_docs
# cmake --build build --target generate_docs
# cmake --build build --target generate_qch
cmake --build build --target prepare_docs
cmake --build build --target generate_docs
cmake --build build --target generate_qch
}
INSTALL()
{
make -C build install
# cmake --build build --target install_html_docs
# cmake --build build --target install_qch_docs
cmake --build build --target install_qch_docs
prepareInstalledDevelLibs \
libKirigami \
libKirigamiControls \
libKirigamiDelegates \
libKirigamiDialogs \
libKirigamiLayouts \
@@ -131,8 +134,8 @@ INSTALL()
$developDir \
$libDir/cmake
# packageEntries doc \
# $documentationDir
packageEntries doc \
$documentationDir
}
TEST()

View File

@@ -1,11 +1,11 @@
SUMMARY="Widgets for showing progress of asynchronous jobs"
DESCRIPTION="KJobWIdgets provides widgets for showing progress of asynchronous jobs."
HOMEPAGE="https://invent.kde.org/frameworks/kjobwidgets"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kjobwidgets-${portVersion}.tar.xz"
CHECKSUM_SHA256="dbd4936d08990cd767496922aa10e8af98aeeeba1f9233a93701564e032eac75"
CHECKSUM_SHA256="756bdc0a1c89a8e732ea7299bd325c38b81604da76b4cf361ccfc8b40a6e781e"
SOURCE_DIR="kjobwidgets-$portVersion"
ARCHITECTURES="all !x86_gcc2"

View File

@@ -2,11 +2,11 @@ SUMMARY="Text editing widgets"
DESCRIPTION="KTextWidgets provides widgets for displaying and editing text. \
It supports rich text as well as plain text."
HOMEPAGE="https://invent.kde.org/frameworks/ktextwidgets"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/ktextwidgets-${portVersion}.tar.xz"
CHECKSUM_SHA256="d9fa49ee95cf03321d2b2d89bd6952734323b75a2d983b97702d14bce4809f16"
CHECKSUM_SHA256="adb35bb19fb27e89b999645f8f9d650d1de3e8ed9bb686120705fdcd1cb0f3de"
SOURCE_DIR="ktextwidgets-$portVersion"
ARCHITECTURES="all !x86_gcc2"

View File

@@ -1,11 +1,11 @@
SUMMARY="The KDE KWallet Framework"
DESCRIPTION="Safe desktop-wide storage for passwords."
HOMEPAGE="https://invent.kde.org/frameworks/kwallet"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwallet-${portVersion}.tar.xz"
CHECKSUM_SHA256="1de4a3f60b0c170d8d9d0476ed8e0cfdf37f6711bf4e507a8f7ec4268eadc4ad"
CHECKSUM_SHA256="6fe7c8f4c556db4861f0046dfe179c31e7891fb6ecdcfa33692d252bf23d3b11"
SOURCE_DIR="kwallet-$portVersion"
ARCHITECTURES="all !x86_gcc2"

View File

@@ -8,11 +8,11 @@ It provides the following features for application developers:
* Power Management
* Network Management"
HOMEPAGE="https://invent.kde.org/frameworks/solid"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/solid-${portVersion}.tar.xz"
CHECKSUM_SHA256="3ac9a98b201eede1ae0782b1a320a27557672be8d3c5c81bba446751793ca3cb"
CHECKSUM_SHA256="8177fa8f139b855856e171426c5f2adb96d727e62e6ec536675da11aa157b33e"
SOURCE_DIR="solid-$portVersion"
ARCHITECTURES="all !x86_gcc2"

View File

@@ -1,14 +1,14 @@
From 30bddcb33134ae376f6ae0da0cd477671f893093 Mon Sep 17 00:00:00 2001
From c8d914e3474c7b37c7faf61f6eb97b80ed6973f9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 2 Mar 2019 23:57:01 +1000
Subject: Add hunspell dictionary paths for Haiku
diff --git a/src/plugins/hunspell/hunspellclient.cpp b/src/plugins/hunspell/hunspellclient.cpp
index d685dc0..2f23789 100644
index 992e3c2..c6a0b7f 100644
--- a/src/plugins/hunspell/hunspellclient.cpp
+++ b/src/plugins/hunspell/hunspellclient.cpp
@@ -47,6 +47,9 @@ HunspellClient::HunspellClient(QObject *parent)
@@ -93,6 +93,9 @@ HunspellClient::HunspellClient(QObject *parent)
#ifdef Q_OS_WIN
maybeAddPath(QStringLiteral(SONNET_INSTALL_PREFIX "/bin/data/hunspell/"));
@@ -19,10 +19,10 @@ index d685dc0..2f23789 100644
maybeAddPath(QStringLiteral("/System/Library/Spelling"));
maybeAddPath(QStringLiteral("/usr/share/hunspell/"));
--
2.48.1
2.52.0
From b46f18fc38fd2c99ed666a5757492c40a824a625 Mon Sep 17 00:00:00 2001
From 25025be0fdae2664c9cd8cd7863503dfe26ba759 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 14 Dec 2020 16:14:26 +0300
Subject: Set en_US as default language
@@ -42,5 +42,5 @@ index b007f50..709a91b 100644
QStringList Settings::defaultPreferredLanguages()
--
2.48.1
2.52.0

View File

@@ -9,13 +9,13 @@ different algorithms.
The simplest way to use Sonnet in your application is to use the \
SpellCheckDecorator class on your QTextEdit."
HOMEPAGE="https://invent.kde.org/frameworks/sonnet"
COPYRIGHT="2010-2025 KDE Organisation"
COPYRIGHT="2010-2065 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/sonnet-${portVersion}.tar.xz"
CHECKSUM_SHA256="4b102a359c5da1796862dbc24fb395c1220847f0584fa7a974ec118d644acfa0"
CHECKSUM_SHA256="510521f1404914943b3141e0b111f2330bbeefdf40405f93c0cf7b84a8c1c589"
SOURCE_DIR="sonnet-$portVersion"
PATCHES="sonnet-$portVersion.patchset"
PATCHES="sonnet6-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"