haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-18 17:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

KDE_utilities, bump to 25.12.0 (#13471)

Browse Source 
bump kwrite to 25.08.3
This commit is contained in:
Schrijvers Luc
2025-12-23 08:00:33 +01:00
committed by GitHub
parent 541dbe3b90
commit 1b11687d48
11 changed files with 102 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kde-apps/filelight/filelight-25.08.0.recipe → kde-apps/filelight/filelight-25.12.0.recipe
View File

@@ -15,7 +15,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/filelight-$portVersion.tar.xz"
CHECKSUM_SHA256="6080649ed7621178a7aeff1d3070629caa3d91da4978bcc5b568c75bedf53185"
CHECKSUM_SHA256="355386cc10e88808eebf76fbc84094bc24b90d76afe28a9bda41b6b49381a5ab"
SOURCE_DIR="filelight-$portVersion"
PATCHES="filelight-$portVersion.patchset"
ADDITIONAL_FILES="filelight.rdef.in"
@@ -29,7 +29,8 @@ GLOBAL_WRITABLE_FILES="
PROVIDES="
filelight$secondaryArchSuffix = $portVersion
app:Filelight$secondaryArchSuffix = $portVersion
app:Filelight = $portVersion
cmd:filelight = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -107,12 +108,17 @@ TEST_REQUIRES="
qthaikuplugins
"
PATCH()
{
# reset Qt version
sed -e 's|6.9.0|6.7.2|' CMakeLists.txt
}
BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_TESTING=OFF \
-Wno-dev
@@ -126,7 +132,9 @@ INSTALL()
# cleanup
rm -rf $dataDir/{applications,icons,metainfo}
mkdir -p $prefix/bin
mv $appsDir/filelight $appsDir/Filelight
ln -s $appsDir/Filelight $prefix/bin/filelight
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"

79
kde-apps/filelight/patches/filelight-25.08.0.patchset
View File

@@ -1,79 +0,0 @@
From f37c504bd9991d32a55929482e99427cbbfaa0de Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 4 Mar 2024 22:51:23 +1000
Subject: Fix for Haiku
diff --git a/autotests/directoryIteratorTest.cpp b/autotests/directoryIteratorTest.cpp
index 20806cf..625e5ea 100644
--- a/autotests/directoryIteratorTest.cpp
+++ b/autotests/directoryIteratorTest.cpp
@@ -65,7 +65,7 @@ private Q_SLOTS:
QVERIFY(!file.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(file.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#elif defined(Q_OS_LINUX)
QCOMPARE(file.size, 16 * DEV_BSIZE);
@@ -90,7 +90,7 @@ private Q_SLOTS:
QVERIFY(!symlink.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(symlink.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#else
// We don't know the order, but one should be a duplicate
--
2.50.1
From 8006288a82a995d14d1ca75bb14b0c6f415305d5 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 16 Mar 2025 16:39:24 +0100
Subject: define S_BLKSIZE 512
diff --git a/src/posixWalker.cpp b/src/posixWalker.cpp
index 36f37a9..928e8a2 100644
--- a/src/posixWalker.cpp
+++ b/src/posixWalker.cpp
@@ -8,6 +8,10 @@
#include <sys/param.h>
#endif
+#ifndef S_BLKSIZE
+#define S_BLKSIZE 512
+#endif
+
static void outputError(const QByteArray &path)
{
/// show error message that stat or opendir may give
--
2.50.1
From 60644081cdb6df70a494c9ecefc393bf13d0c06a Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 17 Aug 2025 16:48:24 +0200
Subject: Reset Qt version
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b95c97..0fecedc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ project(Filelight VERSION ${FILELIGHT_VERSION})
set(PROJECT_VERSION ${RELEASE_SERVICE_VERSION})
set(KF_MIN_VERSION "6.5.0")
-set(QT_REQUIRED_VERSION "6.8.1")
+set(QT_REQUIRED_VERSION "6.7.0")
find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
--
2.50.1

31
kde-apps/filelight/patches/filelight-25.12.0.patchset Normal file
View File

@@ -0,0 +1,31 @@
From f37c504bd9991d32a55929482e99427cbbfaa0de Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 4 Mar 2024 22:51:23 +1000
Subject: Fix for Haiku
diff --git a/autotests/directoryIteratorTest.cpp b/autotests/directoryIteratorTest.cpp
index 20806cf..625e5ea 100644
--- a/autotests/directoryIteratorTest.cpp
+++ b/autotests/directoryIteratorTest.cpp
@@ -65,7 +65,7 @@ private Q_SLOTS:
QVERIFY(!file.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(file.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#elif defined(Q_OS_LINUX)
QCOMPARE(file.size, 16 * DEV_BSIZE);
@@ -90,7 +90,7 @@ private Q_SLOTS:
QVERIFY(!symlink.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(symlink.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#else
// We don't know the order, but one should be a duplicate
--
2.50.1

12
kde-apps/kapptemplate/kapptemplate-25.08.0.recipe → kde-apps/kapptemplate/kapptemplate-25.12.0.recipe
View File

@@ -15,7 +15,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kapptemplate-$portVersion.tar.xz"
CHECKSUM_SHA256="f423016414c486c0a8f7bb872633eb33980b3dfa927658887db68eafabb4002b"
CHECKSUM_SHA256="70d69a49c533d387180e8707b8751e50fb615bfb605231e193e9a23d9ebcbb7e"
SOURCE_DIR="kapptemplate-$portVersion"
ADDITIONAL_FILES="kapptemplate.rdef.in"
@@ -25,6 +25,7 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
kapptemplate$secondaryArchSuffix = $portVersion
app:KAppTemplate = $portVersion
cmd:kapptemplate = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -73,7 +74,6 @@ BUILD_REQUIRES="
devel:libKF6ConfigCore$secondaryArchSuffix
devel:libKF6ConfigWidgets$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6DocTools$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
devel:libKF6ItemViews$secondaryArchSuffix
@@ -99,6 +99,7 @@ BUILD_PREREQUIRES="
PATCH()
{
# disable docs generation
sed -e 's|DocTools||' -i CMakeLists.txt
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
# use Haiku's icon theme
@@ -110,7 +111,8 @@ BUILD()
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
@@ -123,7 +125,9 @@ INSTALL()
# cleanup
rm -rf $dataDir/{applications,metainfo}
mkdir -p $prefix/bin
mv $appsDir/kapptemplate $appsDir/KAppTemplate
ln -s $appsDir/KAppTemplate $prefix/bin/kapptemplate
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -146,5 +150,5 @@ INSTALL()
TEST()
{
make -C build test
ctest --test-dir build --output-on-failure
}

13
kde-apps/kbackup/kbackup-25.08.0.recipe → kde-apps/kbackup/kbackup-25.12.0.recipe
View File

@@ -13,7 +13,7 @@ COPYRIGHT="2006-2018 Martin Koller"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kbackup-$portVersion.tar.xz"
CHECKSUM_SHA256="7ffa564b62c860dd8127231ac50a8aba659a7515e1d4270d53caae817c57e4ee"
CHECKSUM_SHA256="91661c064a97bfffff4f19db1d4da4ea0793c684d1ac91321c581d300a314cd0"
SOURCE_DIR="kbackup-$portVersion"
ADDITIONAL_FILES="kbackup.rdef.in"
@@ -23,6 +23,7 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
kbackup$secondaryArchSuffix = $portVersion
app:KBackup = $portVersion
cmd:kbackup = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -110,12 +111,12 @@ BUILD_PREREQUIRES="
BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}
@@ -129,7 +130,9 @@ INSTALL()
rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
mkdir -p $prefix/bin
mv $appsDir/kbackup $appsDir/KBackup
ln -s $appsDir/KBackup $prefix/bin/kbackup
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"

30
kde-apps/kcalc/kcalc-25.08.0.recipe → kde-apps/kcalc/kcalc-25.12.0.recipe
View File

@@ -11,23 +11,17 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kcalc-$portVersion.tar.xz"
CHECKSUM_SHA256="449a0d8827c44735f34cdddbdca9c3e038b3debcc86c60a57bca3ed42512d5f9"
CHECKSUM_SHA256="43181368f6303050321722b63448a1154807d34013df997e0e8ac8b1d05d3f0c"
SOURCE_DIR="kcalc-$portVersion"
ADDITIONAL_FILES="kcalc.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
PROVIDES="
kcalc$secondaryArchSuffix = $portVersion
cmd:kcalc$commandSuffix = $portVersion
app:KCalc = $portVersion
cmd:kcalc = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -86,7 +80,6 @@ BUILD_REQUIRES="
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6Crash$secondaryArchSuffix
devel:libKF6DBusAddons$secondaryArchSuffix
devel:libKF6DocTools$secondaryArchSuffix
devel:libKF6GuiAddons$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
@@ -114,17 +107,16 @@ BUILD_PREREQUIRES="
PATCH()
{
# disable docs generation
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
# use Haiku's icon theme
sed -e 's,\ KIconTheme::initTheme();,\// KIconTheme::initTheme();,g' -i kcalc.cpp
}
BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DCMAKE_SKIP_RPATH=YES \
-Wno-dev
make -C build $jobArgs
@@ -137,6 +129,10 @@ INSTALL()
# cleanup
rm -rf $dataDir/{applications,metainfo}
mkdir -p $prefix/bin
mv $appsDir/kcalc $appsDir/KCalc
ln -s $appsDir/KCalc $prefix/bin/kcalc
local APP_SIGNATURE="application/x-vnd.kde-kcalc"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -150,6 +146,6 @@ INSTALL()
-e "s|@LONG_INFO@|$LONG_INFO|" \
$portDir/additional-files/kcalc.rdef.in > kcalc.rdef
addResourcesToBinaries kcalc.rdef $commandBinDir/kcalc
addAppDeskbarSymlink $commandBinDir/kcalc KCalc
addResourcesToBinaries kcalc.rdef $appsDir/KCalc
addAppDeskbarSymlink $appsDir/KCalc
}

7
kde-apps/kcharselect/kcharselect-25.08.0.recipe → kde-apps/kcharselect/kcharselect-25.12.0.recipe
View File

@@ -13,8 +13,9 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kcharselect-$portVersion.tar.xz"
CHECKSUM_SHA256="ec9f2be0e119b1c7bff3363d4d405a3fa58c9cddeab68e3cdfe1d0a7908d3ee5"
PATCHES="33.patch"
CHECKSUM_SHA256="cae7534c7830998b5485e57ec2b331c12b0df602213516c0bb8db682e34ff8d3"
PATCHES="kcharselect-$portVersion.patchset"
ADDITIONAL_FILES="kcharselect.rdef.in"
ARCHITECTURES="all !x86_gcc2"
@@ -87,7 +88,7 @@ BUILD()
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-Wno-dev
make -C build $jobArgs

94
kde-apps/kcharselect/patches/33.patch
View File

@@ -1,94 +0,0 @@
From 0f837224651968661ccd2518d02a77648c33d539 Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@vuorela.dk>
Date: Fri, 15 Aug 2025 10:06:04 +0000
Subject: [PATCH] Make KConfigWidgets and KIconThemes required
BUG: 506958
(cherry picked from commit 51d483c6945f1f6c50b39c4e062cd47efce9dfe1)
Co-authored-by: Nicolas Fella <nicolas.fella@gmx.de>
---
CMakeLists.txt | 17 +++++------------
kcharselectdia.cc | 5 -----
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e944561..c4e2502 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,8 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS
I18n
WidgetsAddons
XmlGui
+ ConfigWidgets
+ IconThemes
)
find_package(KF6DocTools ${KF_MIN_VERSION})
@@ -42,8 +44,6 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
"Tools to generate documentation"
TYPE OPTIONAL
)
-find_package(KF6ConfigWidgets ${KF_DEP_VERSION} QUIET)
-find_package(KF6IconThemes ${KF_DEP_VERSION} QUIET)
ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX KCHARSELECT VERSION_HEADER kcharselect_version.h)
@@ -77,18 +77,11 @@ target_link_libraries(kcharselect
KF6::I18n
KF6::WidgetsAddons
KF6::XmlGui
+ KF6::ConfigWidgets
+ KF6::IconThemes
+ KF6::BookmarksWidgets
)
-if(TARGET KF6::ConfigWidgets)
- target_link_libraries(kcharselect KF6::ConfigWidgets)
- target_compile_definitions(kcharselect PRIVATE WITH_CONFIGWIDGET_LIB)
-endif()
-if(TARGET KF6::IconThemes)
- target_link_libraries(kcharselect KF6::IconThemes)
-endif ()
-
-target_link_libraries(kcharselect KF6::BookmarksWidgets)
-
install(TARGETS kcharselect ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES org.kde.kcharselect.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/kcharselectdia.cc b/kcharselectdia.cc
index 3c4dedb..8c5edf6 100644
--- a/kcharselectdia.cc
+++ b/kcharselectdia.cc
@@ -25,12 +25,9 @@
#include <KStandardAction>
#include <KStandardShortcut>
#include <KToggleAction>
-
-#ifdef WITH_CONFIGWIDGET_LIB
#include <KActionMenu>
#include <KColorSchemeManager>
#include <KColorSchemeMenu>
-#endif
class KCharSelectBookmarkOwner : public KBookmarkOwner
{
@@ -172,13 +169,11 @@ KCharSelectDia::KCharSelectDia(QWidget *parent)
else
lined->setAlignment(Qt::AlignLeft);
-#if defined(WITH_CONFIGWIDGET_LIB)
// Load themes
KColorSchemeManager *manager = KColorSchemeManager::instance();
auto *colorSelectionMenu = KColorSchemeMenu::createMenu(manager, this);
colorSelectionMenu->menu()->setTitle(i18n("&Window Color Scheme"));
actionCollection()->addAction(QStringLiteral("colorscheme_menu"), colorSelectionMenu);
-#endif
QString filename = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kcharselect/bookmarks.xml"));
if (filename.isEmpty()) {
--
GitLab

26
kde-apps/kcharselect/patches/kcharselect-25.12.0.patchset Normal file
View File

@@ -0,0 +1,26 @@
From 0298d5d71977b11659e359195a3aedd8d4a16332 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Mon, 15 Dec 2025 11:35:46 +0100
Subject: Use system color_theme
diff --git a/kcharselectdia.cc b/kcharselectdia.cc
index 763a299..32fc4df 100644
--- a/kcharselectdia.cc
+++ b/kcharselectdia.cc
@@ -172,10 +172,12 @@ KCharSelectDia::KCharSelectDia(QWidget *parent)
lined->setAlignment(Qt::AlignLeft);
// Load themes
+#ifndef Q_OS_HAIKU
KColorSchemeManager *manager = KColorSchemeManager::instance();
auto *colorSelectionMenu = KColorSchemeMenu::createMenu(manager, this);
colorSelectionMenu->menu()->setTitle(i18n("&Window Color Scheme"));
actionCollection()->addAction(u"colorscheme_menu"_s, colorSelectionMenu);
+#endif
QString filename = QStandardPaths::locate(QStandardPaths::GenericDataLocation, u"kcharselect/bookmarks.xml"_s);
if (filename.isEmpty()) {
--
2.51.0

2
kde-base/kwrite/kwrite-25.08.0.recipe → kde-base/kwrite/kwrite-25.08.3.recipe
View File

@@ -53,7 +53,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kate-$portVersion.tar.xz"
CHECKSUM_SHA256="7fed779b76da86f687c9509c1c22b419b2a97d57c41e693d880664b6c20a2f37"
CHECKSUM_SHA256="c92eb8b5b81c9b5dc91b5c46d20b4f3ae0b7811114779fd8f92f153233fca90b"
SOURCE_DIR="kate-$portVersion"
PATCHES="kwrite-$portVersion.patchset"
ADDITIONAL_FILES="kwrite.rdef.in"

0
kde-base/kwrite/patches/kwrite-25.08.0.patchset → kde-base/kwrite/patches/kwrite-25.08.3.patchset
View File