Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
@ 2021-02-26 22:25 krkk
  2021-02-26 22:36 ` [PR REVIEW] " ericonr
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: krkk @ 2021-02-26 22:25 UTC (permalink / raw)
  To: ml

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

There is a new pull request by krkk against master on the void-packages repository

https://github.com/krkk/void-packages quaternion
https://github.com/void-linux/void-packages/pull/29082

Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From 56d8d8b4e41f6209ee6a736396adf08b883802a0 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:06:21 +0100
Subject: [PATCH 1/3] New package: libQuotient-0.6.5

---
 common/shlibs                |  1 +
 srcpkgs/libQuotient-devel    |  1 +
 srcpkgs/libQuotient/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libQuotient-devel
 create mode 100644 srcpkgs/libQuotient/template

diff --git a/common/shlibs b/common/shlibs
index b016d28f788..8dd02f13a51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_1
+libQuotient.so.0.6 libQuotient-0.6.5_1
diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel
new file mode 120000
index 00000000000..b4566ff0d5b
--- /dev/null
+++ b/srcpkgs/libQuotient-devel
@@ -0,0 +1 @@
+libQuotient
\ No newline at end of file
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
new file mode 100644
index 00000000000..26442b201ae
--- /dev/null
+++ b/srcpkgs/libQuotient/template
@@ -0,0 +1,25 @@
+# Template file for 'libQuotient'
+pkgname=libQuotient
+version=0.6.5
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel qt5-multimedia-devel"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
+maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
+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=a22738fd6fd90c662174ca31348934c75f29fdbfcf7d86f471d2fcbf628c36ea
+
+libQuotient-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 98813e14a9ddd9f06a6f5f60356d4d6a5100dad4 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:07:41 +0100
Subject: [PATCH 2/3] Quaternion: update to 0.0.95.beta4.

---
 srcpkgs/Quaternion/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 47f72d33f24..f2e8416759e 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,19 +1,21 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.9.4e
+version=0.0.95.beta4
 revision=1
+_gitversion=0.0.95-beta4
+wrksrc="Quaternion-${_gitversion}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
- qt5-multimedia-devel libqmatrixclient-devel
+ qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel
  $(vopt_if qtkeychain qtkeychain-qt5-devel)"
-depends="qt5-quickcontrols"
+depends="qt5-quickcontrols qt5-graphicaleffects"
 short_desc="Qt5-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=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=058c6fe9c94ca7af5d467379bfe87603a5429b09fe8427d0b2c2f6824deaf1fe
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"

From dece00a8483976a1f27f6b845fefd0126b715e2b Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:14:13 +0100
Subject: [PATCH 3/3] libqmatrixclient: remove package.

The package was only used for Quaternion<=0.0.9.4, but since the newer
versions use an API under a new name -- libQuotient, it can be removed.
---
 common/shlibs                     |  1 -
 srcpkgs/libqmatrixclient-devel    |  1 -
 srcpkgs/libqmatrixclient/template | 26 --------------------------
 srcpkgs/removed-packages/template |  3 ++-
 4 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 120000 srcpkgs/libqmatrixclient-devel
 delete mode 100644 srcpkgs/libqmatrixclient/template

diff --git a/common/shlibs b/common/shlibs
index 8dd02f13a51..b39782d73c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3509,7 +3509,6 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.0_1
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
-libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel
deleted file mode 120000
index 101819602ce..00000000000
--- a/srcpkgs/libqmatrixclient-devel
+++ /dev/null
@@ -1 +0,0 @@
-libqmatrixclient
\ No newline at end of file
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
deleted file mode 100644
index 8e6d8e4d7c8..00000000000
--- a/srcpkgs/libqmatrixclient/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libqmatrixclient'
-pkgname=libqmatrixclient
-version=0.5.3.2
-revision=1
-wrksrc="libQuotient-${version}"
-build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platform clients for Matrix"
-maintainer="Karol Kosek <krkkx@protonmail.com>"
-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=80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9
-
-libqmatrixclient-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391a..8504e167001 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=32
+revision=33
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -166,6 +166,7 @@ replaces="
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libqmatrixclient<=0.5.3.2_1
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
@ 2021-02-26 22:36 ` ericonr
  2021-02-26 22:36 ` ericonr
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-02-26 22:36 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r583962478

Comment:
Why move to beta? We prefer to stick with stable releases.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
  2021-02-26 22:36 ` [PR REVIEW] " ericonr
