From ef3ed8a73cc12789dd35f849851a7dc4cc8b626c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 9 May 2022 20:58:48 +1000 Subject: [PATCH] ktexteditor: bump version --- ....86.0.recipe => ktexteditor-5.93.0.recipe} | 11 ++++++-- .../patches/ktexteditor-5.86.0.patchset | 28 ------------------- .../patches/ktexteditor-5.93.0.patchset | 26 +++++++++++++++++ 3 files changed, 34 insertions(+), 31 deletions(-) rename kde-frameworks/ktexteditor/{ktexteditor-5.86.0.recipe => ktexteditor-5.93.0.recipe} (95%) delete mode 100644 kde-frameworks/ktexteditor/patches/ktexteditor-5.86.0.patchset create mode 100644 kde-frameworks/ktexteditor/patches/ktexteditor-5.93.0.patchset diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.86.0.recipe b/kde-frameworks/ktexteditor/ktexteditor-5.93.0.recipe similarity index 95% rename from kde-frameworks/ktexteditor/ktexteditor-5.86.0.recipe rename to kde-frameworks/ktexteditor/ktexteditor-5.93.0.recipe index f0f242a73..562985039 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-5.86.0.recipe +++ b/kde-frameworks/ktexteditor/ktexteditor-5.93.0.recipe @@ -8,11 +8,11 @@ highlighting and automatic indentation to advanced scripting support, \ making it suitable for everything from a simple embedded text-file editor \ to an advanced IDE." HOMEPAGE="https://github.com/KDE/ktexteditor/" -COPYRIGHT="2010-2021 KDE Organisation" +COPYRIGHT="2010-2022 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://github.com/KDE/ktexteditor/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="e153e9fda8ccfd674817579906d9a6a419b15332df76200dea8681dd50b35e13" +CHECKSUM_SHA256="52fa065bab92a3031bf8eb6f77f4aa84626d6b51446776760e0442cd5e176816" PATCHES="ktexteditor-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -106,11 +106,16 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:python2 " +PATCH() +{ + sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml +} + BUILD() { mkdir -p build diff --git a/kde-frameworks/ktexteditor/patches/ktexteditor-5.86.0.patchset b/kde-frameworks/ktexteditor/patches/ktexteditor-5.86.0.patchset deleted file mode 100644 index 9482379c7..000000000 --- a/kde-frameworks/ktexteditor/patches/ktexteditor-5.86.0.patchset +++ /dev/null @@ -1,28 +0,0 @@ -From b37547d6324aa253773fa93551d96507eb8c83b3 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Sun, 15 Dec 2019 15:41:18 +0300 -Subject: Disable kauth_ktexteditor_helper for now - -* cmake installs helper to a wrong place and I -didn't manage to change it with KAUTH_HELPER_INSTALL_DIR - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 08fe520..8442daa 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -372,9 +372,9 @@ add_executable(kauth_ktexteditor_helper buffer/katesecuretextbuffer.cpp) - target_link_libraries(kauth_ktexteditor_helper - KF5::AuthCore - ) --install(TARGETS kauth_ktexteditor_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR} ) --kauth_install_helper_files(kauth_ktexteditor_helper org.kde.ktexteditor.katetextbuffer root) --kauth_install_actions(org.kde.ktexteditor.katetextbuffer buffer/org.kde.ktexteditor.katetextbuffer.actions) -+#install(TARGETS kauth_ktexteditor_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR} ) -+#kauth_install_helper_files(kauth_ktexteditor_helper org.kde.ktexteditor.katetextbuffer root) -+#kauth_install_actions(org.kde.ktexteditor.katetextbuffer buffer/org.kde.ktexteditor.katetextbuffer.actions) - - # add part - add_subdirectory(part) --- -2.24.0 - diff --git a/kde-frameworks/ktexteditor/patches/ktexteditor-5.93.0.patchset b/kde-frameworks/ktexteditor/patches/ktexteditor-5.93.0.patchset new file mode 100644 index 000000000..3720ee36b --- /dev/null +++ b/kde-frameworks/ktexteditor/patches/ktexteditor-5.93.0.patchset @@ -0,0 +1,26 @@ +From fe7468b9332f2c6a2cbb25b2a4fb16fb8da31ee2 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 9 May 2022 00:31:53 +1000 +Subject: Disable kauth helper + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e1a219..1c15dd9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,10 +62,10 @@ find_package(KF5Sonnet ${KF_DEP_VERSION} REQUIRED) + find_package(KF5SyntaxHighlighting ${KF_DEP_VERSION} REQUIRED) + find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED) + +-if(NOT WIN32) ++if(NOT WIN32 AND NOT HAIKU) + find_package(KF5Auth ${KF_DEP_VERSION} REQUIRED) ++ set(HAVE_KAUTH ${KF5Auth_FOUND}) + endif() +-set(HAVE_KAUTH ${KF5Auth_FOUND}) + + # EditorConfig integration + find_package(EditorConfig) +-- +2.30.2 +