* [PR PATCH] libQuotient 0.8.1.1 and client updates
@ 2023-08-24 15:49 TinfoilSubmarine
2023-08-24 16:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-24 15:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1503 bytes --]
There is a new 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: 6602 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 f87a95102d874f6f29af31189f5fa5b224d94a58 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.
---
srcpkgs/neochat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
index c6c4e699eca58..3b0a902de7dc1 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,14 +9,15 @@ 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"
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"
From d8143114371da48f03eeb608ed2fc899d59fd085 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 | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index b4d4630cedffa..1f9897a6c9f51 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,19 +1,22 @@
# 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
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=c3a49ea5af3800528690c827dd3bf266d04ad165561807e9a117c8718769deeb
build_options="qtkeychain"
build_options_default="qtkeychain"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
@ 2023-08-24 16:00 ` TinfoilSubmarine
2023-08-24 16:55 ` TinfoilSubmarine
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-24 16:00 UTC (permalink / raw)
To: ml
[-- 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: 6648 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 f87a95102d874f6f29af31189f5fa5b224d94a58 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.
---
srcpkgs/neochat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
index c6c4e699eca58..3b0a902de7dc1 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,14 +9,15 @@ 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"
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"
From afeb0fbf045d687c5bcb2a53dfd914a0f8891d67 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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
2023-08-24 16:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-08-24 16:55 ` TinfoilSubmarine
2023-08-24 16:55 ` TinfoilSubmarine
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-24 16:55 UTC (permalink / raw)
To: ml
[-- 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: 9383 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 938a9a045ac66f76e3a0090bb4750755b278fc55 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..2369a77909786 100644
--- a/srcpkgs/neochat/template
+++ b/srcpkgs/neochat/template
@@ -1,7 +1,8 @@
+#!/bin/bash
# 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 +10,26 @@ 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"
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 1023415ea5db14dc4a33fe2d138b584fc1fbb082 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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
2023-08-24 16:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-08-24 16:55 ` TinfoilSubmarine
@ 2023-08-24 16:55 ` TinfoilSubmarine
2023-08-24 16:56 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-24 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45741#issuecomment-1692076230
Comment:
Opened https://invent.kde.org/network/neochat/-/issues/592 to address i686 failures in check for neochat.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (2 preceding siblings ...)
2023-08-24 16:55 ` TinfoilSubmarine
@ 2023-08-24 16:56 ` TinfoilSubmarine
2023-08-24 17:08 ` TinfoilSubmarine
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-24 16:56 UTC (permalink / raw)
To: ml
[-- 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: 9369 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 e0e59e525b7869567ea83aa2980acbcd07bc9252 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 | 17 +++++---
2 files changed, 54 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..9e422a96c044c 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,26 @@ 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"
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 250fbb78d5bdd853be73ab63c5272d45b941bc5d 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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (3 preceding siblings ...)
2023-08-24 16:56 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-08-24 17:08 ` TinfoilSubmarine
2023-08-24 17:10 ` TinfoilSubmarine
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-24 17:08 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (4 preceding siblings ...)
2023-08-24 17:08 ` TinfoilSubmarine
@ 2023-08-24 17:10 ` TinfoilSubmarine
2023-08-31 12:30 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-24 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45741#issuecomment-1692110055
Comment:
Just saw https://github.com/void-linux/void-packages/pull/45677, this supersedes it as adds those dependencies as well as some additional missing ones.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (5 preceding siblings ...)
2023-08-24 17:10 ` TinfoilSubmarine
@ 2023-08-31 12:30 ` TinfoilSubmarine
2023-08-31 19:36 ` TinfoilSubmarine
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-31 12:30 UTC (permalink / raw)
To: ml
[-- 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: 8540 bytes --]
From a013423c1e93fd579db4efd257b722328cbd3bb7 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 616785bdb4778..e06a0a7aa2ca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3594,7 +3594,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 4936a191813d371b2010e7b06b4b1e97441ff863 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.
---
.../patches/delegatesizehelpertest_fix.patch | 38 +++++++++++++++++++
srcpkgs/neochat/template | 12 +++---
2 files changed, 45 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
diff --git a/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
new file mode 100644
index 0000000000000..947e354186028
--- /dev/null
+++ b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
@@ -0,0 +1,38 @@
+From 6305359b3c515e030c2bfd35b6ee62ad36ebe497 Mon Sep 17 00:00:00 2001
+From: Tobias Fella <tobias.fella@kde.org>
+Date: Sun, 27 Aug 2023 01:46:50 +0200
+Subject: [PATCH] Use round instead of ceil in delegatesizehelper
+
+Fixes #592
+---
+ src/delegatesizehelper.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/delegatesizehelper.cpp b/src/delegatesizehelper.cpp
+index 7c4d6dec0..aae61fa06 100644
+--- a/src/delegatesizehelper.cpp
++++ b/src/delegatesizehelper.cpp
+@@ -124,7 +124,7 @@ int DelegateSizeHelper::calculateCurrentPercentageWidth() const
+ int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
+ int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
+
+- int calcPercentWidth = std::ceil(m * m_parentWidth + c);
++ int calcPercentWidth = std::round(m * m_parentWidth + c);
+ return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
+ }
+
+@@ -146,9 +146,9 @@ qreal DelegateSizeHelper::currentWidth() const
+
+ qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
+ if (m_maxWidth < 0.0) {
+- return std::ceil(absoluteWidth);
++ return std::round(absoluteWidth);
+ } else {
+- return std::ceil(std::min(absoluteWidth, m_maxWidth));
++ return std::round(std::min(absoluteWidth, m_maxWidth));
+ }
+ }
+
+--
+GitLab
+
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
index c6c4e699eca58..1848b79c09446 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,14 +9,16 @@ 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 kirigami2 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"
From 2beb9d81fc3db8cd3af6ba32ab5275aee263ea3c 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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (6 preceding siblings ...)
2023-08-31 12:30 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-08-31 19:36 ` TinfoilSubmarine
2023-09-12 12:46 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-08-31 19:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45741#issuecomment-1701674726
Comment:
> Opened https://invent.kde.org/network/neochat/-/issues/592 to address i686 failures in check for neochat.
Pulled the patch that fixed this failing test from upstream.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] libQuotient 0.8.1.1 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (7 preceding siblings ...)
2023-08-31 19:36 ` TinfoilSubmarine
@ 2023-09-12 12:46 ` TinfoilSubmarine
2023-09-12 20:19 ` libQuotient 0.8.1.2 " Johnnynator
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-09-12 12:46 UTC (permalink / raw)
To: ml
[-- 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: 8540 bytes --]
From fc447be2daa70f5d6abfd78189633bf26341e926 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.2.
---
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 c407ffde9b8fd..c4dcc6a759b7b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,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.2_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..1ced9dd725bfe 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.2
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=5e5539fe9616c9f63985b0aabfab1858f1626e3d71a14709eeedd85af0471c7c
+
+build_options="e2ee"
+build_options_default="e2ee"
libQuotient-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From e13c0e7f0d0c302f1da53e4a3b807ec5876aa86f 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.
---
.../patches/delegatesizehelpertest_fix.patch | 38 +++++++++++++++++++
srcpkgs/neochat/template | 12 +++---
2 files changed, 45 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
diff --git a/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
new file mode 100644
index 0000000000000..947e354186028
--- /dev/null
+++ b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
@@ -0,0 +1,38 @@
+From 6305359b3c515e030c2bfd35b6ee62ad36ebe497 Mon Sep 17 00:00:00 2001
+From: Tobias Fella <tobias.fella@kde.org>
+Date: Sun, 27 Aug 2023 01:46:50 +0200
+Subject: [PATCH] Use round instead of ceil in delegatesizehelper
+
+Fixes #592
+---
+ src/delegatesizehelper.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/delegatesizehelper.cpp b/src/delegatesizehelper.cpp
+index 7c4d6dec0..aae61fa06 100644
+--- a/src/delegatesizehelper.cpp
++++ b/src/delegatesizehelper.cpp
+@@ -124,7 +124,7 @@ int DelegateSizeHelper::calculateCurrentPercentageWidth() const
+ int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
+ int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
+
+- int calcPercentWidth = std::ceil(m * m_parentWidth + c);
++ int calcPercentWidth = std::round(m * m_parentWidth + c);
+ return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
+ }
+
+@@ -146,9 +146,9 @@ qreal DelegateSizeHelper::currentWidth() const
+
+ qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
+ if (m_maxWidth < 0.0) {
+- return std::ceil(absoluteWidth);
++ return std::round(absoluteWidth);
+ } else {
+- return std::ceil(std::min(absoluteWidth, m_maxWidth));
++ return std::round(std::min(absoluteWidth, m_maxWidth));
+ }
+ }
+
+--
+GitLab
+
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
index c6c4e699eca58..1848b79c09446 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,14 +9,16 @@ 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 kirigami2 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"
From 8f2ad1c09a8a8560ae9dd64c35ca31ce9e499b14 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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: libQuotient 0.8.1.2 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (8 preceding siblings ...)
2023-09-12 12:46 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-09-12 20:19 ` Johnnynator
2023-09-12 20:20 ` Johnnynator
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2023-09-12 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45741#issuecomment-1716367567
Comment:
Can you add this patch to neochat to fix a crash. Otherwise lgtm.
https://raw.githubusercontent.com/Johnnynator/void-packages/e66bf163481704c19669f18d13955b954b162bca/srcpkgs/neochat/patches/0d5929b4bc3ca8c55a9e27121782efb19e4d829e.patch
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: libQuotient 0.8.1.2 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (9 preceding siblings ...)
2023-09-12 20:19 ` libQuotient 0.8.1.2 " Johnnynator
@ 2023-09-12 20:20 ` Johnnynator
2023-09-12 20:25 ` RoozbehOssia
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2023-09-12 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45741#issuecomment-1716367567
Comment:
Can you add this patch to neochat to fix a crash. Otherwise lgtm.
https://raw.githubusercontent.com/Johnnynator/void-packages/e66bf163481704c19669f18d13955b954b162bca/srcpkgs/neochat/patches/0d5929b4bc3ca8c55a9e27121782efb19e4d829e.patch
Edit: The patch in the patch is wrong/not prefixed. Add smth like a `a/` in front of it.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: libQuotient 0.8.1.2 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (10 preceding siblings ...)
2023-09-12 20:20 ` Johnnynator
@ 2023-09-12 20:25 ` RoozbehOssia
2023-09-12 20:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RoozbehOssia @ 2023-09-12 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 871 bytes --]
New comment by RoozbehOssia on void-packages repository
https://github.com/void-linux/void-packages/pull/45741#issuecomment-1716378557
Comment:
کو همدمی
On Tue 12. Sep 2023 at 22:19, John Zimmermann ***@***.***>
wrote:
> Can you add this patch to neochat to fix a crash. Otherwise lgtm.
>
>
> https://raw.githubusercontent.com/Johnnynator/void-packages/e66bf163481704c19669f18d13955b954b162bca/srcpkgs/neochat/patches/0d5929b4bc3ca8c55a9e27121782efb19e4d829e.patch
>
> —
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/45741#issuecomment-1716367567>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AENTXP4LTI4Q3I2NXWNUK4LX2C7V7ANCNFSM6AAAAAA35HQJNM>
> .
> You are receiving this because you are subscribed to this thread.Message
> ID: ***@***.***>
>
--
null
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] libQuotient 0.8.1.2 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (11 preceding siblings ...)
2023-09-12 20:25 ` RoozbehOssia
@ 2023-09-12 20:33 ` TinfoilSubmarine
2023-09-12 20:33 ` TinfoilSubmarine
2023-09-12 20:46 ` [PR PATCH] [Merged]: " Johnnynator
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-09-12 20:33 UTC (permalink / raw)
To: ml
[-- 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.2 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: 10231 bytes --]
From c6f76b7eef91726101ecc7f0f4be122e4ccbe70d 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.2.
---
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 c407ffde9b8fd..c4dcc6a759b7b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,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.2_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..1ced9dd725bfe 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.2
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=5e5539fe9616c9f63985b0aabfab1858f1626e3d71a14709eeedd85af0471c7c
+
+build_options="e2ee"
+build_options_default="e2ee"
libQuotient-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 1cf9367ff29a7996c7d33c17ab281a2cc6004f25 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.
---
.../patches/delegatesizehelpertest_fix.patch | 38 +++++++++++++++++++
.../patches/empty_image.source_crash.patch | 25 ++++++++++++
srcpkgs/neochat/template | 12 +++---
3 files changed, 70 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
create mode 100644 srcpkgs/neochat/patches/empty_image.source_crash.patch
diff --git a/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
new file mode 100644
index 0000000000000..947e354186028
--- /dev/null
+++ b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
@@ -0,0 +1,38 @@
+From 6305359b3c515e030c2bfd35b6ee62ad36ebe497 Mon Sep 17 00:00:00 2001
+From: Tobias Fella <tobias.fella@kde.org>
+Date: Sun, 27 Aug 2023 01:46:50 +0200
+Subject: [PATCH] Use round instead of ceil in delegatesizehelper
+
+Fixes #592
+---
+ src/delegatesizehelper.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/delegatesizehelper.cpp b/src/delegatesizehelper.cpp
+index 7c4d6dec0..aae61fa06 100644
+--- a/src/delegatesizehelper.cpp
++++ b/src/delegatesizehelper.cpp
+@@ -124,7 +124,7 @@ int DelegateSizeHelper::calculateCurrentPercentageWidth() const
+ int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
+ int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
+
+- int calcPercentWidth = std::ceil(m * m_parentWidth + c);
++ int calcPercentWidth = std::round(m * m_parentWidth + c);
+ return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
+ }
+
+@@ -146,9 +146,9 @@ qreal DelegateSizeHelper::currentWidth() const
+
+ qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
+ if (m_maxWidth < 0.0) {
+- return std::ceil(absoluteWidth);
++ return std::round(absoluteWidth);
+ } else {
+- return std::ceil(std::min(absoluteWidth, m_maxWidth));
++ return std::round(std::min(absoluteWidth, m_maxWidth));
+ }
+ }
+
+--
+GitLab
+
diff --git a/srcpkgs/neochat/patches/empty_image.source_crash.patch b/srcpkgs/neochat/patches/empty_image.source_crash.patch
new file mode 100644
index 0000000000000..efc03cf5a7269
--- /dev/null
+++ b/srcpkgs/neochat/patches/empty_image.source_crash.patch
@@ -0,0 +1,25 @@
+From 0d5929b4bc3ca8c55a9e27121782efb19e4d829e Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 4 Sep 2023 19:03:06 +0000
+Subject: [PATCH] Fix enable/disable save button when image.source is empty.
+ Otherwise it will crash
+
+---
+ src/qml/Settings/EmoticonEditorPage.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qml/Settings/EmoticonEditorPage.qml b/src/qml/Settings/EmoticonEditorPage.qml
+index c55e9178e..1f003d24e 100644
+--- a/src/qml/Settings/EmoticonEditorPage.qml
++++ b/src/qml/Settings/EmoticonEditorPage.qml
+@@ -119,8 +119,8 @@
+ MobileForm.FormButtonDelegate {
+ id: save
+ text: i18n("Save")
+- icon.name: "document-save"
+- enabled: !root.newEmoticon || (image.source && shortcode.text && description.text)
++ icon.name: "document-save"
++ enabled: !root.newEmoticon || (image.source.toString().length > 0 && shortcode.text && description.text)
+ onClicked: {
+ if (root.newEmoticon) {
+ model.addEmoticon(image.source, shortcode.text, description.text, emoticonType === EmoticonFormCard.Stickers ? "sticker" : "emoticon")
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
index c6c4e699eca58..1848b79c09446 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,14 +9,16 @@ 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 kirigami2 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"
From 9b1aede9f3c19b955f2530dc334d14080dfe0912 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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: libQuotient 0.8.1.2 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (12 preceding siblings ...)
2023-09-12 20:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-09-12 20:33 ` TinfoilSubmarine
2023-09-12 20:46 ` [PR PATCH] [Merged]: " Johnnynator
14 siblings, 0 replies; 16+ messages in thread
From: TinfoilSubmarine @ 2023-09-12 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45741#issuecomment-1716389589
Comment:
> Can you add this patch to neochat to fix a crash. Otherwise lgtm.
>
> https://raw.githubusercontent.com/Johnnynator/void-packages/e66bf163481704c19669f18d13955b954b162bca/srcpkgs/neochat/patches/0d5929b4bc3ca8c55a9e27121782efb19e4d829e.patch
>
> Edit: The patch in the patch is wrong/not prefixed. Add smth like a `a/` in front of it.
thanks, done
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: libQuotient 0.8.1.2 and client updates
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
` (13 preceding siblings ...)
2023-09-12 20:33 ` TinfoilSubmarine
@ 2023-09-12 20:46 ` Johnnynator
14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2023-09-12 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
There's a merged pull request on the void-packages repository
libQuotient 0.8.1.2 and client updates
https://github.com/void-linux/void-packages/pull/45741
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-09-12 20:46 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-24 15:49 [PR PATCH] libQuotient 0.8.1.1 and client updates TinfoilSubmarine
2023-08-24 16:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-08-24 16:55 ` TinfoilSubmarine
2023-08-24 16:55 ` TinfoilSubmarine
2023-08-24 16:56 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-08-24 17:08 ` TinfoilSubmarine
2023-08-24 17:10 ` TinfoilSubmarine
2023-08-31 12:30 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-08-31 19:36 ` TinfoilSubmarine
2023-09-12 12:46 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-09-12 20:19 ` libQuotient 0.8.1.2 " Johnnynator
2023-09-12 20:20 ` Johnnynator
2023-09-12 20:25 ` RoozbehOssia
2023-09-12 20:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-09-12 20:33 ` TinfoilSubmarine
2023-09-12 20:46 ` [PR PATCH] [Merged]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).