kate, bump version, switch to KF6 (#11517)

This commit is contained in:
Schrijvers Luc
2024-12-23 15:21:42 +01:00
committed by GitHub
parent 41b42d4c5f
commit 4b754f3643
4 changed files with 221 additions and 254 deletions

View File

@@ -1,232 +0,0 @@
SUMMARY="Advanced text editor"
DESCRIPTION="Kate is a multi-document editor part of KDE since release 2.2. \
Being a KDE application, Kate ships with network transparency, as well as \
integration with the outstanding features of KDE. Choose it for viewing HTML \
sources from konqueror, editing configuration files, writing new applications \
or any other text editing task. You still need just one running instance of \
Kate.
With a multi-view editor like Kate you get a lot of advantages. You can view \
several instances of the same document and all instances are synchronized. \
Or you can view more files at the same time for easy reference or simultaneous \
editing.
Application Features
* window splitting (horizontal & vertical)
* multi-document interface (MDI)
* plugin: embedded terminal, SQL plugin, build plugin, GDB plugin, Replace in \
Files, and more
* session support
General Features
* encoding support (Unicode and lots of others)
* bi-directional text rendering support
* line ending support (Windows, Unix, Mac), including auto detection
* network transparency (open remote files)
* extensible through scripting
Advanced Editor Features
* bookmarking system (also supported: break points etc.)
* scroll bar marks
* line modification indicators
* line numbers
* code folding
Syntax Highlighting
* highlighting support for more than 250 languages
* bracket matching
* smart on-the-fly spell checking
* highlighting of selected words
Programming Features
* scriptable auto indentation
* smart comment and uncomment handling
* auto completion with argument hints
* vi input mode
* rectangular block selection mode
Search & Replace
* incremental search, also known as “find as you type”
* support for multiline search & replace
* regular expression support
* search & replace in multiple opened files or files on disk
Backup and Restore
* backups on save
* swap files to recover data on system crash
* undo / redo system"
HOMEPAGE="https://kate-editor.org/"
COPYRIGHT="2010-2024 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="683c49d9c4b2abd4b4660b607b65249a2adfdc48418b0d18ab90810d1a8f4e37"
ADDITIONAL_FILES="kate.rdef.in"
PATCHES="kate-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
kate$secondaryArchSuffix = $portVersion
app:Kate$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libKF5Activities$secondaryArchSuffix
lib:libKF5Archive$secondaryArchSuffix
lib:libKF5Attica$secondaryArchSuffix
lib:libKF5Auth$secondaryArchSuffix
lib:libKF5Bookmarks$secondaryArchSuffix
lib:libKF5Codecs$secondaryArchSuffix
lib:libKF5Completion$secondaryArchSuffix
lib:libKF5ConfigCore$secondaryArchSuffix
lib:libKF5ConfigGui$secondaryArchSuffix
lib:libKF5ConfigWidgets$secondaryArchSuffix
lib:libKF5CoreAddons$secondaryArchSuffix
lib:libKF5Crash$secondaryArchSuffix
lib:libKF5DBusAddons$secondaryArchSuffix
lib:libKF5GuiAddons$secondaryArchSuffix
lib:libKF5I18n$secondaryArchSuffix
lib:libKF5IconThemes$secondaryArchSuffix
lib:libKF5ItemModels$secondaryArchSuffix
lib:libKF5ItemViews$secondaryArchSuffix
lib:libKF5JobWidgets$secondaryArchSuffix
lib:libKF5KIOCore$secondaryArchSuffix
lib:libKF5KIOFileWidgets$secondaryArchSuffix
lib:libKF5KIOWidgets$secondaryArchSuffix
lib:libKF5NewStuff$secondaryArchSuffix
lib:libKF5NewStuffCore$secondaryArchSuffix
lib:libKF5Notifications$secondaryArchSuffix
lib:libKF5Parts$secondaryArchSuffix
lib:libKF5Service$secondaryArchSuffix
lib:libKF5Solid$secondaryArchSuffix
lib:libKF5SonnetUi$secondaryArchSuffix
lib:libKF5SyntaxHighlighting$secondaryArchSuffix
lib:libKF5TextEditor$secondaryArchSuffix
lib:libKF5TextWidgets$secondaryArchSuffix
lib:libKF5ThreadWeaver$secondaryArchSuffix
lib:libKF5UnitConversion$secondaryArchSuffix
lib:libKF5Wallet$secondaryArchSuffix
lib:libKF5WidgetsAddons$secondaryArchSuffix
lib:libKF5WindowSystem$secondaryArchSuffix
lib:libKF5XmlGui$secondaryArchSuffix
lib:libKUserFeedbackCore$secondaryArchSuffix
lib:libKUserFeedbackWidgets$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix
devel:libKF5Activities$secondaryArchSuffix
devel:libKF5Archive$secondaryArchSuffix
devel:libKF5Attica$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix
devel:libKF5Completion$secondaryArchSuffix
devel:libKF5ConfigCore$secondaryArchSuffix
devel:libKF5ConfigGui$secondaryArchSuffix
devel:libKF5ConfigWidgets$secondaryArchSuffix
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5Crash$secondaryArchSuffix
devel:libKF5DBusAddons$secondaryArchSuffix
devel:libKF5GuiAddons$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5IconThemes$secondaryArchSuffix
devel:libKF5ItemModels$secondaryArchSuffix
devel:libKF5ItemViews$secondaryArchSuffix
devel:libKF5JobWidgets$secondaryArchSuffix
devel:libKF5KIOCore$secondaryArchSuffix
devel:libKF5KIOFileWidgets$secondaryArchSuffix
devel:libKF5KIOWidgets$secondaryArchSuffix
devel:libKF5NewStuff$secondaryArchSuffix
devel:libKF5Notifications$secondaryArchSuffix
devel:libKF5Parts$secondaryArchSuffix
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Solid$secondaryArchSuffix
devel:libKF5SonnetUi$secondaryArchSuffix
devel:libKF5SyntaxHighlighting$secondaryArchSuffix
devel:libKF5TextEditor$secondaryArchSuffix
devel:libKF5TextWidgets$secondaryArchSuffix
devel:libKF5ThreadWeaver$secondaryArchSuffix
devel:libKF5UnitConversion$secondaryArchSuffix
devel:libKF5Wallet$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5WindowSystem$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
devel:libKUserFeedbackCore$secondaryArchSuffix
devel:libKUserFeedbackWidgets$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:find
cmd:g++$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:python3
"
BUILD()
{
sed -e '/add_subdirectory( doc )/ s/^#*/#/' -i CMakeLists.txt
mkdir -p build
cd build
export LDFLAGS="-lnetwork"
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DINCLUDE_INSTALL_DIR=$includeDir \
-DSHARE_INSTALL_PREFIX=$dataDir \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DCMAKE_INSTALL_PREFIX=$appsDir/Kate \
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5
make $jobArgs
}
INSTALL()
{
cd build
make install
mv $appsDir/Kate/bin/kate $appsDir/Kate/Kate
rm -rf \
$appsDir/Kate/bin \
$dataDir/applications \
$dataDir/icons
find $dataDir/locale -type f -name 'kwrite.mo' -delete
local APP_SIGNATURE="application/x-vnd.qt5-kate"
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"
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|" \
$portDir/additional-files/kate.rdef.in > kate.rdef
addResourcesToBinaries kate.rdef $appsDir/Kate/Kate
addAppDeskbarSymlink $appsDir/Kate/Kate
}
TEST()
{
make test
}

View File

@@ -0,0 +1,179 @@
SUMMARY="Advanced text editor"
DESCRIPTION="Kate is a multi-document editor part of KDE since release 2.2. \
Being a KDE application, Kate ships with network transparency, as well as \
integration with the outstanding features of KDE. Choose it for viewing HTML \
sources from konqueror, editing configuration files, writing new applications \
or any other text editing task. You still need just one running instance of \
Kate.
With a multi-view editor like Kate you get a lot of advantages. You can view \
several instances of the same document and all instances are synchronized. \
Or you can view more files at the same time for easy reference or simultaneous \
editing.
Application Features
* window splitting (horizontal & vertical)
* multi-document interface (MDI)
* plugin: embedded terminal, SQL plugin, build plugin, GDB plugin, Replace in \
Files, and more
* session support
General Features
* encoding support (Unicode and lots of others)
* bi-directional text rendering support
* line ending support (Windows, Unix, Mac), including auto detection
* network transparency (open remote files)
* extensible through scripting
Advanced Editor Features
* bookmarking system (also supported: break points etc.)
* scroll bar marks
* line modification indicators
* line numbers
* code folding
Syntax Highlighting
* highlighting support for more than 250 languages
* bracket matching
* smart on-the-fly spell checking
* highlighting of selected words
Programming Features
* scriptable auto indentation
* smart comment and uncomment handling
* auto completion with argument hints
* vi input mode
* rectangular block selection mode
Search & Replace
* incremental search, also known as “find as you type”
* support for multiline search & replace
* regular expression support
* search & replace in multiple opened files or files on disk
Backup and Restore
* backups on save
* swap files to recover data on system crash
* undo / redo system"
HOMEPAGE="https://kate-editor.org/"
COPYRIGHT="2010-2024 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="a5926a0d85c69ca2cc34d87e567501e795e95050e16f896e39cd8cac4ced2348"
PATCHES="kate-$portVersion.patchset"
ADDITIONAL_FILES="kate.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
kate$secondaryArchSuffix = $portVersion
cmd:kate$secondaryArchSuffix = $portVersion
lib:libkateprivate$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
# KF6
lib:libKF6ColorScheme$secondaryArchSuffix
lib:libKF6Completion$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6ConfigWidgets$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6Crash$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6IconThemes$secondaryArchSuffix
lib:libKF6JobWidgets$secondaryArchSuffix
lib:libKF6KIOCore$secondaryArchSuffix
lib:libKF6Parts$secondaryArchSuffix
lib:libKF6Service$secondaryArchSuffix
lib:libKF6Solid$secondaryArchSuffix
lib:libKF6SyntaxHighlighting$secondaryArchSuffix
lib:libKF6TextEditor$secondaryArchSuffix
lib:libKF6WidgetsAddons$secondaryArchSuffix
lib:libKF6WindowSystem$secondaryArchSuffix
lib:libKF6XmlGui$secondaryArchSuffix
lib:libKF6UserFeedbackCore$secondaryArchSuffix
# Qt6
lib:libQt6Core$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Network$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libQt6Xml$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix
# KF6
devel:libKF6Attica$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6Crash$secondaryArchSuffix
devel:libKF6GuiAddons$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
devel:libKF6NewStuffCore$secondaryArchSuffix
devel:libKF6TextEditor$secondaryArchSuffix
devel:libKF6TextWidgets$secondaryArchSuffix
devel:libKF6UserFeedbackCore$secondaryArchSuffix
# Qt6
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Keychain$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:find
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
cmake -Bbuild -S. $cmakeDirArgs \
-DCMAKE_BUILD_TYPE=Release \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}
INSTALL()
{
make -C build install
# cleanup
rm -rf $dataDir/{applications,icons,metainfo}
rm -rf $binDir/kwrite
find $dataDir/locale -type f -name 'kwrite.mo' -delete
mkdir -p "$dataDir/deskbar/menu/Applications/KDE"
local APP_SIGNATURE="application/x-vnd.Qt6-kate"
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"
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|" \
$portDir/additional-files/kate.rdef.in > kate.rdef
addResourcesToBinaries kate.rdef $binDir/kate
addAppDeskbarSymlink $binDir/kate "KDE/Kate"
}
TEST()
{
ctest --test-dir build --output-on-failure
}

