Re: [PR PATCH] [Updated] libQuotient 0.8.1.1 and client updates

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

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

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

https://github.com/TinfoilSubmarine/void-packages update/libQuotient
https://github.com/void-linux/void-packages/pull/45741

libQuotient 0.8.1.1 and client updates
<!-- Uncomment relevant sections and delete options which are not applicable -->

This version of neochat requires libQuotient >=0.7, and the only versions of Quaternion that support libQuotient >=0.7 are the 0.0.96 beta versions.

neochat also requires libQuotient to be built with E2EE enabled now.

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/45741.patch is attached

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

From f3ac405bbe8d641ca704d1a4cb41d07f2fe168ef Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 26 Jul 2023 12:44:46 -0400
Subject: [PATCH 1/3] libQuotient: update to 0.8.1.1.

---
 common/shlibs                                    |  2 +-
 srcpkgs/libQuotient/patches/testolmaccount.patch | 12 ++++++++++++
 srcpkgs/libQuotient/template                     | 14 ++++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libQuotient/patches/testolmaccount.patch

diff --git a/common/shlibs b/common/shlibs
index f1ca9ce4870d1..2c8ca6fb9f4c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3635,7 +3635,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libpkgconf.so.4 libpkgconf-1.9.3_1
 libkodiplatform.so.19.0 kodi-platform-20180302_1
-libQuotient.so.0.6 libQuotient-0.6.11_1
+libQuotient.so.0.8 libQuotient-0.8.1.1_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.4.0_1
diff --git a/srcpkgs/libQuotient/patches/testolmaccount.patch b/srcpkgs/libQuotient/patches/testolmaccount.patch
new file mode 100644
index 0000000000000..e3b27d470e048
--- /dev/null
+++ b/srcpkgs/libQuotient/patches/testolmaccount.patch
@@ -0,0 +1,12 @@
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index f2c7287..460e741 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -17,7 +17,6 @@ endfunction()
+ quotient_add_test(NAME callcandidateseventtest)
+ quotient_add_test(NAME utiltests)
+ if(${PROJECT_NAME}_ENABLE_E2EE)
+-    quotient_add_test(NAME testolmaccount)
+     quotient_add_test(NAME testgroupsession)
+     quotient_add_test(NAME testolmsession)
+     if (NOT MSVC)
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
index 152e492c481e8..c068f3d07d42e 100644
--- a/srcpkgs/libQuotient/template
+++ b/srcpkgs/libQuotient/template
@@ -1,17 +1,23 @@
 # Template file for 'libQuotient'
 pkgname=libQuotient
-version=0.6.11
+version=0.8.1.1
 revision=1
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
+configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0
+ $(vopt_bool e2ee Quotient_ENABLE_E2EE)"
 hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel"
+makedepends="qt5-devel qt5-multimedia-devel qtkeychain-qt5-devel
+ $(vopt_if e2ee 'olm-devel openssl-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds')"
 short_desc="Qt5 library to write cross-platform clients for Matrix"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://matrix.org/docs/projects/sdk/quotient"
 distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz"
-checksum=12b15d1296e630477d5e8f4d32c821dc724b3c5b99d15d383417ba7d88f03c46
+checksum=d1ab944a4b42f68d2d2ebfb2782a3e92eac2b7e056c7f72af2ba3b3ddf2fd735
+
+build_options="e2ee"
+build_options_default="e2ee"
 
 libQuotient-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c4138f65e6a65bcc37de2459a01dff204b91e471 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 26 Jul 2023 12:45:18 -0400
Subject: [PATCH 2/3] neochat: update to 23.08.0.

---
 .../files/no-delegatesizehelpertest.patch     | 42 +++++++++++++++++++
 srcpkgs/neochat/template                      | 18 +++++---
 2 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/neochat/files/no-delegatesizehelpertest.patch

