Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] nheko 0.12.0
@ 2024-06-13 10:14 balejk
  2024-06-13 10:37 ` [PR PATCH] [Updated] " balejk
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: balejk @ 2024-06-13 10:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/balejk/void-packages nheko-0.12.0
https://github.com/void-linux/void-packages/pull/50814

nheko 0.12.0
- **mtxclient: update to 0.10.0.**
- **nheko: update to 0.12.0.**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: Basic usage, not calls.

<!--
#### 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, (x86_64-musl)


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

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

From 674dd543791c506eabb6502a545738edd2af1400 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:20 +0200
Subject: [PATCH 1/2] mtxclient: update to 0.10.0.

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

diff --git a/common/shlibs b/common/shlibs
index b6017a715ced19..2640879f54f2e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -427,7 +427,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
+libmatrix_client.so.0.10.0 mtxclient-0.10.0_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index bcabd901a0b29c..77413cbf199095 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.9.2
-revision=2
+version=0.10.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56
+checksum=9502e0a999d2873172d50bb80371c061266126c7d4db8e44447eb70c977b0230
 
 post_install() {
 	vlicense LICENSE

From 024a0fb06fc91c13c273d45ffa1912d2794e0813 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:33 +0200
Subject: [PATCH 2/2] nheko: update to 0.12.0.

---
 srcpkgs/nheko/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 8bce950cf3c3ca..a83fffc76010c1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,22 +1,21 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.11.3
+version=0.12.0
 revision=1
 build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
-makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
+hostmakedepends="qt6-declarative-host-tools pkg-config qt6-declarative asciidoc"
+makedepends="qt6-multimedia-devel qt6-svg-devel qt6-tools-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
- qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
- gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel re2-devel"
-depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
- qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5"
+ qt6-declarative-devel qtkeychain-qt6-devel gst-plugins-bad1-devel
+ gst-plugins-base1-devel xcb-util-wm-devel re2-devel KDSingleApplication"
+depends="hicolor-icon-theme gst-plugins-good1"
 short_desc="Desktop client for Matrix using Qt and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nheko-reborn.github.io"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37
+checksum=a3a7578bd9386a0b9a4188fa1296fdddb7df0f846c39728b80a998f9d06f36d1
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

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

* Re: [PR PATCH] [Updated] nheko 0.12.0
  2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
@ 2024-06-13 10:37 ` balejk
  2024-06-13 13:26 ` balejk
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: balejk @ 2024-06-13 10:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/balejk/void-packages nheko-0.12.0
https://github.com/void-linux/void-packages/pull/50814

nheko 0.12.0
- **mtxclient: update to 0.10.0.**
- **nheko: update to 0.12.0.**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: Basic usage, not calls.

<!--
#### 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, (x86_64-musl)


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

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

From 674dd543791c506eabb6502a545738edd2af1400 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:20 +0200
Subject: [PATCH 1/2] mtxclient: update to 0.10.0.

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

diff --git a/common/shlibs b/common/shlibs
index b6017a715ced19..2640879f54f2e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -427,7 +427,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
+libmatrix_client.so.0.10.0 mtxclient-0.10.0_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index bcabd901a0b29c..77413cbf199095 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.9.2
-revision=2
+version=0.10.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56
+checksum=9502e0a999d2873172d50bb80371c061266126c7d4db8e44447eb70c977b0230
 
 post_install() {
 	vlicense LICENSE

From b1b0f10bbf38e6d3a62c1c3b237714b5621e5c71 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:33 +0200
Subject: [PATCH 2/2] nheko: update to 0.12.0.

---
 srcpkgs/nheko/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 8bce950cf3c3ca..24da6ff6f6d885 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,22 +1,21 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.11.3
+version=0.12.0
 revision=1
 build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
-makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
+hostmakedepends="qt6-tools pkg-config qt6-declarative asciidoc"
+makedepends="qt6-multimedia-devel qt6-svg-devel qt6-tools-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
- qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
- gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel re2-devel"
-depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
- qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5"
+ qt6-declarative-devel qtkeychain-qt6-devel gst-plugins-bad1-devel
+ gst-plugins-base1-devel xcb-util-wm-devel re2-devel KDSingleApplication"
+depends="hicolor-icon-theme gst-plugins-good1"
 short_desc="Desktop client for Matrix using Qt and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nheko-reborn.github.io"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37
+checksum=a3a7578bd9386a0b9a4188fa1296fdddb7df0f846c39728b80a998f9d06f36d1
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

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

* Re: [PR PATCH] [Updated] nheko 0.12.0
  2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
  2024-06-13 10:37 ` [PR PATCH] [Updated] " balejk
