From ee67ddc519630cc789a8609247acd0800d2efb3a Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 20 Jul 2025 16:50:02 +0200 Subject: [PATCH] neochat_kf5, re-enable KF5 version (#12341) KF6 version looks borked on nightly --- net-im/neochat/neochat_kf5-23.08.5.recipe | 174 ++++++++++++++++++ .../neochat/patches/neochat-23.08.5.patchset | 22 +++ 2 files changed, 196 insertions(+) create mode 100644 net-im/neochat/neochat_kf5-23.08.5.recipe create mode 100644 net-im/neochat/patches/neochat-23.08.5.patchset diff --git a/net-im/neochat/neochat_kf5-23.08.5.recipe b/net-im/neochat/neochat_kf5-23.08.5.recipe new file mode 100644 index 000000000..d03a7af7b --- /dev/null +++ b/net-im/neochat/neochat_kf5-23.08.5.recipe @@ -0,0 +1,174 @@ +SUMMARY="Client for Matrix, the decentralized communication protocol" +DESCRIPTION="Neochat is a client for Matrix, the decentralized communication protocol \ +for instant messaging. It is a fork of Spectral, using KDE frameworks, \ +most notably Kirigami, KConfig and KI18n." +HOMEPAGE="https://apps.kde.org/en/neochat" +COPYRIGHT="2022 KDE Organisation" +LICENSE="GNU GPL v3" +REVISION="4" +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" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + neochat_kf5$secondaryArchSuffix = $portVersion + app:NeoChat = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + kirigami_addons$secondaryArchSuffix + kquickcharts$secondaryArchSuffix + kquickimageeditor$secondaryArchSuffix + qqc2_desktop_style$secondaryArchSuffix + lib:libcmark$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libKF5Archive$secondaryArchSuffix + lib:libKF5Auth$secondaryArchSuffix + lib:libKF5Bookmarks$secondaryArchSuffix + lib:libKF5Codecs$secondaryArchSuffix + lib:libKF5Completion$secondaryArchSuffix + lib:libKF5ConfigCore$secondaryArchSuffix + lib:libKF5ConfigWidgets$secondaryArchSuffix + lib:libKF5CoreAddons$secondaryArchSuffix + lib:libKF5Crash$secondaryArchSuffix +# lib:libKF5DocTools$secondaryArchSuffix + lib:libKF5GuiAddons$secondaryArchSuffix + lib:libKF5I18n$secondaryArchSuffix + lib:libKF5IconThemes$secondaryArchSuffix + lib:libKF5ItemModels$secondaryArchSuffix + lib:libKF5ItemViews$secondaryArchSuffix + lib:libKF5JobWidgets$secondaryArchSuffix + lib:libKF5KIOCore$secondaryArchSuffix + lib:libKF5Kirigami2$secondaryArchSuffix + lib:libKF5Notifications$secondaryArchSuffix + lib:libKF5NotifyConfig$secondaryArchSuffix + lib:libKF5Package$secondaryArchSuffix + lib:libKF5Plotting$secondaryArchSuffix + lib:libKF5Service$secondaryArchSuffix + lib:libKF5Solid$secondaryArchSuffix + lib:libKF5SonnetUi$secondaryArchSuffix + lib:libKF5TextEditor$secondaryArchSuffix + lib:libKF5TextWidgets$secondaryArchSuffix + lib:libKF5Wallet$secondaryArchSuffix + lib:libKF5WidgetsAddons$secondaryArchSuffix + lib:libKF5WindowSystem$secondaryArchSuffix + lib:libKF5XmlGui$secondaryArchSuffix + lib:libQCoro5Core$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix + lib:libQt5Xml$secondaryArchSuffix + lib:libQt5QuickControls2$secondaryArchSuffix + lib:libQt5Keychain$secondaryArchSuffix + lib:libQuotient$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +CONFLICTS=" + neochat$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + kirigami_addons$secondaryArchSuffix + qqc2_desktop_style${secondaryArchSuffix}_devel + extra_cmake_modules$secondaryArchSuffix + kquickimageeditor${secondaryArchSuffix}_devel + devel:libcmark$secondaryArchSuffix + devel:libKF5Archive$secondaryArchSuffix + devel:libKF5Auth$secondaryArchSuffix + devel:libKF5Bookmarks$secondaryArchSuffix + devel:libKF5Codecs$secondaryArchSuffix + devel:libKF5Completion$secondaryArchSuffix + devel:libKF5ConfigCore$secondaryArchSuffix + devel:libKF5ConfigWidgets$secondaryArchSuffix + devel:libKF5CoreAddons$secondaryArchSuffix + devel:libKF5Crash$secondaryArchSuffix +# devel:libKF5DocTools$secondaryArchSuffix + devel:libKF5GuiAddons$secondaryArchSuffix + devel:libKF5I18n$secondaryArchSuffix + devel:libKF5IconThemes$secondaryArchSuffix + devel:libKF5ItemModels$secondaryArchSuffix + devel:libKF5ItemViews$secondaryArchSuffix + devel:libKF5JobWidgets$secondaryArchSuffix + devel:libKF5KIOCore$secondaryArchSuffix + devel:libKF5Kirigami2$secondaryArchSuffix + devel:libKF5Notifications$secondaryArchSuffix + devel:libKF5NotifyConfig$secondaryArchSuffix + devel:libKF5Package$secondaryArchSuffix + devel:libKF5Plotting$secondaryArchSuffix + devel:libKF5Service$secondaryArchSuffix + devel:libKF5Solid$secondaryArchSuffix + devel:libKF5SonnetUi$secondaryArchSuffix + devel:libKF5TextEditor$secondaryArchSuffix + devel:libKF5TextWidgets$secondaryArchSuffix + devel:libKF5Wallet$secondaryArchSuffix + devel:libKF5WidgetsAddons$secondaryArchSuffix + devel:libKF5WindowSystem$secondaryArchSuffix + devel:libKF5XmlGui$secondaryArchSuffix + devel:libQCoro5Core$secondaryArchSuffix >= 0.9 + devel:libQt5Core$secondaryArchSuffix + devel:libQt5QuickControls2$secondaryArchSuffix + devel:libQt5Keychain$secondaryArchSuffix + devel:libQuotient$secondaryArchSuffix >= 0.8.1 + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:cmark + cmd:g++$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix >= 5 + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + sed -e '/ecm_find_qmlmodule/ s/^#*/#/' -i CMakeLists.txt + + mkdir -p build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$appsDir \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DCMAKE_INSTALL_DATADIR=$dataDir \ + -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ + -DSHARE_INSTALL_PREFIX=$dataDir \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + mv $appsDir/neochat $appsDir/NeoChat + + local APP_SIGNATURE="application/x-vnd.kde.neochat" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="NeoChat" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.neochat" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@APP_NAME@|$APP_NAME|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + $portDir/additional-files/neochat.rdef.in > neochat.rdef + + addResourcesToBinaries neochat.rdef $appsDir/NeoChat + addAppDeskbarSymlink $appsDir/NeoChat +} diff --git a/net-im/neochat/patches/neochat-23.08.5.patchset b/net-im/neochat/patches/neochat-23.08.5.patchset new file mode 100644 index 000000000..17ee496d5 --- /dev/null +++ b/net-im/neochat/patches/neochat-23.08.5.patchset @@ -0,0 +1,22 @@ +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 f2636f1..6a61a9b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -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(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED) + endif() + +-- +2.43.2 +