diff --git a/kde-base/kate/kate-18.04.0.recipe b/kde-base/kate/kate-19.03.80.recipe similarity index 96% rename from kde-base/kate/kate-18.04.0.recipe rename to kde-base/kate/kate-19.03.80.recipe index e04057260..32759e2b1 100644 --- a/kde-base/kate/kate-18.04.0.recipe +++ b/kde-base/kate/kate-19.03.80.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-2018 KDE Organisation" +COPYRIGHT="2010-2019 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/KDE/kate/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="804f395d8f79836825a97c1bc81b800f078d64ceb9af10f842082d3e06e70284" +CHECKSUM_SHA256="3dfde170d155207e8e77dfe32ce55128425a97131dd3dfda47d8f81b67b414a7" PATCHES="kate-$portVersion.patchset" ADDITIONAL_FILES="kate.rdef.in" @@ -116,7 +116,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules >= 5.45 + extra_cmake_modules$secondaryArchSuffix >= 5.45 devel:libKF5Archive$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Bookmarks$secondaryArchSuffix @@ -153,6 +153,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix cmd:make cmd:python2 " diff --git a/kde-base/kate/patches/kate-18.04.0.patchset b/kde-base/kate/patches/kate-18.04.0.patchset deleted file mode 100644 index bf27f2a03..000000000 --- a/kde-base/kate/patches/kate-18.04.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From aeecd9ef70d033a80e1f14be6b8ec563101575f5 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Mon, 23 Apr 2018 14:32:30 +0300 -Subject: Allow running as root on Haiku - - -diff --git a/kate/main.cpp b/kate/main.cpp -index e20fcff..630e92e 100644 ---- a/kate/main.cpp -+++ b/kate/main.cpp -@@ -60,7 +60,7 @@ - - int main(int argc, char **argv) - { --#ifndef Q_OS_WIN -+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU) - /** - * Check whether we are running as root - **/ --- -2.16.2 - diff --git a/kde-base/kate/patches/kate-19.03.80.patchset b/kde-base/kate/patches/kate-19.03.80.patchset new file mode 100644 index 000000000..1f4dac639 --- /dev/null +++ b/kde-base/kate/patches/kate-19.03.80.patchset @@ -0,0 +1,22 @@ +From 7e90b4cdd7ae1b410a45e6388f501409c9b0b385 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 24 Mar 2019 20:40:34 +1000 +Subject: Allow running as root on Haiku + + +diff --git a/kate/main.cpp b/kate/main.cpp +index dca9ffc..a1f21c6 100644 +--- a/kate/main.cpp ++++ b/kate/main.cpp +@@ -58,7 +58,7 @@ + + int main(int argc, char **argv) + { +-#ifndef Q_OS_WIN ++#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU) + // Prohibit using sudo or kdesu (but allow using the root user directly) + if (getuid() == 0) { + if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { +-- +2.19.1 +