@ 2024-06-13 13:26 ` balejk
  2024-06-13 14:02 ` balejk
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: balejk @ 2024-06-13 13:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/balejk/void-packages nheko-0.12.0
https://github.com/void-linux/void-packages/pull/50814

nheko 0.12.0
- **mtxclient: update to 0.10.0.**
- **nheko: update to 0.12.0.**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: Basic usage, not calls.

<!--
#### 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, (x86_64-musl)


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

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

From 674dd543791c506eabb6502a545738edd2af1400 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:20 +0200
Subject: [PATCH 1/2] mtxclient: update to 0.10.0.

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

diff --git a/common/shlibs b/common/shlibs
index b6017a715ced19..2640879f54f2e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -427,7 +427,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
+libmatrix_client.so.0.10.0 mtxclient-0.10.0_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index bcabd901a0b29c..77413cbf199095 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.9.2
-revision=2
+version=0.10.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56
+checksum=9502e0a999d2873172d50bb80371c061266126c7d4db8e44447eb70c977b0230
 
 post_install() {
 	vlicense LICENSE

From 39a6422a8c6080f54399b22b333f479e84c31704 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:33 +0200
Subject: [PATCH 2/2] nheko: update to 0.12.0.

---
 srcpkgs/nheko/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 8bce950cf3c3ca..190c58166972f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,22 +1,21 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.11.3
+version=0.12.0
 revision=1
 build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
-makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
+hostmakedepends="qt6-base qt6-tools qt6-declarative-tools pkg-config asciidoc"
+makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
- qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
- gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel re2-devel"
-depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
- qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5"
+ qtkeychain-qt6-devel gst-plugins-bad1-devel gst-plugins-base1-devel
+ xcb-util-wm-devel re2-devel KDSingleApplication"
+depends="hicolor-icon-theme gst-plugins-good1"
 short_desc="Desktop client for Matrix using Qt and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nheko-reborn.github.io"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37
+checksum=a3a7578bd9386a0b9a4188fa1296fdddb7df0f846c39728b80a998f9d06f36d1
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)
@@ -24,3 +23,11 @@ case "$XBPS_TARGET_MACHINE" in
 		configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lunwind" ;;
 	*) ;;
 esac
+
+pre_build() {
+	# This is because qt6-declarative-tools is also pulled through
+	# qt6-declarative-devel from makedepends and takes precedence causing
+	# exec format errors when cross compiling. We thus need to force the
+	# build to use the host binaries.
+	vsed -i build/build.ninja -e "s:${XBPS_CROSS_BASE}/usr/lib${XBPS_TARGET_WORDSIZE}/qt6/libexec/\(qmlcachegen\|qmlimportscanner\|qmltyperegistrar\):/usr/lib/qt6/libexec/\1:"
+}

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

* Re: nheko 0.12.0
  2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
  2024-06-13 10:37 ` [PR PATCH] [Updated] " balejk
  2024-06-13 13:26 ` balejk
@ 2024-06-13 14:02 ` balejk
  2024-06-13 14:12 ` [PR REVIEW] " Johnnynator
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: balejk @ 2024-06-13 14:02 UTC (permalink / raw)
  To: ml

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

New comment by balejk on void-packages repository

https://github.com/void-linux/void-packages/pull/50814#issuecomment-2165769719

Comment:
Cc: @Johnnynator for Qt: Would you please take a look and let me know if this can be done in a better way or if the workaround is indeed needed?


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

* Re: [PR REVIEW] nheko 0.12.0
  2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
                   ` (2 preceding siblings ...)
  2024-06-13 14:02 ` balejk
@ 2024-06-13 14:12 ` Johnnynator
  2024-06-13 14:31 ` [PR PATCH] [Updated] " balejk
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2024-06-13 14:12 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/50814#discussion_r1638295044

