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

konsole: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2022-05-11 18:17:14 +10:00
parent af5c8d8917
commit 4c1efa46a9
2 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kde-apps/konsole/konsole-21.08.2.recipe → kde-apps/konsole/konsole-22.04.0.recipe
View File

@@ -2,11 +2,11 @@ SUMMARY="KDE's Terminal Emulator"
DESCRIPTION="Konsole is a terminal to run a command shell. It provides a command \
line interface for directly controlling your computer."
HOMEPAGE="https://apps.kde.org/konsole"
COPYRIGHT="2010-2021 KDE Organisation"
COPYRIGHT="2010-2022 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="2f1284ac12c7f3c05351f0a6004f3504efb4c014ea36426ed1c017a49f7a17d2"
CHECKSUM_SHA256="bf9b69a0d86ae3c94f01132b9fa8361cee95ff72ddad0002f3b95ce42777dbf3"
SOURCE_DIR="konsole-$portVersion"
PATCHES="konsole-$portVersion.patchset"
ADDITIONAL_FILES="konsole.rdef.in"
@@ -20,6 +20,7 @@ PROVIDES="
cmd:konsole = $portVersion
cmd:konsoleprofile = $portVersion
lib:libkdeinit5_konsole$secondaryArchSuffix = $portVersion
lib:libkonsoleapp$secondaryArchSuffix = $portVersion
lib:libkonsoleprivate$secondaryArchSuffix = $portVersion
"
REQUIRES="
@@ -66,11 +67,12 @@ REQUIRES="
lib:libQt5Network$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.86
extra_cmake_modules$secondaryArchSuffix >= 5.93
devel:libkdeinit5_kded5$secondaryArchSuffix
devel:libkdeinit5_klauncher$secondaryArchSuffix
devel:libKF5Activities$secondaryArchSuffix
@@ -107,7 +109,8 @@ BUILD_REQUIRES="
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5WindowSystem$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix >= 5.15
devel:libQt5Core$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="

77
kde-apps/konsole/patches/konsole-21.08.2.patchset → kde-apps/konsole/patches/konsole-22.04.0.patchset
View File