@ 2021-02-26 22:36 ` ericonr
  2021-02-26 22:36 ` ericonr
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-02-26 22:36 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r583962238

Comment:
This will make people who have this package installed unable to update if XBPS is updated at the same time. I think this should be moved to a transitional dummy package, maybe.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
  2021-02-26 22:36 ` [PR REVIEW] " ericonr
  2021-02-26 22:36 ` ericonr
@ 2021-02-26 22:36 ` ericonr
  2021-02-27  0:20 ` sgn
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-02-26 22:36 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r583962626

Comment:
I'd put this line below the old one, otherwise you can end up having to rebase the PR constantly due to new packages.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (2 preceding siblings ...)
  2021-02-26 22:36 ` ericonr
@ 2021-02-27  0:20 ` sgn
  2021-02-27 18:46 ` [PR PATCH] [Updated] " krkk
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2021-02-27  0:20 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r583997083

Comment:
 I don't think we need transitional dummy. Just left it there and let users remove the orphan with `xbps-remove -o`

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (3 preceding siblings ...)
  2021-02-27  0:20 ` sgn
@ 2021-02-27 18:46 ` krkk
  2021-02-27 18:46 ` [PR REVIEW] " krkk
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: krkk @ 2021-02-27 18:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/krkk/void-packages quaternion
https://github.com/void-linux/void-packages/pull/29082

Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From df6c13a4ffb7ed4d3fc925f09e8e5c8c2284bdc3 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:06:21 +0100
Subject: [PATCH 1/3] New package: libQuotient-0.6.5

---
 common/shlibs                |  1 +
 srcpkgs/libQuotient-devel    |  1 +
 srcpkgs/libQuotient/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libQuotient-devel
 create mode 100644 srcpkgs/libQuotient/template

diff --git a/common/shlibs b/common/shlibs
index b016d28f788..f3afaa5ca7b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3510,6 +3510,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.0_1
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
+libQuotient.so.0.6 libQuotient-0.6.5_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel
new file mode 120000
index 00000000000..b4566ff0d5b
--- /dev/null
+++ b/srcpkgs/libQuotient-devel
@@ -0,0 +1 @@
+libQuotient
\ No newline at end of file
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
new file mode 100644
index 00000000000..26442b201ae
--- /dev/null
+++ b/srcpkgs/libQuotient/template
@@ -0,0 +1,25 @@
+# Template file for 'libQuotient'
+pkgname=libQuotient
+version=0.6.5
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel qt5-multimedia-devel"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
+maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
+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=a22738fd6fd90c662174ca31348934c75f29fdbfcf7d86f471d2fcbf628c36ea
+
+libQuotient-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From ae2d13282c39fdbb428809c7d53abd6025d34337 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:07:41 +0100
Subject: [PATCH 2/3] Quaternion: update to 0.0.95.beta4.

---
 srcpkgs/Quaternion/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 47f72d33f24..f2e8416759e 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,19 +1,21 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.9.4e
+version=0.0.95.beta4
 revision=1
+_gitversion=0.0.95-beta4
+wrksrc="Quaternion-${_gitversion}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
- qt5-multimedia-devel libqmatrixclient-devel
+ qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel
  $(vopt_if qtkeychain qtkeychain-qt5-devel)"
