diff --git a/net-im/neochat/additional-files/neochat.rdef.in b/net-im/neochat/additional-files/neochat.rdef.in index 309b06f47..bfe7c998b 100644 --- a/net-im/neochat/additional-files/neochat.rdef.in +++ b/net-im/neochat/additional-files/neochat.rdef.in @@ -4,12 +4,12 @@ resource app_flags B_SINGLE_LAUNCH; resource app_version { major = @MAJOR@, middle = @MIDDLE@, - minor = 0, + minor = @MINOR@, variety = B_APPV_FINAL, internal = 0, - short_info = "NeoChat", + short_info = "@APP_NAME@", long_info = "@LONG_INFO@" }; diff --git a/net-im/neochat/neochat-24.12.1.recipe b/net-im/neochat/neochat-24.12.2.recipe similarity index 88% rename from net-im/neochat/neochat-24.12.1.recipe rename to net-im/neochat/neochat-24.12.2.recipe index f66ec311a..a9dd72fce 100644 --- a/net-im/neochat/neochat-24.12.1.recipe +++ b/net-im/neochat/neochat-24.12.2.recipe @@ -7,7 +7,8 @@ COPYRIGHT="2024 KDE Organisation" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/neochat-$portVersion.tar.xz" -CHECKSUM_SHA256="381cb65eff65d58854ddbb7de77a56a6d9bf94ec55ccc73eb31d0d12976f4497" +CHECKSUM_SHA256="cb26faff6274b099287e49d0d44312dfc56e2e07d975a62e299749066dc23476" +PATCHES="neochat-$portVersion.patchset" ADDITIONAL_FILES="neochat.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -15,7 +16,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" neochat$secondaryArchSuffix = $portVersion - cmd:neochat = $portVersion + app:NeoChat = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -40,6 +41,7 @@ REQUIRES=" lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6Crash$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix lib:libKF6ItemModels$secondaryArchSuffix lib:libKF6JobWidgets$secondaryArchSuffix lib:libKF6KIOCore$secondaryArchSuffix @@ -90,6 +92,7 @@ BUILD_REQUIRES=" devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix devel:libKF6ItemModels$secondaryArchSuffix devel:libKF6KIOCore$secondaryArchSuffix devel:libKF6Notifications$secondaryArchSuffix @@ -122,7 +125,7 @@ BUILD() { cmake -B build -S. -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DCMAKE_INSTALL_BINDIR=$prefix/bin \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ @@ -136,16 +139,24 @@ INSTALL() { make -C build 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|@APP_SIGNATURE@|$APP_SIGNATURE|" \ -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 $prefix/bin/neochat - addAppDeskbarSymlink $prefix/bin/neochat NeoChat + addResourcesToBinaries neochat.rdef $appsDir/NeoChat + addAppDeskbarSymlink $appsDir/NeoChat } diff --git a/net-im/neochat/patches/neochat-24.12.2.patchset b/net-im/neochat/patches/neochat-24.12.2.patchset new file mode 100644 index 000000000..9328167b3 --- /dev/null +++ b/net-im/neochat/patches/neochat-24.12.2.patchset @@ -0,0 +1,23 @@ +From 59dec7b80c2532214fbd809a55929038e952338b Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 8 Feb 2025 09:23:52 +0100 +Subject: Use Haiku icon style + + +diff --git a/src/main.cpp b/src/main.cpp +index 143d466..29c3a5b 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -102,7 +102,9 @@ Q_DECL_EXPORT + #endif + int main(int argc, char *argv[]) + { ++#if !defined(Q_OS_HAIKU) + KIconTheme::initTheme(); ++#endif + QNetworkProxyFactory::setUseSystemConfiguration(true); + + #ifdef HAVE_WEBVIEW +-- +2.45.2 +