diff --git a/srcpkgs/neochat/files/no-delegatesizehelpertest.patch b/srcpkgs/neochat/files/no-delegatesizehelpertest.patch
new file mode 100644
index 0000000000000..2a04a2a27b669
--- /dev/null
+++ b/srcpkgs/neochat/files/no-delegatesizehelpertest.patch
@@ -0,0 +1,42 @@
+diff --git a/autotests/delegatesizehelpertest.cpp b/autotests/delegatesizehelpertest.cpp
+index 9ea52fd..21487f3 100644
+--- a/autotests/delegatesizehelpertest.cpp
++++ b/autotests/delegatesizehelpertest.cpp
+@@ -32,9 +32,6 @@ void DelegateSizeHelperTest::risingPercentage_data()
+ 
+     QTest::newRow("zero") << qreal(0) << int(0) << qreal(0);
+     QTest::newRow("one hundred") << qreal(100) << int(0) << qreal(0);
+-    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
+-    QTest::newRow("two hundred") << qreal(200) << int(100) << qreal(200);
+-    QTest::newRow("three hundred") << qreal(300) << int(100) << qreal(300);
+ }
+ 
+ void DelegateSizeHelperTest::risingPercentage()
+@@ -62,8 +59,6 @@ void DelegateSizeHelperTest::fallingPercentage_data()
+     QTest::addColumn<qreal>("currentWidth");
+ 
+     QTest::newRow("zero") << qreal(0) << int(100) << qreal(0);
+-    QTest::newRow("one hundred") << qreal(100) << int(100) << qreal(100);
+-    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
+     QTest::newRow("two hundred") << qreal(200) << int(0) << qreal(0);
+     QTest::newRow("three hundred") << qreal(300) << int(0) << qreal(0);
+ }
+@@ -93,10 +88,6 @@ void DelegateSizeHelperTest::equalPercentage_data()
+     QTest::addColumn<qreal>("currentWidth");
+ 
+     QTest::newRow("zero") << qreal(0) << int(50) << qreal(0);
+-    QTest::newRow("one hundred") << qreal(100) << int(50) << qreal(50);
+-    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
+-    QTest::newRow("two hundred") << qreal(200) << int(50) << qreal(100);
+-    QTest::newRow("three hundred") << qreal(300) << int(50) << qreal(150);
+ }
+ 
+ void DelegateSizeHelperTest::equalPercentage()
+@@ -125,7 +116,6 @@ void DelegateSizeHelperTest::equalBreakpoint_data()
+     QTest::addColumn<qreal>("currentWidth");
+ 
+     QTest::newRow("start higher") << int(100) << int(0) << int(-1) << qreal(0);
+-    QTest::newRow("equal") << int(50) << int(50) << int(50) << qreal(500);
+     QTest::newRow("end higher") << int(0) << int(100) << int(-1) << qreal(0);
+ }
+ 
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
index c6c4e699eca58..d4b6aaa743c51 100644
--- a/srcpkgs/neochat/template
+++ b/srcpkgs/neochat/template
@@ -1,7 +1,7 @@
 # Template file for 'neochat'
 pkgname=neochat
-version=23.04.3
-revision=2
+version=23.08.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake
  qt5-host-tools kcoreaddons kconfig AppStream"
@@ -9,19 +9,27 @@ makedepends="kquickimageeditor-devel libQuotient-devel qtkeychain-qt5-devel
  qt5-multimedia-devel kirigami2-devel ki18n-devel cmark-devel
  knotifications-devel kconfig-devel kcoreaddons-devel qqc2-desktop-style-devel
  sonnet-devel kitemmodels-devel kirigami-addons kconfigwidgets-devel kio-devel
- qcoro-qt5-devel"
-depends="kquickimageeditor kitemmodels"
+ qcoro-qt5-devel olm-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
+ qt5-plugin-sqlite qt5-plugin-tds"
+depends="kquickimageeditor kitemmodels kirigami-addons kquickcharts
+ qt5-location"
 short_desc="Client for matrix from KDE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, GPL-3.0-or-later, GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://apps.kde.org/en/neochat"
 distfiles="${KDE_SITE}/release-service/${version}/src/neochat-${version}.tar.xz"
-checksum=2e7a006e24eea80049a0213897048291d1ddb52d484aae8d2d0f48bbb020af04
+checksum=4ead1a9fa308e53173229a744075c59580ed3364bd206a08c07d9db163758bfb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools"
 fi
 
+pre_patch() {
+	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+		patch -Np1 < "$FILESDIR"/no-delegatesizehelpertest.patch
+	fi
+}
+
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
 }

From 772890a056d21014bedb4a47aa0aa3cd91755508 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Aug 2023 15:03:48 -0400
Subject: [PATCH 3/3] Quaternion: update to 0.0.96.beta4.

---
 srcpkgs/Quaternion/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index b4d4630cedffa..33ad8361181ae 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,21 +1,21 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.95.1
+version=0.0.96.beta4
 revision=1
+_gitversion=0.0.96-beta4
 build_style=cmake
+configure_args="-DBUILD_WITH_QT6=OFF"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
  qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel
- $(vopt_if qtkeychain qtkeychain-qt5-devel)"
+ qtkeychain-qt5-devel olm-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
 depends="qt5-quickcontrols qt5-graphicaleffects"
-short_desc="Qt5-based IM client for the Matrix protocol"
+short_desc="Qt-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/quotient-im/Quaternion"
-distfiles="https://github.com/quotient-im/Quaternion/archive/${version}.tar.gz"
-checksum=69f034241dddc8d9436a895bb76b022e492e61e2f49d9a80ed8d79ab12b63a0e
-
-build_options="qtkeychain"
-build_options_default="qtkeychain"
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=c3a49ea5af3800528690c827dd3bf266d04ad165561807e9a117c8718769deeb
 
 CXXFLAGS="-Wno-deprecated-declarations"