From 235bbec03f6fdde3029c76c0e44e18758e13e86a Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Sun, 7 May 2023 04:17:37 +0000
Subject: [PATCH] community/nheko: raise stack size, sort deps

for #14890
---
 community/nheko/APKBUILD    | 75 ++++++++++++++++++-------------------
 community/nheko/gcc13.patch | 24 ++++++++++++
 2 files changed, 61 insertions(+), 38 deletions(-)
 create mode 100644 community/nheko/gcc13.patch

diff --git a/community/nheko/APKBUILD b/community/nheko/APKBUILD
index be4620fe21a..f28842e9d97 100644
--- a/community/nheko/APKBUILD
+++ b/community/nheko/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
 pkgname=nheko
 pkgver=0.11.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt5-based client for Matrix protocol"
 url="https://github.com/Nheko-Reborn/nheko"
 # armhf blocked by qt5-qtmultimedia
@@ -12,57 +12,55 @@ arch="all !armhf !riscv64"
 license="GPL-3.0-or-later"
 options="!check" # no test suite
 depends="
+	dbus:org.freedesktop.Secrets
+	libnice-gstreamer
 	qt5-qtquickcontrols2
-	so:libgstdtls.so
-	so:libgstopus.so
-	so:libgstrtpmanager.so
-	so:libgstsrtp.so
-	so:libgstwebrtc.so
 	so:libgstcompositor.so
+	so:libgstdtls.so
 	so:libgstopengl.so
+	so:libgstopus.so
 	so:libgstqmlgl.so
 	so:libgstrtp.so
+	so:libgstrtpmanager.so
+	so:libgstsrtp.so
 	so:libgstvpx.so
-	libnice-gstreamer
-	dbus:org.freedesktop.Secrets
+	so:libgstwebrtc.so
 	"
 makedepends="
 	asciidoctor
-	cmake
-	ninja
 	boost-dev
+	cmake
+	cmark-dev
+	gst-plugins-bad-dev
+	gst-plugins-base-dev
+	gstreamer-dev
 	lmdb-dev
 	lmdbxx
-	tweeny
-	qt5-qtbase-dev
-	qt5-qttools-dev
-	qt5-qtmultimedia-dev
-	qt5-qtsvg-dev
-	qt5-qtdeclarative-dev
-	qt5-qtquickcontrols2-dev
-	qtkeychain-dev
-	zlib-dev
-	openssl-dev>3
-	olm-dev
-	nlohmann-json
-	cmark-dev
-	spdlog-dev
 	mtxclient-dev
-	gstreamer-dev
-	gst-plugins-base-dev
-	gst-plugins-bad-dev
+	nlohmann-json
+	olm-dev
+	openssl-dev>3
+	qt5-qtbase-dev
+	qt5-qtdeclarative-dev
+	qt5-qtmultimedia-dev
+	qt5-qtquickcontrols2-dev
+	qt5-qtsvg-dev
+	qt5-qttools-dev
+	qtkeychain-dev
+	samurai
+	spdlog-dev
+	tweeny
 	xcb-util-wm-dev
+	zlib-dev
 	"
 subpackages="$pkgname-doc $pkgname-zsh-completion"
-source="$pkgname-$pkgver.tar.gz::https://github.com/Nheko-Reborn/nheko/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Nheko-Reborn/nheko/archive/v$pkgver.tar.gz
+	gcc13.patch
+	"
 
 prepare() {
 	default_prepare
-	sed -e '/-Wall/d' \
-		-e '/-Wextra/d' \
-		-e '/-Werror/d' \
-		-e '/-pedantic/d' \
-		-e '/-pipe/d' \
+	sed -e '/-Werror/d' \
 		-i CMakeLists.txt
 }
 
@@ -70,15 +68,15 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake -B build \
-		-GNinja \
+	LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1048576" \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
 		-DCMAKE_SKIP_RPATH=True \
 		-DCMAKE_BUILD_TYPE=None \
-		$CMAKE_CROSSOPTS .
-	ninja -C build
+		$CMAKE_CROSSOPTS
+	cmake --build build
 }
 
 check() {
@@ -86,9 +84,10 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 sha512sums="
 bd5b94def3c56bb2c91c40c3ef967ee3b14cb71a7e5b01028743a849932c918620c2b1a1b822705e49dacc80dae6c48712f63bf9a68698858b0faaf1a816c9cd  nheko-0.11.3.tar.gz
+0253d52fa432c8656688281358dbdeefac77df11e823a602dacb9a8a7df5c8cc0c3576f9e4f4d50e0a72607bb8fab6505a3219801320f730dbfd8a48cad48e98  gcc13.patch
 "
diff --git a/community/nheko/gcc13.patch b/community/nheko/gcc13.patch
new file mode 100644
index 00000000000..aaec08b8622
--- /dev/null
+++ b/community/nheko/gcc13.patch
@@ -0,0 +1,24 @@
+Patch-Source: https://github.com/Nheko-Reborn/nheko/commit/d7c10ae90417fcbb7f81edd4e40d89e91436244b
+--
+From d7c10ae90417fcbb7f81edd4e40d89e91436244b Mon Sep 17 00:00:00 2001
+From: Nicolas Werner <nicolas.werner@hotmail.de>
+Date: Fri, 24 Mar 2023 19:48:47 +0100
+Subject: [PATCH] Fix explicit optional construction on gcc13
+
+---
+ src/timeline/EventStore.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp
+index 3c214dcbe..dd0e920de 100644
+--- a/src/timeline/EventStore.cpp
++++ b/src/timeline/EventStore.cpp
+@@ -650,7 +650,7 @@ EventStore::get(int idx, bool decrypt)
+         if (edits_.empty())
+             event = cache::client()->getEvent(room_id_, *event_id);
+         else
+-            event = {edits_.back()};
++            event = mtx::events::collections::TimelineEvent{edits_.back()};
+ 
+         if (!event)
+             return nullptr;