-depends="qt5-quickcontrols"
+depends="qt5-quickcontrols qt5-graphicaleffects"
 short_desc="Qt5-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=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=058c6fe9c94ca7af5d467379bfe87603a5429b09fe8427d0b2c2f6824deaf1fe
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"

From 730aed7f766e05c3b6976d22fe64e67b36730552 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:14:13 +0100
Subject: [PATCH 3/3] libqmatrixclient: remove package.

The package was only used for Quaternion<=0.0.9.4, but since the newer
versions use an API under a new name -- libQuotient, it can be removed.
---
 common/shlibs                     |  1 -
 srcpkgs/libqmatrixclient-devel    |  1 -
 srcpkgs/libqmatrixclient/template | 26 --------------------------
 srcpkgs/removed-packages/template |  3 ++-
 4 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 120000 srcpkgs/libqmatrixclient-devel
 delete mode 100644 srcpkgs/libqmatrixclient/template

diff --git a/common/shlibs b/common/shlibs
index f3afaa5ca7b..65e2c83377f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3509,7 +3509,6 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.0_1
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
-libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libQuotient.so.0.6 libQuotient-0.6.5_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel
deleted file mode 120000
index 101819602ce..00000000000
--- a/srcpkgs/libqmatrixclient-devel
+++ /dev/null
@@ -1 +0,0 @@
-libqmatrixclient
\ No newline at end of file
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
deleted file mode 100644
index 8e6d8e4d7c8..00000000000
--- a/srcpkgs/libqmatrixclient/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libqmatrixclient'
-pkgname=libqmatrixclient
-version=0.5.3.2
-revision=1
-wrksrc="libQuotient-${version}"
-build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platform clients for Matrix"
-maintainer="Karol Kosek <krkkx@protonmail.com>"
-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=80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9
-
-libqmatrixclient-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391a..8504e167001 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=32
+revision=33
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -166,6 +166,7 @@ replaces="
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libqmatrixclient<=0.5.3.2_1
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (4 preceding siblings ...)
  2021-02-27 18:46 ` [PR PATCH] [Updated] " krkk
@ 2021-02-27 18:46 ` krkk
  2021-03-08  3:56 ` ericonr
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: krkk @ 2021-02-27 18:46 UTC (permalink / raw)
  To: ml

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

New review comment by krkk on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r584173905

Comment:
v0.0.9.4 is almost 2 years old

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (5 preceding siblings ...)
  2021-02-27 18:46 ` [PR REVIEW] " krkk
@ 2021-03-08  3:56 ` ericonr
  2021-03-08  6:50 ` [PR PATCH] [Updated] " krkk
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-03-08  3:56 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#issuecomment-792444330