@@ -1,4 +1,4 @@
From c37bf961226c314ceec4c55cd1ceb2cf29425c32 Mon Sep 17 00:00:00 2001
From f47d3934b21ecfa6276914b66b62f496d61acf7f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 17:12:25 +1000
Subject: Fix install knsrc files
@@ -15,10 +15,10 @@ index a3f8d2d..440db55 100644
-install( FILES konsole.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+install( FILES konsole.knsrc DESTINATION ${KDE_INSTALL_DATADIR}/knsrcfiles)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2f43fe..bffbb43 100644
index b4a569c..4752d9b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,6 +61,7 @@ set(konsole_LIBS
@@ -64,6 +64,7 @@ set(konsole_LIBS
KF5::DBusAddons
KF5::GlobalAccel
KF5::NewStuff
@@ -30,40 +30,40 @@ index a2f43fe..bffbb43 100644
2.30.2
From c9770015f6a128816890cd03d36dc0336d433221 Mon Sep 17 00:00:00 2001
From 7499aa75f4274c1ae8492af835cb1336b3386d54 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 17:12:47 +1000
Subject: Shell login
diff --git a/src/session/Session.cpp b/src/session/Session.cpp
index ba6dcf4..76a8cb9 100644
index 1d71ed5..77da3f3 100644
--- a/src/session/Session.cpp
+++ b/src/session/Session.cpp
@@ -489,7 +489,7 @@ void Session::run()
@@ -486,7 +486,7 @@ void Session::run()
}
// if no arguments are specified, fall back to program name
QStringList arguments = _arguments.join(QLatin1Char(' ')).isEmpty() ?
- QStringList() << exec :
+ QStringList() << exec << QStringLiteral("-login") :
_arguments;
- QStringList arguments = _arguments.join(QLatin1Char(' ')).isEmpty() ? QStringList() << exec : _arguments;
+ QStringList arguments = _arguments.join(QLatin1Char(' ')).isEmpty() ? QStringList() << exec << QStringLiteral("-login") : _arguments;
if (!_initialWorkingDir.isEmpty()) {
_shellProcess->setInitialWorkingDirectory(_initialWorkingDir);
--
2.30.2
From 619ec8246a7a18545d5d9dc451e08569e6613251 Mon Sep 17 00:00:00 2001
From 4be436af0615343adc7b85990ad00bcc6a324b15 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 17:13:01 +1000
Subject: Use xterm-color by default
diff --git a/src/Pty.cpp b/src/Pty.cpp
index 106f76a..fbe205b 100644
index fa0cb2d..0140c43 100644
--- a/src/Pty.cpp
+++ b/src/Pty.cpp
@@ -215,7 +215,7 @@ void Pty::addEnvironmentVariables(const QStringList &environmentVariables)
@@ -231,7 +231,7 @@ void Pty::addEnvironmentVariables(const QStringList &environmentVariables)
// extra safeguard to make sure $TERM is always set
if (!isTermEnvAdded) {
@@ -73,10 +73,10 @@ index 106f76a..fbe205b 100644
}
diff --git a/src/profile/Profile.cpp b/src/profile/Profile.cpp
index 7168f48..b6cb7a8 100644
index 1285357..e4fdcc7 100644
--- a/src/profile/Profile.cpp
+++ b/src/profile/Profile.cpp
@@ -164,7 +164,7 @@ void Profile::useFallback()
@@ -172,7 +172,7 @@ void Profile::useFallback()
// See Pty.cpp on why Arguments is populated
setProperty(Arguments, QStringList() << QString::fromUtf8(qgetenv("SHELL")));
setProperty(Icon, QStringLiteral("utilities-terminal"));
@@ -89,17 +89,17 @@ index 7168f48..b6cb7a8 100644
2.30.2
From 6cf33e19a0d2c7bb72250113cee1e76b7e4dd8df Mon Sep 17 00:00:00 2001
From af0bba0fbab15909a804efcaeaf6fbf97215c039 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 17:13:20 +1000
Subject: Change alt to control for Haiku
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 58b7dd1..a8d53f6 100644
index 0a18577..7977eb3 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -1197,12 +1197,19 @@ void Vt102Emulation::sendKeyEvent(QKeyEvent *event)
@@ -1851,11 +1851,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)
@@ -109,17 +109,44 @@ index 58b7dd1..a8d53f6 100644
const bool wantsAltModifier = ((entry.modifiers() & entry.modifierMask() & Qt::AltModifier) != 0U);
+#endif
const bool wantsMetaModifier = ((entry.modifiers() & entry.modifierMask() & Qt::MetaModifier) != 0U);
const bool wantsAnyModifier = ((entry.state() &
entry.stateMask() & KeyboardTranslator::AnyModifierState) != 0);
-
const bool wantsAnyModifier = ((entry.state() & entry.stateMask() & KeyboardTranslator::AnyModifierState) != 0);
+#ifdef Q_OS_HAIKU
+ if ( ((modifiers & Qt::ControlModifier) != 0U) && !(wantsControlModifier || wantsAnyModifier)
+ if (((modifiers & Qt::ControlModifier) != 0U) && !(wantsControlModifier || wantsAnyModifier) && !event->text().isEmpty()) {
+#else
if ( ((modifiers & Qt::AltModifier) != 0U) && !(wantsAltModifier || wantsAnyModifier)
if (((modifiers & Qt::AltModifier) != 0U) && !(wantsAltModifier || wantsAnyModifier) && !event->text().isEmpty()) {
+#endif
&& !event->text().isEmpty() )
{
textToSend.prepend("\033");
}
if (((modifiers & Qt::MetaModifier) != 0U) && !(wantsMetaModifier || wantsAnyModifier) && !event->text().isEmpty()) {
--
2.30.2
From 7e35d104bfdd28306cf4490666d1757db20b5ca9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 11 May 2022 18:12:54 +1000
Subject: Remove session warnings
diff --git a/src/session/Session.cpp b/src/session/Session.cpp
index 77da3f3..2af65b9 100644
--- a/src/session/Session.cpp
+++ b/src/session/Session.cpp
@@ -479,11 +479,13 @@ void Session::run()
}
// if a program was specified via setProgram(), but it couldn't be found (but a fallback was), print a warning
+#ifndef Q_OS_HAIKU
if (exec != checkProgram(_program)) {
terminalWarning(i18n("Could not find '%1', starting '%2' instead. Please check your profile settings.", _program, exec));
} else if (exec != checkProgram(exec)) {
terminalWarning(i18n("Could not find '%1', starting '%2' instead. Please check your profile settings.", exec, checkProgram(exec)));
}
+#endif
// if no arguments are specified, fall back to program name
QStringList arguments = _arguments.join(QLatin1Char(' ')).isEmpty() ? QStringList() << exec << QStringLiteral("-login") : _arguments;
--
2.30.2