[Pkg-matrix-maintainers] Bug#1042967: nheko: diff for NMU version 0.11.3-2.1

[Boyuan Yang]

Control: tags 1042967 + patch
Control: tags 1042967 + pending

Dear maintainer,

I've prepared an NMU for nheko (versioned as 0.11.3-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru nheko-0.11.3/debian/changelog nheko-0.11.3/debian/changelog
--- nheko-0.11.3/debian/changelog	2023-03-23 12:17:45.000000000 -0400
+++ nheko-0.11.3/debian/changelog	2023-12-18 12:54:11.000000000 -0500
@@ -1,3 +1,14 @@
+nheko (0.11.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules: Force non-parallel build, hopefully fix OOM with
+    armhf buildd build.
+  * debian/patches/:
+    + 0003-Fix-voip-defaults-being-incorrect-because-OS-constan.patch:
+      Apply upstream fix on launch crashes with arm64. (Closes: #1042967)
+
+ -- Boyuan Yang <byang at debian.org>  Mon, 18 Dec 2023 12:54:11 -0500
+
 nheko (0.11.3-2) unstable; urgency=medium
 
   * debian/control: Downgrade gstreamer1.0-vaapi to a Suggests.
diff -Nru nheko-0.11.3/debian/patches/0003-Fix-voip-defaults-being-incorrect-because-OS-constan.patch nheko-0.11.3/debian/patches/0003-Fix-voip-defaults-being-incorrect-
because-OS-constan.patch
--- nheko-0.11.3/debian/patches/0003-Fix-voip-defaults-being-incorrect-because-OS-constan.patch	1969-12-31 19:00:00.000000000 -0500
+++ nheko-0.11.3/debian/patches/0003-Fix-voip-defaults-being-incorrect-because-OS-constan.patch	2023-12-18 12:53:44.000000000 -0500
@@ -0,0 +1,34 @@
+From: Boyuan Yang <byang at debian.org>
+Date: Mon, 18 Dec 2023 12:52:42 -0500
+Subject: Fix voip defaults being incorrect because OS constants are not
+ defined
+
+Bug-Debian: https://bugs.debian.org/1042967
+Bug: https://github.com/Nheko-Reborn/nheko/issues/1574
+Applied-Upstream: https://github.com/Nheko-Reborn/nheko/commit/159493351313223ee88a7f34c8550c0b7af6b3e6
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 41b01c8..648e8f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,6 +47,8 @@ macro(hunter_add_package_safe)
+ 	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+ endmacro()
+ 
++project(nheko LANGUAGES CXX C)
++
+ option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." ${HUNTER_ENABLED})
+ option(USE_BUNDLED_OLM "Use the bundled version of libolm." ${HUNTER_ENABLED})
+ option(USE_BUNDLED_GTEST "Use the bundled version of Google Test." ${HUNTER_ENABLED})
+@@ -104,8 +106,6 @@ endif()
+ # Include Qt basic functions
+ include(QtCommon)
+ 
+-project(nheko LANGUAGES CXX C)
+-
+ include(GNUInstallDirs)
+ 
+ set(CPACK_PACKAGE_VERSION_MAJOR "0")
diff -Nru nheko-0.11.3/debian/patches/series nheko-0.11.3/debian/patches/series
--- nheko-0.11.3/debian/patches/series	2023-02-21 21:32:44.000000000 -0500
+++ nheko-0.11.3/debian/patches/series	2023-12-18 12:53:44.000000000 -0500
@@ -1,2 +1,3 @@
 cmake_coeurl
 httplib-pkgconfig
+0003-Fix-voip-defaults-being-incorrect-because-OS-constan.patch
diff -Nru nheko-0.11.3/debian/rules nheko-0.11.3/debian/rules
--- nheko-0.11.3/debian/rules	2023-02-21 21:03:58.000000000 -0500
+++ nheko-0.11.3/debian/rules	2023-12-18 12:50:25.000000000 -0500
@@ -15,7 +15,7 @@
 endif
 
 %:
-	dh $@
+	dh $@ --no-parallel
 
 # set $HOME to a dummy directory, because cmake tries to write stuff to $HOME
 override_dh_auto_build: FAKEHOME = HOME=$(CURDIR)/fakehome
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 858 bytes
Desc: This is a digitally signed message part
URL: <http://alioth-lists.debian.net/pipermail/pkg-matrix-maintainers/attachments/20231218/4741fcaa/attachment.sig>