Comment:
Could you please rebase the PR?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (6 preceding siblings ...)
  2021-03-08  3:56 ` ericonr
@ 2021-03-08  6:50 ` krkk
  2021-03-08  6:51 ` krkk
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: krkk @ 2021-03-08  6:50 UTC (permalink / raw)
  To: ml

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

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

https://github.com/krkk/void-packages quaternion
https://github.com/void-linux/void-packages/pull/29082

Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From f51a076df73862b38ee483b85b8a2a8247852d6a Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:06:21 +0100
Subject: [PATCH 1/3] New package: libQuotient-0.6.5

---
 common/shlibs                |  1 +
 srcpkgs/libQuotient-devel    |  1 +
 srcpkgs/libQuotient/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libQuotient-devel
 create mode 100644 srcpkgs/libQuotient/template

diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..1b340cc40c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3551,6 +3551,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
+libQuotient.so.0.6 libQuotient-0.6.5_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel
new file mode 120000
index 00000000000..b4566ff0d5b
--- /dev/null
+++ b/srcpkgs/libQuotient-devel
@@ -0,0 +1 @@
+libQuotient
\ No newline at end of file
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
new file mode 100644
index 00000000000..26442b201ae
--- /dev/null
+++ b/srcpkgs/libQuotient/template
@@ -0,0 +1,25 @@
+# Template file for 'libQuotient'
+pkgname=libQuotient
+version=0.6.5
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel qt5-multimedia-devel"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
+maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
+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=a22738fd6fd90c662174ca31348934c75f29fdbfcf7d86f471d2fcbf628c36ea
+
+libQuotient-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 6a7fe3980f79aa9d5712e06463142556307b6b94 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:07:41 +0100
Subject: [PATCH 2/3] Quaternion: update to 0.0.95.beta4.

---
 srcpkgs/Quaternion/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 47f72d33f24..f2e8416759e 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,19 +1,21 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.9.4e
+version=0.0.95.beta4
 revision=1
+_gitversion=0.0.95-beta4
+wrksrc="Quaternion-${_gitversion}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
- qt5-multimedia-devel libqmatrixclient-devel
+ qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel
  $(vopt_if qtkeychain qtkeychain-qt5-devel)"
-depends="qt5-quickcontrols"
+depends="qt5-quickcontrols qt5-graphicaleffects"
 short_desc="Qt5-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=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=058c6fe9c94ca7af5d467379bfe87603a5429b09fe8427d0b2c2f6824deaf1fe
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"

From 5335edb20356f4ba27cb8de01e59a3fcc1017b9e Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:14:13 +0100
Subject: [PATCH 3/3] libqmatrixclient: remove package.

The package was only used for Quaternion<=0.0.9.4, but since the newer
versions use an API under a new name -- libQuotient, it can be removed.
---
 common/shlibs                     |  1 -
 srcpkgs/libqmatrixclient-devel    |  1 -
 srcpkgs/libqmatrixclient/template | 26 --------------------------
 srcpkgs/removed-packages/template |  3 ++-
 4 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 120000 srcpkgs/libqmatrixclient-devel
 delete mode 100644 srcpkgs/libqmatrixclient/template

diff --git a/common/shlibs b/common/shlibs
index 1b340cc40c7..432efebf291 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,7 +3550,6 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
-libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libQuotient.so.0.6 libQuotient-0.6.5_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel
deleted file mode 120000
index 101819602ce..00000000000
--- a/srcpkgs/libqmatrixclient-devel
+++ /dev/null
@@ -1 +0,0 @@
-libqmatrixclient
\ No newline at end of file
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
deleted file mode 100644
index 8e6d8e4d7c8..00000000000
--- a/srcpkgs/libqmatrixclient/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libqmatrixclient'
-pkgname=libqmatrixclient
-version=0.5.3.2
-revision=1
-wrksrc="libQuotient-${version}"
-build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platform clients for Matrix"
-maintainer="Karol Kosek <krkkx@protonmail.com>"
-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=80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9
-
-libqmatrixclient-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0ff38b79c6f..fc5f052958f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=36
+revision=37
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -170,6 +170,7 @@ replaces="
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libqmatrixclient<=0.5.3.2_1
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (7 preceding siblings ...)
  2021-03-08  6:50 ` [PR PATCH] [Updated] " krkk
@ 2021-03-08  6:51 ` krkk
  2021-03-08  7:06 ` [PR REVIEW] " ericonr
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: krkk @ 2021-03-08  6:51 UTC (permalink / raw)
  To: ml

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

New comment by krkk on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#issuecomment-792516555

Comment:
@ericonr done

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (8 preceding siblings ...)
  2021-03-08  6:51 ` krkk
@ 2021-03-08  7:06 ` ericonr
  2021-03-08  7:21 ` [PR PATCH] [Updated] " krkk
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-03-08  7:06 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r589208399

Comment:
I still think this shouldn't be here. We don't want a repeat of https://github.com/void-linux/void-packages/issues/28779

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (9 preceding siblings ...)
  2021-03-08  7:06 ` [PR REVIEW] " ericonr
