Re: [PR PATCH] [Updated] nheko: update to 0.8.2

[FollieHiyuki <FollieHiyuki@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages nheko
https://github.com/void-linux/void-packages/pull/29310

nheko: update to 0.8.2
BUILD_SHARED_LIBS is ON by default for `mtxclient`, so we don't need to specify it in `configure_args`
Gstreamer dependencies are for the experimental VoIP support.
Will try to spend a few days testing, hope I can get away from Element :)

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29310.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nheko-29310.patch --]
[-- Type: text/x-diff, Size: 8134 bytes --]

From 7c4ebb7e2f5aae565131a025bfad0e260c20d4d6 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Apr 2021 18:15:21 +0300
Subject: [PATCH 1/4] lmdb++: upate to 1.0.0

Move to an active fork
---
 srcpkgs/lmdb++/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lmdb++/template b/srcpkgs/lmdb++/template
index f1d8add382ef..1b4a6b5b747f 100644
--- a/srcpkgs/lmdb++/template
+++ b/srcpkgs/lmdb++/template
@@ -1,14 +1,15 @@
 # Template file for 'lmdb++'
 pkgname=lmdb++
-version=0.9.14.0+20160229
-revision=3
-_commit=0b43ca87d8cfabba392dfe884eb1edb83874de02
-wrksrc="lmdbxx-${_commit}"
+version=1.0.0
+revision=1
+wrksrc="lmdbxx-${version}"
 build_style=gnu-makefile
 depends="lmdb-devel"
 short_desc="C++11 wrapper for the LMDB database library"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="Unlicense"
-homepage="https://github.com/drycpp/lmdbxx/"
-distfiles="https://github.com/drycpp/lmdbxx/archive/${_commit}.tar.gz"
-checksum=93721132bbf5045d38ad62de2997655e9984c48ea5c9886746d42128f4b26fbd
+homepage="https://github.com/hoytech/lmdbxx/"
+distfiles="https://github.com/hoytech/lmdbxx/archive/${version}.tar.gz"
+checksum=5e12eb3aefe9050068af7df2c663edabc977ef34c9e7ba7b9d2c43e0ad47d8df
+# Check links against libsanitizer, not available on all platforms
+make_check=no

From 6983a534916ad80548428e8a59cd58a879e40b8e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Apr 2021 18:11:40 +0300
Subject: [PATCH 2/4] libunwind: enable c++ exception handling

Exclude x86
---
 common/shlibs              | 20 ++++++++++----------
 srcpkgs/libunwind/template |  8 +++++++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4e69b5ccb4ae..140a3893f942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1318,16 +1318,16 @@ libjsoncpp.so.24 jsoncpp-1.9.4_1
 libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
-libunwind.so.8 libunwind-1.1_1
-libunwind-ptrace.so.0 libunwind-1.1_1
-libunwind-x86_64.so.8 libunwind-1.1_1
-libunwind-x86.so.8 libunwind-1.1_1
-libunwind-arm.so.8 libunwind-1.1_4
-libunwind-mips.so.8 libunwind-1.1_4
-libunwind-aarch64.so.8 libunwind-1.2rc1_1
-libunwind-ppc32.so.8 libunwind-1.2.1_1
-libunwind-ppc64.so.8 libunwind-1.2.1_1
-libunwind-setjmp.so.0 libunwind-1.4_1
+libunwind.so.8 libunwind-1.5.0_3
+libunwind-ptrace.so.0 libunwind-1.5.0_3
+libunwind-x86_64.so.8 libunwind-1.5.0_3
+libunwind-x86.so.8 libunwind-1.5.0_3
+libunwind-arm.so.8 libunwind-1.5.0_3
+libunwind-mips.so.8 libunwind-1.5.0_3
+libunwind-aarch64.so.8 libunwind-1.5.0_3
+libunwind-ppc32.so.8 libunwind-1.5.0_3
+libunwind-ppc64.so.8 libunwind-1.5.0_3
+libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
 libgit2.so.1.0 libgit2-1.0.1_3
diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index 3ef73d90d5bf..d4819ce54acd 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -1,7 +1,7 @@
 # Template file for 'libunwind'
 pkgname=libunwind
 version=1.5.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="liblzma-devel"
@@ -14,6 +14,12 @@ checksum=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017
 
 CFLAGS="-fcommon"
 
+# Enable C++ exception handling (doesn't work too well on x86)
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*) ;;
+	*) configure_args+=" --enable-cxx-exceptions" ;;
+esac
+
 # LDFLAGS is necessary because libunwind.so itself uses getcontext/setcontext
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl) LDFLAGS=" -lssp_nonshared" ;;

From b20669feb39e081f5f22e4ffa60cf97e37543f25 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 13:53:11 +0300
Subject: [PATCH 3/4] mtxclient: update to 0.5.1

---
 common/shlibs              |  2 +-
 srcpkgs/mtxclient/template | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 140a3893f942..0774539703f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
+libmatrix_client.so.0.5.1 mtxclient-0.5.1_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 5c5806d3cf7d..35f3d4a10f42 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,17 +1,17 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.3.1
-revision=3
+version=0.5.1
+revision=1
 build_style=cmake
-configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=e4899cc4ce87397de2aef865e94ea2cdb8d9cb86253727e7d90532b925ecc770
+checksum=9478d870296ebe7679c90f563cb798eb3cdd3f9c4578ceea5af75b66f456baaa
 
 post_install() {
 	vlicense LICENSE

From 7aacd2ccc3075767680fe282175982170b8bd110 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 14:15:14 +0300
Subject: [PATCH 4/4] nheko: update to 0.8.2

---
 common/shlibs          |  1 +
 srcpkgs/nheko/template | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0774539703f9..3c7a6e7f8f53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1132,6 +1132,7 @@ libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index dd635f70f249..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,18 +1,26 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.7.2
-revision=3
+version=0.8.2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
- tweeny spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++
- libsodium-devel lmdb++ qt5-declarative-devel qt5-quickcontrols2-devel"
+ spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++ lmdb++
+ qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
+ gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel"
 depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
- qt5-multimedia"
+ qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5"
 short_desc="Desktop client for Matrix using Qt and C++14"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Nheko-Reborn/nheko"
 changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=412908fcec0e66a0557db5359556b65e85dd22b8644a6a2ed569a90dea4bde3c
+checksum=df4575c47daab47d418637a4637b599e3848dd749132ca1e92f981d9212eabb2
+
+case "$XBPS_TARGET_MACHINE" in
+	armv*-musl)
+		makedepends+=" libunwind-devel"
+		configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lunwind" ;;
+	*) ;;
+esac