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

Konsole: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-11-01 17:15:54 +10:00
parent f6b4838e0e
commit a209cff62b
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kde-apps/konsole/konsole-20.12.0.recipe → kde-apps/konsole/konsole-21.08.2.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-2020 KDE Organisation"
COPYRIGHT="2010-2021 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="3"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/konsole-$portVersion.tar.xz"
CHECKSUM_SHA256="6d3ba8a4e5baeda3f8b380f122313de1421836892994f1ddf0e6872696598d59"
CHECKSUM_SHA256="2f1284ac12c7f3c05351f0a6004f3504efb4c014ea36426ed1c017a49f7a17d2"
SOURCE_DIR="konsole-$portVersion"
PATCHES="konsole-$portVersion.patchset"
ADDITIONAL_FILES="konsole.rdef.in"
@@ -70,7 +70,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.77
extra_cmake_modules$secondaryArchSuffix >= 5.86
devel:libkdeinit5_kded5$secondaryArchSuffix
devel:libkdeinit5_klauncher$secondaryArchSuffix
devel:libKF5Activities$secondaryArchSuffix
@@ -128,6 +128,7 @@ BUILD()
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$appsDir \
-DCMAKE_INSTALL_LIBDIR=$libDir \
-DCMAKE_INSTALL_DATADIR=$dataDir \

48
kde-apps/konsole/patches/konsole-20.12.0.patchset → kde-apps/konsole/patches/konsole-21.08.2.patchset
View File

@@ -1,21 +1,21 @@
From 86ac101c609ac9f4f6efcabbe461b003487fb641 Mon Sep 17 00:00:00 2001
From c37bf961226c314ceec4c55cd1ceb2cf29425c32 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 5 Jan 2021 13:51:47 +1000
Date: Mon, 1 Nov 2021 17:12:25 +1000
Subject: Fix install knsrc files
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index b364995..46d1214 100644
index a3f8d2d..440db55 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,4 +2,4 @@
add_subdirectory( color-schemes )
@@ -3,4 +3,4 @@ add_subdirectory( color-schemes )
add_subdirectory( keyboard-layouts )
add_subdirectory( layouts )
-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 c332e75..e2552eb 100644
index a2f43fe..bffbb43 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,6 +61,7 @@ set(konsole_LIBS
@@ -27,20 +27,20 @@ index c332e75..e2552eb 100644
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
--
2.30.0
2.30.2
From 3009ecfe7bf124d3fef32ac105d38ba55bdff0e0 Mon Sep 17 00:00:00 2001
From c9770015f6a128816890cd03d36dc0336d433221 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 6 Jan 2021 17:41:09 +1000
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 7325bae..0edfe87 100644
index ba6dcf4..76a8cb9 100644
--- a/src/session/Session.cpp
+++ b/src/session/Session.cpp
@@ -485,7 +485,7 @@ void Session::run()
@@ -489,7 +489,7 @@ void Session::run()
// if no arguments are specified, fall back to program name
QStringList arguments = _arguments.join(QLatin1Char(' ')).isEmpty() ?
@@ -50,20 +50,20 @@ index 7325bae..0edfe87 100644
if (!_initialWorkingDir.isEmpty()) {
--
2.30.0
2.30.2
From 29354b9a1dd6957bc3513aed7765f3cd35f17fee Mon Sep 17 00:00:00 2001
From 619ec8246a7a18545d5d9dc451e08569e6613251 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 6 Jan 2021 21:55:19 +1000
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 247976a..21779a4 100644
index 106f76a..fbe205b 100644
--- a/src/Pty.cpp
+++ b/src/Pty.cpp
@@ -229,7 +229,7 @@ void Pty::addEnvironmentVariables(const QStringList &environmentVariables)
@@ -215,7 +215,7 @@ void Pty::addEnvironmentVariables(const QStringList &environmentVariables)
// extra safeguard to make sure $TERM is always set
if (!isTermEnvAdded) {
@@ -73,10 +73,10 @@ index 247976a..21779a4 100644
}
diff --git a/src/profile/Profile.cpp b/src/profile/Profile.cpp
index d09d026..1c1b232 100644
index 7168f48..b6cb7a8 100644
--- a/src/profile/Profile.cpp
+++ b/src/profile/Profile.cpp
@@ -172,7 +172,7 @@ void Profile::useFallback()
@@ -164,7 +164,7 @@ void Profile::useFallback()
// See Pty.cpp on why Arguments is populated
setProperty(Arguments, QStringList() << QString::fromUtf8(qgetenv("SHELL")));
setProperty(Icon, QStringLiteral("utilities-terminal"));
@@ -86,20 +86,20 @@ index d09d026..1c1b232 100644
setProperty(RemoteTabTitleFormat, QStringLiteral("(%u) %H"));
setProperty(ShowTerminalSizeHint, true);
--
2.30.0
2.30.2
From aeeadd738f62f3c214d9c09ae8b3692da5bd6f31 Mon Sep 17 00:00:00 2001
From 6cf33e19a0d2c7bb72250113cee1e76b7e4dd8df Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 6 Jan 2021 21:56:14 +1000
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 f977115..18b9914 100644
index 58b7dd1..a8d53f6 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -1201,12 +1201,19 @@ void Vt102Emulation::sendKeyEvent(QKeyEvent *event)
@@ -1197,12 +1197,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)
@@ -121,5 +121,5 @@ index f977115..18b9914 100644
{
textToSend.prepend("\033");
--
2.30.0
2.30.2