@ 2021-03-08  7:21 ` krkk
  2021-03-19 18:29 ` krkk
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: krkk @ 2021-03-08  7:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/krkk/void-packages quaternion
https://github.com/void-linux/void-packages/pull/29082

Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From f51a076df73862b38ee483b85b8a2a8247852d6a Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:06:21 +0100
Subject: [PATCH 1/3] New package: libQuotient-0.6.5

---
 common/shlibs                |  1 +
 srcpkgs/libQuotient-devel    |  1 +
 srcpkgs/libQuotient/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libQuotient-devel
 create mode 100644 srcpkgs/libQuotient/template

diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..1b340cc40c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3551,6 +3551,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
+libQuotient.so.0.6 libQuotient-0.6.5_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel
new file mode 120000
index 00000000000..b4566ff0d5b
--- /dev/null
+++ b/srcpkgs/libQuotient-devel
@@ -0,0 +1 @@
+libQuotient
\ No newline at end of file
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
new file mode 100644
index 00000000000..26442b201ae
--- /dev/null
+++ b/srcpkgs/libQuotient/template
@@ -0,0 +1,25 @@
+# Template file for 'libQuotient'
+pkgname=libQuotient
+version=0.6.5
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel qt5-multimedia-devel"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
+maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
+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=a22738fd6fd90c662174ca31348934c75f29fdbfcf7d86f471d2fcbf628c36ea
+
+libQuotient-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 6a7fe3980f79aa9d5712e06463142556307b6b94 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:07:41 +0100
Subject: [PATCH 2/3] Quaternion: update to 0.0.95.beta4.

---
 srcpkgs/Quaternion/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 47f72d33f24..f2e8416759e 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,19 +1,21 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.9.4e
+version=0.0.95.beta4
 revision=1
+_gitversion=0.0.95-beta4
+wrksrc="Quaternion-${_gitversion}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
- qt5-multimedia-devel libqmatrixclient-devel
+ qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel
  $(vopt_if qtkeychain qtkeychain-qt5-devel)"
-depends="qt5-quickcontrols"
+depends="qt5-quickcontrols qt5-graphicaleffects"
 short_desc="Qt5-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=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=058c6fe9c94ca7af5d467379bfe87603a5429b09fe8427d0b2c2f6824deaf1fe
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"

From 210b87f3d947abccb2031331176e7c365defdc3e Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:14:13 +0100
Subject: [PATCH 3/3] libqmatrixclient: remove package.

The package was only used for Quaternion<=0.0.9.4, but since the newer
versions use an API under a new name -- libQuotient, it can be removed.
---
 common/shlibs                     |  1 -
 srcpkgs/libqmatrixclient-devel    |  1 -
 srcpkgs/libqmatrixclient/template | 26 --------------------------
 3 files changed, 28 deletions(-)
 delete mode 120000 srcpkgs/libqmatrixclient-devel
 delete mode 100644 srcpkgs/libqmatrixclient/template

