Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] More KDE6
@ 2024-05-13 18:23 TinfoilSubmarine
  2024-05-14  2:54 ` [PR PATCH] [Updated] " sgn
  2024-05-14  2:58 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: TinfoilSubmarine @ 2024-05-13 18:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages update/plasma
https://github.com/void-linux/void-packages/pull/50317

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

#### 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/50317.patch is attached

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

From 6e53aa35e1e00c22422245651923171901728eb8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 12:45:14 -0400
Subject: [PATCH 01/10] pulseaudio-qt: update to 1.4.0.

---
 common/shlibs                  |  2 +-
 srcpkgs/pulseaudio-qt/template | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9220340b482a4a..c3a6cf8a42f099 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -564,7 +564,6 @@ libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
 libKF5PurposeWidgets.so.5 purpose-5.48.0_1
 libKF5Purpose.so.5 purpose-5.48.0_1
-libKF5PulseAudioQt.so.3 pulseaudio-qt-1.3_1
 libReviewboardHelpers.so.5 purpose-5.48.0_1
 libecpg_compat.so.3 postgresql-libs-16.1_1
 libecpg.so.6 postgresql-libs-16.1_1
@@ -2008,6 +2007,7 @@ libQuickCharts.so.1 kf6-kquickcharts-6.0.0_1
 libQuickChartsControls.so.1 kf6-kquickcharts-6.0.0_1
 libKF6Runner.so.6 kf6-krunner-6.0.0_1
 libKF6Service.so.6 kf6-kservice-6.0.0_1
+libKF6PulseAudioQt.so.4 pulseaudio-qt-1.4.0_1
 libKF6Solid.so.6 kf6-solid-6.0.0_1
 libKF6SonnetUi.so.6 kf6-sonnet-6.0.0_1
 libKF6SonnetCore.so.6 kf6-sonnet-6.0.0_1
diff --git a/srcpkgs/pulseaudio-qt/template b/srcpkgs/pulseaudio-qt/template
index e791d6d1fa975c..466767d7c176fc 100644
--- a/srcpkgs/pulseaudio-qt/template
+++ b/srcpkgs/pulseaudio-qt/template
@@ -1,17 +1,17 @@
 # Template file for 'pulseaudio-qt'
 pkgname=pulseaudio-qt
-version=1.3
-revision=2
+version=1.4.0
+revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools
- pkg-config AppStream"
-makedepends="qt5-declarative-devel pulseaudio-devel"
+configure_args="-DQT_MAJOR_VERSION=6"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools pkg-config AppStream"
+makedepends="qt6-declarative-devel pulseaudio-devel"
 short_desc="Pulseaudio bindings for Qt"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://phabricator.kde.org/source/pulseaudio-qt/"
 distfiles="${KDE_SITE}/pulseaudio-qt/${pkgname}-${version}.tar.xz"
-checksum=bceb07630d946fa0ce928b177687f618186cdef2309828188211d61a36589ec4
+checksum=d8ca624ecf2130856b859cf9341177f6fef8c51f20f7728d807d09c7150ed065
 
 pulseaudio-qt-devel_package() {
 	short_desc+=" - development"

From 8762e964038811dec856987c45fa2fe1f96c82c8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 12:45:53 -0400
Subject: [PATCH 02/10] kdeconnect: update to 24.02.2.

---
 common/shlibs               |  2 +-
 srcpkgs/kdeconnect/template | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c3a6cf8a42f099..3fe75668ec8a28 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3222,7 +3222,7 @@ libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
 libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
 libkdeconnectinterfaces.so.23 kdeconnect-23.04.0_1
-libkdeconnectcore.so.23 kdeconnect-23.04.0_1
+libkdeconnectcore.so.24 kdeconnect-24.02.2_1
 libkpmcore.so.12 kpmcore-22.04.1_1
 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.8.8 radare2-5.8.8_1
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index ad959045d028e5..e5996a7696f17b 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,25 +1,26 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  -DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools-devel
- kpackage-devel qt5-wayland kcoreaddons-devel gettext
- kcmutils-devel"
-makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
- qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel modemmanager-qt5-devel"
-depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols
- breeze-icons kpeoplevcard kirigami-addons qt5-tools"
+hostmakedepends="extra-cmake-modules qt6-tools
+ pkg-config wayland-devel qt6-base python3 kdoctools-devel
+ kf6-kpackage-devel qt6-wayland kf6-kcoreaddons-devel gettext
+ kf6-kcmutils-devel"
+makedepends="kf6-kcmutils-devel qca-qt6-devel kf6-frameworkintegration-devel
+ qt6-declarative-devel libfakekey-devel kf6-kwayland-devel qt6-multimedia-devel
+ kf6-kpeople-devel kf6-kirigami-devel kirigami-addons-devel
+ kf6-qqc2-desktop-style-devel pulseaudio-qt-devel kf6-modemmanager-qt-devel
+ kf6-kstatusnotifieritem-devel"
+depends="kde-cli-tools qca-qt6 fuse-sshfs kf6-kirigami qt6-declarative
+ breeze-icons kpeople kirigami-addons qt6-tools"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kdeconnect.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=4b42cd66f824b9ba2ddd09c7147b2abe6107ac866104033a78c0c46909300d64
+checksum=e804910d2b1ed4f5f6ce36915c79d11c55be6cee0f265d9234d96a2c27000dad
 python_version=3

From 9b801eca3b867485e7a9abd082a1aa6e3a8c9af4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 12:46:18 -0400
Subject: [PATCH 03/10] kwalletmanager: update to 24.02.2.

---
 srcpkgs/kwalletmanager/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 24f89ccd77ee81..69e03023a754b0 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,15 +1,15 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
- qt5-host-tools qt5-qmake"
-makedepends="kcmutils-devel kparts-devel qt5-devel"
+hostmakedepends="extra-cmake-modules gettext kf6-kauth kf6-kdoctools pkg-config
+ qt6-tools qt6-base"
+makedepends="kf6-kcmutils-devel kf6-kparts-devel kf6-kstatusnotifieritem-devel"
 short_desc="KDE Wallet Management Tools"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=391f8ac850719a60aac492b528de14c42e3a9121ff5cb47a5343c8623f9685b8
+checksum=0b63385f9f4932af00417eb1eb28548dedcc0506911304bf2e34479ac0f9b773

From 9107a5cf5c8fa38444010cfb504626dc7b783319 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 12:46:29 -0400
Subject: [PATCH 04/10] plasma-nm: update to 6.0.4.

---
 srcpkgs/plasma-nm/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 2f079dfc31d676..fc89ac71275187 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,19 +1,20 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.27.11
+version=6.0.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules mobile-broadband-provider-info pkg-config
- gettext qt5-qmake qt5-host-tools kpackage-devel kconfig-devel
+ gettext qt6-base qt6-tools kpackage-devel kconfig-devel
  kcoreaddons-devel plasma-framework kcmutils-devel"
-makedepends="plasma-workspace-devel networkmanager-qt5-devel kdelibs4support-devel
- kdesignerplugin-devel qca-qt5-devel modemmanager-qt5-devel kdoctools-devel
- openconnect-devel ksolid-devel"
+makedepends="plasma-workspace-devel kf6-networkmanager-qt-devel
+ kdelibs4support-devel kdesignerplugin-devel qca-qt6-devel
+ kf6-modemmanager-qt-devel kf6-kdoctools-devel openconnect-devel ksolid-devel
+ qt6-webengine-devel qcoro-qt6-devel"
 depends="mobile-broadband-provider-info"
 short_desc="NetworkManager Plasma applet"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ff6a819de2d48e17860d822b048de7157561742c067eb85a6dafa76e255e9e56
+checksum=64519d9d05fcb4f85c7b9c4708cc6f510e28fdc272b6d0e2a7a1efc03888c6df

From d336e34c07e8bd172f80b5e40a2187947814138a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 13:48:43 -0400
Subject: [PATCH 05/10] New package: kf6-libqmobipocket-24.02.2

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

diff --git a/common/shlibs b/common/shlibs
index 3fe75668ec8a28..01910941101e07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3254,6 +3254,7 @@ libykcs11.so.2 libykcs11-2.3.0_1
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
 libKExiv2Qt6.so.0 libkexiv2-24.02.0_1
 libqmobipocket.so.2 libqmobipocket-17.04.3_1
+libQMobipocket6.so.2 kf6-libqmobipocket-24.02.2_1
 libgloox.so.18 gloox-1.0.24_1
 libgsmsd.so.8 gammu-smsd-1.39.0_1
 libGammu.so.8 gammu-1.39.0_1
diff --git a/srcpkgs/kf6-libqmobipocket-devel b/srcpkgs/kf6-libqmobipocket-devel
new file mode 120000
index 00000000000000..d7f79d2053a7a8
--- /dev/null
+++ b/srcpkgs/kf6-libqmobipocket-devel
@@ -0,0 +1 @@
+kf6-libqmobipocket
\ No newline at end of file
diff --git a/srcpkgs/kf6-libqmobipocket/template b/srcpkgs/kf6-libqmobipocket/template
new file mode 100644
index 00000000000000..97fc7a9f1d8a69
--- /dev/null
+++ b/srcpkgs/kf6-libqmobipocket/template
@@ -0,0 +1,25 @@
+# Template file for 'kf6-libqmobipocket'
+pkgname=kf6-libqmobipocket
+version=24.02.2
+revision=1
+build_style=cmake
+configure_args="-DQT_MAJOR_VERSION=6"
+hostmakedepends="extra-cmake-modules kf6-kcoreaddons qt6-tools qt6-base gettext"
+makedepends="kf6-kio-devel"
+short_desc="Collection of plugins to handle mobipocket files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdegraphics-mobipocket"
+distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-mobipocket-${version}.tar.xz"
+checksum=911156160e4ac02f3026118de3f300896230f8e0a6bd7a7fcf5c95bc416cbd2a
+
+kf6-libqmobipocket-devel_package() {
+	short_desc+=" - development files"
+	depends="kf6-libqmobipocket>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 4c2340117fe4eefbe76a7e6df0a5c54a3e15753e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 13:49:05 -0400
Subject: [PATCH 06/10] kdegraphics-thumbnailers: update to 24.02.2.

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

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index e0bfeecbbf3650..3038da186f9120 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,17 +1,19 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
-makedepends="qt5-devel kio-devel libkexiv25-devel libqmobipocket-devel"
+configure_args="-DQT_MAJOR_VERSION=6"
+hostmakedepends="extra-cmake-modules kf6-kcoreaddons kf6-kconfig-devel
+ pkg-config gettext"
+makedepends="kf6-kio-devel libkexiv25-devel kf6-libqmobipocket-devel"
 depends="ghostscript"
-short_desc="KDE Plasma 5 Thumbnailers for various graphics file formats"
+short_desc="KDE Plasma 6 Thumbnailers for various graphics file formats"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=b05a040039fa079da026de8c296219e3718c4e142da823c6cfeaaea6d6986f30
+checksum=b96912cb499a3b514e1755f920b7aa251b154212fc3c3f894b84ab409fbaf30a
 
 kdegraphics-mobipocket_package() {
 	short_desc+=" (transitional dummy package)"

From 580237d588b5546bc36f62588fb56782a1561e06 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 13:29:22 -0400
Subject: [PATCH 07/10] libQuotient: update to 0.8.2.

---
 common/shlibs                |  2 +-
 srcpkgs/libQuotient/template | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 01910941101e07..dbd1d11fcecdb5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3685,7 +3685,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.8 libQuotient-0.8.1.2_1
+libQuotientQt6.so.0.8 libQuotient-0.8.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/template b/srcpkgs/libQuotient/template
index 1ced9dd725bfe0..e5003a29b7bf4f 100644
--- a/srcpkgs/libQuotient/template
+++ b/srcpkgs/libQuotient/template
@@ -1,20 +1,20 @@
 # Template file for 'libQuotient'
 pkgname=libQuotient
-version=0.8.1.2
+version=0.8.2
 revision=1
 build_style=cmake
 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 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"
+ -DBUILD_WITH_QT6=ON $(vopt_bool e2ee Quotient_ENABLE_E2EE)"
+hostmakedepends="qt6-base qt6-tools"
+makedepends="qt6-multimedia-devel qtkeychain-qt6-devel
+ $(vopt_if e2ee 'olm-devel openssl-devel qt6-plugin-mysql qt6-plugin-odbc
+ qt6-plugin-pgsql qt6-plugin-sqlite')"
+short_desc="Qt6 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=5e5539fe9616c9f63985b0aabfab1858f1626e3d71a14709eeedd85af0471c7c
+checksum=12ff2fa8b80a934b9dd88fa3416a4b88e94bc0e18a8df0dcebfc90614dd2f5c9
 
 build_options="e2ee"
 build_options_default="e2ee"

From d017d8ebe7f6ace2657bfc519674a8b41e745bf4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 13:49:12 -0400
Subject: [PATCH 08/10] kquickimageeditor: update to 0.3.0.

---
 srcpkgs/kquickimageeditor/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kquickimageeditor/template b/srcpkgs/kquickimageeditor/template
index a6bf3a1637c1c5..c64821eb624c68 100644
--- a/srcpkgs/kquickimageeditor/template
+++ b/srcpkgs/kquickimageeditor/template
@@ -1,16 +1,17 @@
 # Template file for 'kquickimageeditor'
 pkgname=kquickimageeditor
-version=0.2.0
+version=0.3.0
 revision=1
 build_style=cmake
-hostmakedepends="cmake extra-cmake-modules qt5-qmake qt5-host-tools"
-makedepends="qt5-declarative-devel"
+configure_args="-DQT_MAJOR_VERSION=6"
+hostmakedepends="cmake extra-cmake-modules qt6-base qt6-tools"
+makedepends="qt6-declarative-devel"
 short_desc="QML image editing components"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/libraries/kquickimageeditor"
 distfiles="${KDE_SITE}/kquickimageeditor/kquickimageeditor-${version}.tar.xz"
-checksum=3cfba775498e031f6963669ee0e4426d4fddd48a244b9583620de4d312ba92ca
+checksum=330ebf3653883eeebde54385d783c51c2d30ff77d41b294ece79af7e9c21c6f8
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
@@ -21,6 +22,6 @@ kquickimageeditor-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/lib/cmake
-		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt6/mkspecs
 	}
 }

From 430fac149d8b88b15c439b8e91244f33c11db6b6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 13:49:19 -0400
Subject: [PATCH 09/10] neochat: update to 24.02.2.

---
 .../patches/delegatesizehelpertest_fix.patch  | 38 -------------------
 .../patches/empty_image.source_crash.patch    | 25 ------------
 srcpkgs/neochat/template                      | 27 ++++++-------
 3 files changed, 14 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
 delete 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
deleted file mode 100644
index 947e354186028c..00000000000000
--- a/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644
index efc03cf5a72691..00000000000000
--- a/srcpkgs/neochat/patches/empty_image.source_crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 32f54054872d73..4e27737d230346 100644
--- a/srcpkgs/neochat/template
+++ b/srcpkgs/neochat/template
@@ -1,27 +1,28 @@
 # Template file for 'neochat'
 pkgname=neochat
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake
- qt5-host-tools kcoreaddons kconfig AppStream"
-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 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"
+hostmakedepends="extra-cmake-modules gettext pkg-config qt6-base
+ qt6-tools kf6-kcoreaddons kf6-kconfig AppStream"
+makedepends="kquickimageeditor-devel libQuotient-devel qtkeychain-qt6-devel
+ qt6-multimedia-devel kf6-kirigami-devel kf6-ki18n-devel cmark-devel
+ kf6-knotifications-devel kf6-kconfig-devel kf6-kcoreaddons-devel
+ kf6-qqc2-desktop-style-devel kf6-sonnet-devel kf6-kitemmodels-devel
+ kirigami-addons-devel kf6-kconfigwidgets-devel kf6-kio-devel qcoro-qt6-devel
+ olm-devel qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ kf6-kstatusnotifieritem-devel"
+depends="kquickimageeditor kf6-kitemmodels kf6-kirigami kirigami-addons
+ kf6-kquickcharts qt6-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=d300c6d8eb1dcc96b853c61a43e058ae923b939e3991755ddce1d9f210904632
+checksum=b6dce8f96be12bab0d762694f50c49cea18d6155e1e46549f0bf97046f04741e
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kdoctools"
+	hostmakedepends+=" kf6-kdoctools"
 fi
 
 post_install() {

From 8adeba53ff42d8fb67623a017ff5cc2a5c26e4fa Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 13:59:24 -0400
Subject: [PATCH 10/10] Quaternion: update to 0.0.96.1.

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

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 8f5eb751596562..2871dd424c170d 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,20 +1,16 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.96
+version=0.0.96.1
 revision=1
 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
- 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"
+hostmakedepends="qt6-base qt6-tools"
+makedepends="qt6-declarative-devel qt6-tools-devel qt6-multimedia-devel
+ libQuotient-devel qtkeychain-qt6-devel olm-devel"
 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=39868fbae40c36ebcd1a955cb65e953c4a1b9b74e9c1b9e2c838a0ce77ce5ac0
+checksum=ad5c536dfee5d85abf7bd2dbd3379188f5b30c6ecf7ed3566a9f59a299b6c365
 
 CXXFLAGS="-Wno-deprecated-declarations"

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-14  2:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-13 18:23 [PR PATCH] More KDE6 TinfoilSubmarine
2024-05-14  2:54 ` [PR PATCH] [Updated] " sgn
2024-05-14  2:58 ` [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).