diff --git a/kde-base/kate/kate-24.12.0.recipe b/kde-base/kate/kate-24.12.3.recipe similarity index 90% rename from kde-base/kate/kate-24.12.0.recipe rename to kde-base/kate/kate-24.12.3.recipe index d797994df..ae2309cac 100644 --- a/kde-base/kate/kate-24.12.0.recipe +++ b/kde-base/kate/kate-24.12.3.recipe @@ -57,11 +57,11 @@ Backup and Restore * swap files to recover data on system crash * undo / redo system" HOMEPAGE="https://kate-editor.org/" -COPYRIGHT="2010-2024 KDE Organisation" +COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kate-$portVersion.tar.xz" -CHECKSUM_SHA256="a5926a0d85c69ca2cc34d87e567501e795e95050e16f896e39cd8cac4ced2348" +CHECKSUM_SHA256="c8952fe8730411b301344bcc69c4efcc11e1447c01b99a0916b63d59e5d6357f" PATCHES="kate-$portVersion.patchset" ADDITIONAL_FILES="kate.rdef.in" @@ -70,7 +70,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" kate$secondaryArchSuffix = $portVersion - cmd:kate$secondaryArchSuffix = $portVersion + app:Kate$secondaryArchSuffix = $portVersion lib:libkateprivate$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -83,6 +83,7 @@ REQUIRES=" lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6Crash$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix lib:libKF6IconThemes$secondaryArchSuffix lib:libKF6JobWidgets$secondaryArchSuffix @@ -135,11 +136,13 @@ BUILD_PREREQUIRES=" BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DBUILD_TESTING=OFF \ + -DCMAKE_AUTOGEN_PARALLEL=1 \ -Wno-dev make -C build $jobArgs @@ -151,10 +154,12 @@ INSTALL() # cleanup rm -rf $dataDir/{applications,icons,metainfo} - rm -rf $binDir/kwrite + rm -rf $appsDir/kwrite find $dataDir/locale -type f -name 'kwrite.mo' -delete - local APP_SIGNATURE="application/x-vnd.Qt6-kate" + mv $appsDir/kate $appsDir/Kate + + local APP_SIGNATURE="application/x-vnd.kde-kate" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" @@ -167,8 +172,8 @@ INSTALL() -e "s|@LONG_INFO@|$LONG_INFO|" \ $portDir/additional-files/kate.rdef.in > kate.rdef - addResourcesToBinaries kate.rdef $binDir/kate - addAppDeskbarSymlink $binDir/kate Kate + addResourcesToBinaries kate.rdef $appsDir/Kate + addAppDeskbarSymlink $appsDir/Kate } TEST() diff --git a/kde-base/kate/patches/kate-24.12.0.patchset b/kde-base/kate/patches/kate-24.12.3.patchset similarity index 93% rename from kde-base/kate/patches/kate-24.12.0.patchset rename to kde-base/kate/patches/kate-24.12.3.patchset index 235e93964..1c907d271 100644 --- a/kde-base/kate/patches/kate-24.12.0.patchset +++ b/kde-base/kate/patches/kate-24.12.3.patchset @@ -1,4 +1,4 @@ -From 534e4fdbae238c2834f43f9438390ef8f2efea14 Mon Sep 17 00:00:00 2001 +From edde1ca4f373ea165ddc55271df0de3b72dc223c Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 23 Dec 2024 07:46:09 +0100 Subject: Use Haiku's icon/color schemes @@ -21,7 +21,7 @@ index cd392fa..3b11b43 100644 #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 +index 15d09b8..0b420dd 100644 --- a/apps/lib/katemainwindow.cpp +++ b/apps/lib/katemainwindow.cpp @@ -280,10 +280,12 @@ void KateMainWindow::setupImportantActions() @@ -38,5 +38,5 @@ index 1ee0a2d..cf4de7c 100644 QAction *a = ac->addAction(KStandardAction::Back, QStringLiteral("view_prev_tab")); a->setText(i18n("&Previous Tab")); -- -2.45.2 +2.48.1