View File

@@ -1,22 +0,0 @@
From a719cd0579fd5adb92fa627e09bdb4df56ef44ff Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 9 Jun 2023 11:53:00 +0300
Subject: Dsiable Qt5X11Extras on Haiku
diff --git a/apps/kate/CMakeLists.txt b/apps/kate/CMakeLists.txt
index 04f130a..32fd43a 100644
--- a/apps/kate/CMakeLists.txt
+++ b/apps/kate/CMakeLists.txt
@@ -2,7 +2,7 @@
find_package(KF${KF_MAJOR_VERSION}DBusAddons ${KF5_DEP_VERSION} REQUIRED)
-if (UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE AND NOT HAIKU)
if (QT_MAJOR_VERSION STREQUAL "5")
find_package(Qt5X11Extras REQUIRED)
endif()
--
2.37.3

View File

@@ -0,0 +1,42 @@
From 534e4fdbae238c2834f43f9438390ef8f2efea14 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 23 Dec 2024 07:46:09 +0100
Subject: Use Haiku's icon/color schemes
diff --git a/apps/lib/kateapp.cpp b/apps/lib/kateapp.cpp
index cd392fa..3b11b43 100644
--- a/apps/lib/kateapp.cpp
+++ b/apps/lib/kateapp.cpp
@@ -158,9 +158,11 @@ void KateApp::initPreApplicationCreation(bool detach)
* trigger initialisation of proper icon theme
* see https://invent.kde.org/frameworks/kiconthemes/-/merge_requests/136
*/
+#if !defined(Q_OS_HAIKU)
#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
KIconTheme::initTheme();
#endif
+#endif
#if defined(Q_OS_WIN)
// try to attach to console for terminal detection and output
diff --git a/apps/lib/katemainwindow.cpp b/apps/lib/katemainwindow.cpp
index 1ee0a2d..cf4de7c 100644
--- a/apps/lib/katemainwindow.cpp
+++ b/apps/lib/katemainwindow.cpp
@@ -280,10 +280,12 @@ void KateMainWindow::setupImportantActions()
#endif
// Load themes
+#if !defined(Q_OS_HAIKU)
KColorSchemeManager *manager = new KColorSchemeManager(this);
auto *colorSelectionMenu = KColorSchemeMenu::createMenu(manager, this);
colorSelectionMenu->menu()->setTitle(i18n("&Window Color Scheme"));
ac->addAction(QStringLiteral("colorscheme_menu"), colorSelectionMenu);
+#endif
QAction *a = ac->addAction(KStandardAction::Back, QStringLiteral("view_prev_tab"));
a->setText(i18n("&Previous Tab"));
--
2.45.2