diff --git a/common/shlibs b/common/shlibs
index 1b340cc40c7..432efebf291 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,7 +3550,6 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
-libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libQuotient.so.0.6 libQuotient-0.6.5_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel
deleted file mode 120000
index 101819602ce..00000000000
--- a/srcpkgs/libqmatrixclient-devel
+++ /dev/null
@@ -1 +0,0 @@
-libqmatrixclient
\ No newline at end of file
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
deleted file mode 100644
index 8e6d8e4d7c8..00000000000
--- a/srcpkgs/libqmatrixclient/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libqmatrixclient'
-pkgname=libqmatrixclient
-version=0.5.3.2
-revision=1
-wrksrc="libQuotient-${version}"
-build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platform clients for Matrix"
-maintainer="Karol Kosek <krkkx@protonmail.com>"
-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=80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9
-
-libqmatrixclient-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (10 preceding siblings ...)
  2021-03-08  7:21 ` [PR PATCH] [Updated] " krkk
@ 2021-03-19 18:29 ` krkk
  2021-03-19 22:45 ` [PR REVIEW] Quaternion: update to 0.0.95.beta5., libqmatrixclient: rename and update to libQuotient-0.6.6 Chocimier
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: krkk @ 2021-03-19 18:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/krkk/void-packages quaternion
https://github.com/void-linux/void-packages/pull/29082

Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From ffd004c8ff5a9cbf422466544dc597f91fb1c082 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:06:21 +0100
Subject: [PATCH 1/3] New package: libQuotient-0.6.6

---
 common/shlibs                |  1 +
 srcpkgs/libQuotient-devel    |  1 +
 srcpkgs/libQuotient/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libQuotient-devel
 create mode 100644 srcpkgs/libQuotient/template

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..b3a7f3ac5c82 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3551,6 +3551,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.19.0 kodi-platform-20180302_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
+libQuotient.so.0.6 libQuotient-0.6.6_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
diff --git a/srcpkgs/libQuotient-devel b/srcpkgs/libQuotient-devel
new file mode 120000
index 000000000000..b4566ff0d5b9
--- /dev/null
+++ b/srcpkgs/libQuotient-devel
@@ -0,0 +1 @@
+libQuotient
\ No newline at end of file
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
new file mode 100644
index 000000000000..effd8dca3de2
--- /dev/null
+++ b/srcpkgs/libQuotient/template
@@ -0,0 +1,25 @@
+# Template file for 'libQuotient'
+pkgname=libQuotient
+version=0.6.6
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel qt5-multimedia-devel"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
+maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
+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=33d3da5a7045bbe2611dd73104279986dd8356b24de339dd10874c1a9417bba7
+
+libQuotient-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 5e3c206463f2cbab50eb9f2e17e98ce1cb5d61f6 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:07:41 +0100
Subject: [PATCH 2/3] Quaternion: update to 0.0.95.beta5.

---
 srcpkgs/Quaternion/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 47f72d33f243..e77415eec606 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,19 +1,21 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.9.4e
+version=0.0.95.beta5
 revision=1
+_gitversion=0.0.95-beta5
+wrksrc="Quaternion-${_gitversion}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
- qt5-multimedia-devel libqmatrixclient-devel
+ qt5-multimedia-devel qt5-quickcontrols2-devel libQuotient-devel
  $(vopt_if qtkeychain qtkeychain-qt5-devel)"
-depends="qt5-quickcontrols"
+depends="qt5-quickcontrols qt5-graphicaleffects"
 short_desc="Qt5-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=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
+distfiles="https://github.com/quotient-im/Quaternion/archive/${_gitversion}.tar.gz"
+checksum=8a8e469df29622af7c61fe501068dd6ff26bd02bf8a12096d3f9ebbb0179e82b
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"

From b86d6a6aeaacb350d3746d943acebc01116aef09 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 26 Feb 2021 21:14:13 +0100
Subject: [PATCH 3/3] libqmatrixclient: remove package.

The package was only used for Quaternion<=0.0.9.4, but since the newer
versions use an API under a new name -- libQuotient, it can be removed.
---
 common/shlibs                     |  1 -
 srcpkgs/libqmatrixclient-devel    |  1 -
 srcpkgs/libqmatrixclient/template | 26 --------------------------
 3 files changed, 28 deletions(-)
 delete mode 120000 srcpkgs/libqmatrixclient-devel
 delete mode 100644 srcpkgs/libqmatrixclient/template

diff --git a/common/shlibs b/common/shlibs
index b3a7f3ac5c82..9279e2c2585c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,7 +3550,6 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.19.0 kodi-platform-20180302_1
-libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libQuotient.so.0.6 libQuotient-0.6.6_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
diff --git a/srcpkgs/libqmatrixclient-devel b/srcpkgs/libqmatrixclient-devel
deleted file mode 120000
index 101819602ce8..000000000000
--- a/srcpkgs/libqmatrixclient-devel
+++ /dev/null
@@ -1 +0,0 @@
-libqmatrixclient
\ No newline at end of file
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
deleted file mode 100644
index 8e6d8e4d7c86..000000000000
--- a/srcpkgs/libqmatrixclient/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libqmatrixclient'
-pkgname=libqmatrixclient
-version=0.5.3.2
-revision=1
-wrksrc="libQuotient-${version}"
-build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platform clients for Matrix"
-maintainer="Karol Kosek <krkkx@protonmail.com>"
-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=80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9
-
-libqmatrixclient-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta5., libqmatrixclient: rename and update to libQuotient-0.6.6.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (11 preceding siblings ...)
  2021-03-19 18:29 ` krkk
