haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

KDE frameworks, bump to 6.19.0 part7 (#13113)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-10-28 13:21:06 +01:00
committed by GitHub
parent fc735bf6f4
commit ecfa8d3811
11 changed files with 257 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
kde-frameworks/krunner/krunner6-6.16.0.recipe → kde-frameworks/krunner/krunner6-6.19.0.recipe
View File

@@ -7,8 +7,9 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/krunner-${portVersion}.tar.xz"
CHECKSUM_SHA256="f311741131552d14875880707d70402028bfb000d0d96f8073464311fcab5dbc"
CHECKSUM_SHA256="d59ca1a7142529bdca28f539dc7b3784f975be68b36c69d0c3e6835966ec32ab"
SOURCE_DIR="krunner-$portVersion"
PATCHES="krunner6-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -27,6 +28,7 @@ REQUIRES="
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6ItemModels$secondaryArchSuffix
lib:libKF6WindowSystem$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
lib:libQt6DBus$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
@@ -40,18 +42,26 @@ REQUIRES_devel="
krunner6$secondaryArchSuffix == $portVersion base
"
ARCHITECTURES_doc="any"
PROVIDES_doc="
krunner6_doc = $portVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix == $portVersion
extra_cmake_modules$secondaryArchSuffix >= $portVersion
qt6_tools${secondaryArchSuffix}_devel
devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion
devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion
devel:libKF6I18n$secondaryArchSuffix == $libVersion
devel:libKF6ItemModels$secondaryArchSuffix == $libVersion
devel:libKF6ConfigCore$secondaryArchSuffix >= $libVersion
devel:libKF6CoreAddons$secondaryArchSuffix >= $libVersion
devel:libKF6I18n$secondaryArchSuffix >= $libVersion
devel:libKF6ItemModels$secondaryArchSuffix >= $libVersion
devel:libKF6WindowSystem$secondaryArchSuffix >= $libVersion
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
"
BUILD_PREREQUIRES="
kde_qdoc_common
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
@@ -68,22 +78,25 @@ TEST_REQUIRES="
BUILD()
{
export KDE_DOCS="`finddir B_SYSTEM_DATA_DIRECTORY`"/kde-qdoc-common
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_SKIP_RPATH=YES \
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
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
prepareInstalledDevelLib \
libKF6Runner
@@ -91,6 +104,9 @@ INSTALL()
packageEntries devel \
$developDir \
$libDir/cmake
packageEntries doc \
$documentationDir
}
TEST()

41
kde-frameworks/krunner/patches/krunner6-6.19.0.patchset Normal file
View File

@@ -0,0 +1,41 @@
From 08aee05e07a20c115be085e34d4a2bcf2b5ec234 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 13 Sep 2025 11:39:22 +0200
Subject: Disable KWaylandExtras
diff --git a/src/dbusrunner.cpp b/src/dbusrunner.cpp
index 84293ec..5c62150 100644
--- a/src/dbusrunner.cpp
+++ b/src/dbusrunner.cpp
@@ -17,7 +17,9 @@
#include <QIcon>
#include <set>
+#ifndef Q_OS_HAIKU
#include <KWaylandExtras>
+#endif
#include <KWindowSystem>
#include "dbusutils_p.h"
@@ -288,6 +290,9 @@ void DBusRunner::run(const KRunner::RunnerContext & /*context*/, const KRunner::
QDBusConnection::sessionBus().call(runMethod, QDBus::NoBlock);
};
+#ifdef Q_OS_HAIKU
+ run();
+#else
if (KWindowSystem::isPlatformWayland() && qGuiApp->focusWindow()) {
auto tokenFuture = KWaylandExtras::xdgActivationToken(qGuiApp->focusWindow(), {});
tokenFuture.then(this, [this, service, matchId, actionId, run](const QString &token) {
@@ -301,6 +306,7 @@ void DBusRunner::run(const KRunner::RunnerContext & /*context*/, const KRunner::
} else {
run();
}
+#endif
}
QImage DBusRunner::decodeImage(const RemoteImage &remoteImage)
--
2.51.0