From 6fbf364e4968bc8330539ce409cd158fa9411505 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 3 Mar 2024 17:10:45 +0100 Subject: [PATCH] neochat, bump version (#10178) --- ...at-22.04.recipe => neochat-23.08.5.recipe} | 21 +++++++++++-------- ...2.04.patchset => neochat-23.08.5.patchset} | 10 ++++----- 2 files changed, 17 insertions(+), 14 deletions(-) rename net-im/neochat/{neochat-22.04.recipe => neochat-23.08.5.recipe} (89%) rename net-im/neochat/patches/{neochat-22.04.patchset => neochat-23.08.5.patchset} (65%) diff --git a/net-im/neochat/neochat-22.04.recipe b/net-im/neochat/neochat-23.08.5.recipe similarity index 89% rename from net-im/neochat/neochat-22.04.recipe rename to net-im/neochat/neochat-23.08.5.recipe index a6343233d..1fdb681bd 100644 --- a/net-im/neochat/neochat-22.04.recipe +++ b/net-im/neochat/neochat-23.08.5.recipe @@ -5,10 +5,10 @@ most notably Kirigami, KConfig and KI18n." HOMEPAGE="https://apps.kde.org/en/neochat" COPYRIGHT="2022 KDE Organisation" LICENSE="GNU GPL v3" -REVISION="3" -SOURCE_URI="https://download.kde.org/stable/plasma-mobile/$portVersion/neochat-$portVersion.tar.xz" -CHECKSUM_SHA256="a836995ec04307864a8023e0dc03d637ff2db89e75948eb85252262e8a9d2112" -SOURCE_DIR="neochat-$portVersion" +REVISION="1" +SOURCE_URI="https://invent.kde.org/network/neochat/-/archive/v$portVersion/neochat-v$portVersion.tar.bz2" +CHECKSUM_SHA256="47546e1572dfcfc49e0de184fbca81cf22a48b63c346164795e0725ab7d7ffec" +SOURCE_DIR="neochat-v$portVersion" PATCHES="neochat-$portVersion.patchset" ADDITIONAL_FILES="neochat.rdef.in" @@ -22,6 +22,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix qqc2_desktop_style$secondaryArchSuffix + kquickcharts$secondaryArchSuffix kquickimageditor$secondaryArchSuffix lib:libcmark$secondaryArchSuffix lib:libGL$secondaryArchSuffix @@ -34,7 +35,7 @@ REQUIRES=" lib:libKF5ConfigWidgets$secondaryArchSuffix lib:libKF5CoreAddons$secondaryArchSuffix lib:libKF5Crash$secondaryArchSuffix - lib:libKF5DocTools$secondaryArchSuffix +# lib:libKF5DocTools$secondaryArchSuffix lib:libKF5GuiAddons$secondaryArchSuffix lib:libKF5I18n$secondaryArchSuffix lib:libKF5IconThemes$secondaryArchSuffix @@ -56,6 +57,7 @@ REQUIRES=" lib:libKF5WidgetsAddons$secondaryArchSuffix lib:libKF5WindowSystem$secondaryArchSuffix lib:libKF5XmlGui$secondaryArchSuffix + lib:libQCoro5Core$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix @@ -63,14 +65,15 @@ REQUIRES=" lib:libQt5Xml$secondaryArchSuffix lib:libQt5QuickControls2$secondaryArchSuffix lib:libQt5Keychain$secondaryArchSuffix - lib:libquotient$secondaryArchSuffix + lib:libQuotient$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + kirigami_addons$secondaryArchSuffix qqc2_desktop_style${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93 + extra_cmake_modules$secondaryArchSuffix >= 5.115 kquickimageditor$secondaryArchSuffix devel:libcmark$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix @@ -82,7 +85,7 @@ BUILD_REQUIRES=" devel:libKF5ConfigWidgets$secondaryArchSuffix devel:libKF5CoreAddons$secondaryArchSuffix devel:libKF5Crash$secondaryArchSuffix - devel:libKF5DocTools$secondaryArchSuffix +# devel:libKF5DocTools$secondaryArchSuffix devel:libKF5GuiAddons$secondaryArchSuffix devel:libKF5I18n$secondaryArchSuffix devel:libKF5IconThemes$secondaryArchSuffix @@ -108,7 +111,7 @@ BUILD_REQUIRES=" devel:libQt5Core$secondaryArchSuffix devel:libQt5QuickControls2$secondaryArchSuffix devel:libQt5Keychain$secondaryArchSuffix - devel:libquotient$secondaryArchSuffix + devel:libQuotient$secondaryArchSuffix # >= 0.8.1 devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/net-im/neochat/patches/neochat-22.04.patchset b/net-im/neochat/patches/neochat-23.08.5.patchset similarity index 65% rename from net-im/neochat/patches/neochat-22.04.patchset rename to net-im/neochat/patches/neochat-23.08.5.patchset index 96f7c010f..17ee496d5 100644 --- a/net-im/neochat/patches/neochat-22.04.patchset +++ b/net-im/neochat/patches/neochat-23.08.5.patchset @@ -1,22 +1,22 @@ -From fd2b8b1d9daf0b00e1aa4a83bac89ed2dbbb0946 Mon Sep 17 00:00:00 2001 +From 4f1893317d878ac4c9482cc5a1a5845c124066eb Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 11 Jun 2022 19:59:56 +1000 Subject: Disable dbus diff --git a/CMakeLists.txt b/CMakeLists.txt -index d57acee..977a344 100644 +index f2636f1..6a61a9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -77,7 +77,7 @@ else() +@@ -114,7 +114,7 @@ else() ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0) endif() -if (NOT ANDROID AND NOT WIN32 AND NOT APPLE) +if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU) - find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED) + find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED) endif() -- -2.36.1 +2.43.2