@ 2021-03-19 22:45 ` Chocimier
  2021-03-24 22:03 ` krkk
  2021-04-01 16:42 ` [PR PATCH] [Merged]: " Johnnynator
  14 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2021-03-19 22:45 UTC (permalink / raw)
  To: ml

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r598009913

Comment:
0.0.9.4f marked as "latest" is just two months, use it if being new is main reason to prefer unstable thing.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Quaternion: update to 0.0.95.beta5., libqmatrixclient: rename and update to libQuotient-0.6.6.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (12 preceding siblings ...)
  2021-03-19 22:45 ` [PR REVIEW] Quaternion: update to 0.0.95.beta5., libqmatrixclient: rename and update to libQuotient-0.6.6 Chocimier
@ 2021-03-24 22:03 ` krkk
  2021-04-01 16:42 ` [PR PATCH] [Merged]: " Johnnynator
  14 siblings, 0 replies; 16+ messages in thread
From: krkk @ 2021-03-24 22:03 UTC (permalink / raw)
  To: ml

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

New review comment by krkk on void-packages repository

https://github.com/void-linux/void-packages/pull/29082#discussion_r600904101

Comment:
There's no reason to update to 0.0.9.4f since it has [the same code](https://github.com/quotient-im/Quaternion/compare/0.0.9.4e...0.0.9.4f) as 0.0.9.4e (which is from April 2020). It is just a rebuild for windows to use newer Qt: https://github.com/quotient-im/Quaternion/releases/tag/0.0.9.4f

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Merged]: Quaternion: update to 0.0.95.beta5., libqmatrixclient: rename and update to libQuotient-0.6.6.
  2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
                   ` (13 preceding siblings ...)
  2021-03-24 22:03 ` krkk
@ 2021-04-01 16:42 ` Johnnynator
  14 siblings, 0 replies; 16+ messages in thread
From: Johnnynator @ 2021-04-01 16:42 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

Quaternion: update to 0.0.95.beta5., libqmatrixclient: rename and update to libQuotient-0.6.6.
https://github.com/void-linux/void-packages/pull/29082

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

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

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-04-01 16:42 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-26 22:25 [PR PATCH] Quaternion: update to 0.0.95.beta4., libqmatrixclient: rename and update to libQuotient-0.6.5 krkk
2021-02-26 22:36 ` [PR REVIEW] " ericonr
2021-02-26 22:36 ` ericonr
2021-02-26 22:36 ` ericonr
2021-02-27  0:20 ` sgn
2021-02-27 18:46 ` [PR PATCH] [Updated] " krkk
2021-02-27 18:46 ` [PR REVIEW] " krkk
2021-03-08  3:56 ` ericonr
2021-03-08  6:50 ` [PR PATCH] [Updated] " krkk
2021-03-08  6:51 ` krkk
2021-03-08  7:06 ` [PR REVIEW] " ericonr
2021-03-08  7:21 ` [PR PATCH] [Updated] " krkk
2021-03-19 18:29 ` krkk
2021-03-19 22:45 ` [PR REVIEW] Quaternion: update to 0.0.95.beta5., libqmatrixclient: rename and update to libQuotient-0.6.6 Chocimier
2021-03-24 22:03 ` krkk
2021-04-01 16:42 ` [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).