From 07d7ba18c76f814eb14b6fb2223f3b3efe380a0e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 18 Apr 2025 15:51:34 +0200
Subject: [PATCH] neochat, bump to 25.04.0 (#12200)

---
 ...-24.12.3.recipe => neochat-25.04.0.recipe} | 13 +++++++----
 .../neochat/patches/neochat-24.12.3.patchset  | 23 -------------------
 2 files changed, 9 insertions(+), 27 deletions(-)
 rename net-im/neochat/{neochat-24.12.3.recipe => neochat-25.04.0.recipe} (95%)
 delete mode 100644 net-im/neochat/patches/neochat-24.12.3.patchset

diff --git a/net-im/neochat/neochat-24.12.3.recipe b/net-im/neochat/neochat-25.04.0.recipe
similarity index 95%
rename from net-im/neochat/neochat-24.12.3.recipe
rename to net-im/neochat/neochat-25.04.0.recipe
index 9e5be7472..676539916 100644
--- a/net-im/neochat/neochat-24.12.3.recipe
+++ b/net-im/neochat/neochat-25.04.0.recipe
@@ -3,12 +3,11 @@ DESCRIPTION="Neochat is a client for Matrix, the decentralized communication pro
 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="2024 KDE Organisation"
+COPYRIGHT="2025 KDE Organisation"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/neochat-$portVersion.tar.xz"
-CHECKSUM_SHA256="0da4ef87620647efca0198d420e897b97c56bcfcbcfdaa5a78aa50fd488301e0"
-PATCHES="neochat-$portVersion.patchset"
+CHECKSUM_SHA256="8f82f14eecf6b5cbb2054a957cb889fbc025fe368ca1fca1ab7a2319a7317202"
 ADDITIONAL_FILES="neochat.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -121,6 +120,12 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+PATCH()
+{
+	# use Haiku's icon theme
+	sed -e 's,\    KIconTheme::initTheme();,\//    KIconTheme::initTheme();,g' -i src/main.cpp
+}
+
 BUILD()
 {
 	cmake -B build -S. -DCMAKE_BUILD_TYPE=Release \
diff --git a/net-im/neochat/patches/neochat-24.12.3.patchset b/net-im/neochat/patches/neochat-24.12.3.patchset
deleted file mode 100644
index d13a30f20..000000000
--- a/net-im/neochat/patches/neochat-24.12.3.patchset
+++ /dev/null
@@ -1,23 +0,0 @@
-From 614d3e406dfd60498da26888c6e70869fec36ad4 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-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.48.1
-