diff --git a/kde-apps/konsole/konsole_kf6-24.12.3.recipe b/kde-apps/konsole/konsole_kf6-25.04.0.recipe similarity index 98% rename from kde-apps/konsole/konsole_kf6-24.12.3.recipe rename to kde-apps/konsole/konsole_kf6-25.04.0.recipe index 480a8f0af..915554f14 100644 --- a/kde-apps/konsole/konsole_kf6-24.12.3.recipe +++ b/kde-apps/konsole/konsole_kf6-25.04.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/konsole-$portVersion.tar.xz" -CHECKSUM_SHA256="fe7c25e0dbf93c2d2a36988f479cd3202d8c8c58656395ce13e248c591c10241" +CHECKSUM_SHA256="d326dba57b17331e5030ed6babdea1d33876bc011f9c9faa029f965ae73a79d1" SOURCE_DIR="konsole-$portVersion" PATCHES="konsole-$portVersion.patchset" ADDITIONAL_FILES="konsole.rdef.in" @@ -125,17 +125,17 @@ INSTALL() { make -C build install - local APP_SIGNATURE="application/x-vnd.kde-konsole" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.kde-konsole" sed \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ -e "s|@MAJOR@|$MAJOR|" \ -e "s|@MIDDLE@|$MIDDLE|" \ -e "s|@MINOR@|$MINOR|" \ -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ $portDir/additional-files/konsole.rdef.in > konsole.rdef addResourcesToBinaries konsole.rdef $binDir/konsole diff --git a/kde-apps/konsole/patches/konsole-24.12.3.patchset b/kde-apps/konsole/patches/konsole-25.04.0.patchset similarity index 92% rename from kde-apps/konsole/patches/konsole-24.12.3.patchset rename to kde-apps/konsole/patches/konsole-25.04.0.patchset index 42377b462..59cece04a 100644 --- a/kde-apps/konsole/patches/konsole-24.12.3.patchset +++ b/kde-apps/konsole/patches/konsole-25.04.0.patchset @@ -1,11 +1,11 @@ -From 580cc997a87d88c617ec46123d65574ff0bbcf8c Mon Sep 17 00:00:00 2001 +From dac737809253edc12f460b576da54a416177ff03 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 3 Mar 2024 22:00:00 +1000 Subject: Fix for Haiku diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 00ac5b3..e3d11ea 100644 +index c8706b4..7e03f54 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -97,6 +97,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") @@ -33,10 +33,10 @@ index cc704fe..2996253 100644 } diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp -index 512c57e..ea929f1 100644 +index ae2197b..53a0b99 100644 --- a/src/Vt102Emulation.cpp +++ b/src/Vt102Emulation.cpp -@@ -2765,11 +2765,19 @@ void Vt102Emulation::sendKeyEvent(QKeyEvent *event) +@@ -2771,11 +2771,19 @@ void Vt102Emulation::sendKeyEvent(QKeyEvent *event) // Alt+[Character] results in Esc+[Character] being sent // (unless there is an entry defined for this particular combination // in the keyboard modifier) @@ -57,7 +57,7 @@ index 512c57e..ea929f1 100644 } if (((modifiers & Qt::MetaModifier) != 0U) && !(wantsMetaModifier || wantsAnyModifier) && !event->text().isEmpty()) { diff --git a/src/profile/Profile.cpp b/src/profile/Profile.cpp -index 9b24587..0434dc4 100644 +index ecafc65..55e5628 100644 --- a/src/profile/Profile.cpp +++ b/src/profile/Profile.cpp @@ -68,7 +68,7 @@ const std::vector Profile::DefaultProperties = { @@ -70,10 +70,10 @@ index 9b24587..0434dc4 100644 {LocalTabTitleFormat, "LocalTabTitleFormat", GENERAL_GROUP, QLatin1String("%d : %n")}, {LocalTabTitleFormat, "tabtitle", nullptr, QLatin1String("%d : %n")}, diff --git a/src/session/Session.cpp b/src/session/Session.cpp -index ce99977..672237f 100644 +index 1048b9c..0371e42 100644 --- a/src/session/Session.cpp +++ b/src/session/Session.cpp -@@ -522,14 +522,16 @@ void Session::run() +@@ -510,14 +510,16 @@ void Session::run() } // if a program was specified via setProgram(), but it couldn't be found (but a fallback was), print a warning @@ -95,17 +95,17 @@ index ce99977..672237f 100644 2.48.1 -From b1279ad499aa7053fbf1819772c42b1db680d889 Mon Sep 17 00:00:00 2001 +From 711bdaf02af54e609acc58bb1c0ffb99ff9d1f09 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 22 Dec 2024 16:59:00 +0100 Subject: Don't include the Desktop directory diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4b3e1a0..4f09f33 100644 +index f11e07c..498498e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -132,7 +132,9 @@ option(ENABLE_PLUGIN_SSHMANAGER "Build the SSHManager plugin" ON) +@@ -129,7 +129,9 @@ option(ENABLE_PLUGIN_SSHMANAGER "Build the SSHManager plugin" ON) option(ENABLE_PLUGIN_QUICKCOMMANDS "Build the Quick Commands plugin" ON) add_subdirectory( src ) @@ -120,7 +120,7 @@ index 4b3e1a0..4f09f33 100644 2.48.1 -From cb55a2fa7f8d52a9dec40a36121e3d724401cb59 Mon Sep 17 00:00:00 2001 +From 70ddc41ffb7281b0b9e880c36eabab991a26a2b6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 23 Dec 2024 13:38:58 +0100 Subject: Use Haiku's icon/color schemes