Comment:
You most likely only need `qt6-declarative-host-tools` and  can drop the workaround in `pre_build` that way

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

* Re: [PR PATCH] [Updated] nheko 0.12.0
  2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
                   ` (3 preceding siblings ...)
  2024-06-13 14:12 ` [PR REVIEW] " Johnnynator
@ 2024-06-13 14:31 ` balejk
  2024-06-13 14:48 ` balejk
  2024-06-14 10:07 ` [PR PATCH] [Merged]: " sgn
  6 siblings, 0 replies; 8+ messages in thread
From: balejk @ 2024-06-13 14:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/balejk/void-packages nheko-0.12.0
https://github.com/void-linux/void-packages/pull/50814

nheko 0.12.0
- **mtxclient: update to 0.10.0.**
- **nheko: update to 0.12.0.**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: Basic usage, not calls.

<!--
#### 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, (x86_64-musl)


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

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

From 674dd543791c506eabb6502a545738edd2af1400 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:20 +0200
Subject: [PATCH 1/2] mtxclient: update to 0.10.0.

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

diff --git a/common/shlibs b/common/shlibs
index b6017a715ced19..2640879f54f2e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -427,7 +427,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
+libmatrix_client.so.0.10.0 mtxclient-0.10.0_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index bcabd901a0b29c..77413cbf199095 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.9.2
-revision=2
+version=0.10.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56
+checksum=9502e0a999d2873172d50bb80371c061266126c7d4db8e44447eb70c977b0230
 
 post_install() {
 	vlicense LICENSE

From f35bbf46a2fe831b8a27b013deab3d3074e89c53 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Thu, 13 Jun 2024 11:47:33 +0200
Subject: [PATCH 2/2] nheko: update to 0.12.0.

---
 srcpkgs/nheko/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 8bce950cf3c3ca..f9c7044b609174 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,22 +1,21 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.11.3
+version=0.12.0
 revision=1
 build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
-makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
+hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
+makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
- qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
- gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel re2-devel"
-depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
- qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5"
+ qtkeychain-qt6-devel gst-plugins-bad1-devel gst-plugins-base1-devel
+ xcb-util-wm-devel re2-devel KDSingleApplication"
+depends="hicolor-icon-theme gst-plugins-good1"
 short_desc="Desktop client for Matrix using Qt and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nheko-reborn.github.io"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37
+checksum=a3a7578bd9386a0b9a4188fa1296fdddb7df0f846c39728b80a998f9d06f36d1
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

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

* Re: nheko 0.12.0
  2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
                   ` (4 preceding siblings ...)
  2024-06-13 14:31 ` [PR PATCH] [Updated] " balejk
@ 2024-06-13 14:48 ` balejk
  2024-06-14 10:07 ` [PR PATCH] [Merged]: " sgn
  6 siblings, 0 replies; 8+ messages in thread
From: balejk @ 2024-06-13 14:48 UTC (permalink / raw)
  To: ml

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

New comment by balejk on void-packages repository

https://github.com/void-linux/void-packages/pull/50814#issuecomment-2165896413

Comment:
Indeed, thank you!


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

* Re: [PR PATCH] [Merged]: nheko 0.12.0
  2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
                   ` (5 preceding siblings ...)
  2024-06-13 14:48 ` balejk
@ 2024-06-14 10:07 ` sgn
  6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-06-14 10:07 UTC (permalink / raw)
  To: ml

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

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

nheko 0.12.0
https://github.com/void-linux/void-packages/pull/50814

Description:
- **mtxclient: update to 0.10.0.**
- **nheko: update to 0.12.0.**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: Basic usage, not calls.

<!--
#### 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, (x86_64-musl)


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

end of thread, other threads:[~2024-06-14 10:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-13 10:14 [PR PATCH] nheko 0.12.0 balejk
2024-06-13 10:37 ` [PR PATCH] [Updated] " balejk
2024-06-13 13:26 ` balejk
2024-06-13 14:02 ` balejk
2024-06-13 14:12 ` [PR REVIEW] " Johnnynator
2024-06-13 14:31 ` [PR PATCH] [Updated] " balejk
2024-06-13 14:48 ` balejk
2024-06-14 10:07 ` [PR PATCH] [Merged]: " sgn

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).