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

* Re: [PR PATCH] [Updated] More KDE6
  2024-05-13 18:23 [PR PATCH] More KDE6 TinfoilSubmarine
@ 2024-05-14  2:54 ` sgn
  2024-05-14  2:58 ` [PR PATCH] [Merged]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2024-05-14  2:54 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn 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: 58857 bytes --]

From 6bc78a7b60880db18dcb951fa2cdbdf0fa071bac Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sun, 10 Mar 2024 12:51:44 +0500
Subject: [PATCH 01/25] kpmcore: update to 24.02.2.

---
 srcpkgs/kpmcore/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index 2c993d7bac9c9e..1353eaf6fc1e94 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,13 +1,14 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules python3 qt5-devel qt5-qmake pkg-config kcoreaddons
-gettext kauth"
-makedepends="qt5-devel libatasmart-devel libparted-devel kwidgetsaddons-devel ki18n-devel
- polkit-qt5-devel kauth-devel kcoreaddons-devel qca-qt5-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base-devel qt6-base pkg-config kf6-kcoreaddons
+gettext kf6-kauth-tools"
+makedepends="qt6-base-devel libatasmart-devel libparted-devel kf6-kwidgetsaddons-devel kf6-ki18n-devel
+ polkit-qt6-devel kauth-devel kf6-kcoreaddons-devel"
 depends="parted"
 short_desc="Library for managing partitions"
 maintainer="jambonmcyeah <jambonmcyeah@gmail.com>"
@@ -15,11 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://apps.kde.org/partitionmanager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpmcore"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpmcore-${version}.tar.xz"
-checksum=b44a40712de593ddfe4cc5799912eb53f9c3e383544306a17279f051de85417a
-
-if [ -n "$CROSS_BUILD" ]; then
-	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-fi
+checksum=29d3909ad5cbbfa1e5bd772c97be4825407ae6e5efeb5a6ddee5b005c99654bf
 
 kpmcore-devel_package() {
 	short_desc+=" - development"

From 5cb3aae8de9d77c630cf82f2714f29d96e51b923 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sun, 10 Mar 2024 12:53:25 +0500
Subject: [PATCH 02/25] partitionmanager: update to 24.02.2.

---
 srcpkgs/partitionmanager/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/partitionmanager/template b/srcpkgs/partitionmanager/template
index f9f719749215bd..cc2f859e872f17 100644
--- a/srcpkgs/partitionmanager/template
+++ b/srcpkgs/partitionmanager/template
@@ -1,13 +1,14 @@
 # Template file for 'partitionmanager'
 pkgname=partitionmanager
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="qt5-devel kdoctools kconfig qt5-qmake cmake python3
- extra-cmake-modules pkg-config gettext kcoreaddons"
-makedepends="qt5-devel kconfig-devel kpmcore-devel kdoctools-devel
- kservice-devel kio-devel kxmlgui-devel kiconthemes-devel kconfigwidgets-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="qt6-base-devel kf6-kdoctools kf6-kconfig qt6-base
+ extra-cmake-modules pkg-config gettext kf6-kcoreaddons"
+makedepends="qt6-base-devel kf6-kconfig-devel kpmcore-devel kf6-kdoctools-devel
+ kf6-kservice-devel kf6-kio-devel kf6-kxmlgui-devel kf6-kiconthemes-devel kf6-kconfigwidgets-devel"
 depends="hicolor-icon-theme"
 short_desc="KDE utility that allows you to manage disks"
 maintainer="jambonmcyeah <jambonmcyeah@gmail.com>"
@@ -15,8 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://apps.kde.org/partitionmanager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#partitionmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/partitionmanager-${version}.tar.xz"
-checksum=983adee6730f49bf17904129b5152d1092d3cc8f16cde045b6b18244ebd30834
-
-if [ -n "$CROSS_BUILD" ]; then
-	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-fi
+checksum=02cb72008cafdc99db5742daa0df634b6ea07dcef3fa440a243e5628a938f509

From 5af9fb3015bee0d16ac04209c176d2a93253dee6 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 9 Mar 2024 22:59:35 +0500
Subject: [PATCH 03/25] ark: update to 24.02.2.

---
 srcpkgs/ark/patches/disable-xar-test.patch | 54 ----------------------
 srcpkgs/ark/template                       | 13 +++---
 2 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/ark/patches/disable-xar-test.patch

diff --git a/srcpkgs/ark/patches/disable-xar-test.patch b/srcpkgs/ark/patches/disable-xar-test.patch
deleted file mode 100644
index 8fd56287fd70b6..00000000000000
--- a/srcpkgs/ark/patches/disable-xar-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1bbfda77ea96fb8399a4c12c0c096a52371e5864 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Wed, 11 Mar 2020 23:02:33 +0100
-Subject: [PATCH] disable xar test
-
-
-diff --git autotests/kerfuffle/extracttest.cpp autotests/kerfuffle/extracttest.cpp
-index 9178611..c1d3f13 100644
---- a/autotests/kerfuffle/extracttest.cpp
-+++ b/autotests/kerfuffle/extracttest.cpp
-@@ -350,23 +350,6 @@ void ExtractTest::testExtraction_data()
-         qDebug() << "lz4 executable not found in path. Skipping lz4 test.";
-     }
-
--    archivePath = QFINDTESTDATA("data/simplearchive.xar");
--    QTest::newRow("extract selected entries from a xar archive without path")
--            << archivePath
--            << QVector<Archive::Entry*> {
--                   new Archive::Entry(this, QStringLiteral("dir1/file11.txt"), QString()),
--                   new Archive::Entry(this, QStringLiteral("file4.txt"), QString())
--               }
--            << optionsNoPaths
--            << 2;
--
--    archivePath = QFINDTESTDATA("data/simplearchive.xar");
--    QTest::newRow("extract all entries from a xar archive with path")
--            << archivePath
--            << QVector<Archive::Entry*>()
--            << optionsPreservePaths
--            << 6;
--
-     archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage");
-     QTest::newRow("extract all entries from an AppImage with path")
-             << archivePath
-
---- ark-23.08.0/autotests/kerfuffle/loadtest.cpp	2023-08-16 22:56:56.000000000 +0200
-+++ -	2023-09-11 22:52:41.215856157 +0200
-@@ -195,13 +195,6 @@
-         qDebug() << "lz4 executable not found in path. Skipping lz4 test.";
-     }
- 
--    QTest::newRow("xar archive")
--            << QFINDTESTDATA("data/simplearchive.xar")
--            << QStringLiteral("simplearchive")
--            << true << false << false << false << false << 0 << Archive::Unencrypted << 6
--            << QStringLiteral("simplearchive")
--            << QString();
--
-     QTest::newRow("mimetype child of application/zip")
-             << QFINDTESTDATA("data/test.odt")
-             << QStringLiteral("test")
---
-2.23.0
-
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 4b6c16e5390255..1a5865e1e0fa68 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,19 +1,20 @@
 # Template file for 'ark'
 pkgname=ark
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake
- kdoctools kconfig gettext pkg-config python3 kcoreaddons kparts"
-makedepends="libarchive-devel kpty-devel kparts-devel kitemmodels-devel libzip-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-base gettext
+ kf6-kdoctools kf6-kconfig pkg-config python3 kf6-kcoreaddons"
+makedepends="libarchive-devel kf6-kpty-devel kf6-kparts-devel kf6-kitemmodels-devel libzip-devel kf6-kfilemetadata-devel kf6-kdbusaddons-devel kf6-kdoctools-devel kf6-ki18n-devel kf6-kio-devel kf6-kwindowsystem-devel kf6-kiconthemes-devel kf6-kwidgetsaddons-devel kf6-kconfig-devel kf6-kcrash-devel"
 checkdepends="p7zip p7zip-unrar lzop lrzip unrar unzip zip zstd"
 short_desc="KDE Archiving Tool"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6081c564e2d4e25113691483d2cf3843461a9db6c726e1e547fa9a9697aecfeb
+checksum=06374f5c7c2aee7a93c04bfd7b6b3baaeab3962e8277c9087fea54ba9805bdce
 
 do_check() {
 	cd build

From 9dbe8fc5d29fca74a0fc298d720c1da415b2ba05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 14 May 2024 09:39:21 +0700
Subject: [PATCH 04/25] New package: libqmobipocket6-24.02.2

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

diff --git a/common/shlibs b/common/shlibs
index 8f0811c72c81ac..a3ed1b92a60fd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3263,6 +3263,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 libqmobipocket6-24.02.0_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/libqmobipocket6-devel b/srcpkgs/libqmobipocket6-devel
new file mode 120000
index 00000000000000..ef0031aeeb5d6e
--- /dev/null
+++ b/srcpkgs/libqmobipocket6-devel
@@ -0,0 +1 @@
+libqmobipocket6
\ No newline at end of file
diff --git a/srcpkgs/libqmobipocket6/template b/srcpkgs/libqmobipocket6/template
new file mode 100644
index 00000000000000..d399992a3c531c
--- /dev/null
+++ b/srcpkgs/libqmobipocket6/template
@@ -0,0 +1,25 @@
+# Template file for 'libqmobipocket6'
+pkgname=libqmobipocket6
+version=24.02.2
+revision=1
+build_style=cmake
+configure_args="-DQT_MAJOR_VERSION=6"
+hostmakedepends="extra-cmake-modules qt6-base gettext"
+makedepends="kf6-kconfig-devel qt6-qt5compat-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
+
+libqmobipocket6-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 45f37c75af7d844520ed03e2aef95a26ce6cb86d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 13 May 2024 13:49:05 -0400
Subject: [PATCH 05/25] 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..7d13e11b5936d6 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 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules kf6-kcoreaddons kf6-kconfig
+ pkg-config gettext"
+makedepends="kf6-kio-devel libkexiv25-devel libqmobipocket6-devel kf6-kconfig-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 f3723e46cecafe0eba6c0457a89991056ad05f03 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 9 Mar 2024 23:30:33 +0500
Subject: [PATCH 06/25] okular: update to 24.02.2.

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

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f87feaf139dd50..4686abcc138b54 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,14 +1,21 @@
 # Template file for 'okular'
 pkgname=okular
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
- qt5-qmake qt5-host-tools kdoctools kconfig"
-makedepends="discount-devel djvulibre-devel ebook-tools-devel khtml-devel
- kpty-devel libchmlib-devel libkexiv25-devel libqmobipocket-devel
- libspectre-devel libzip-devel plasma-framework-devel poppler-qt5-devel
- purpose-devel qca-qt5-devel qt5-speech-devel threadweaver-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules pkg-config qt6-base gettext
+ kf6-kcoreaddons kf6-kdoctools kf6-kconfig"
+makedepends="discount-devel djvulibre-devel ebook-tools-devel phonon-devel
+ libchmlib-devel libkexiv25-devel poppler-qt6-devel libspectre-devel
+ libqmobipocket6-devel libzip-devel libkexiv2-devel qca-qt6-devel
+ qt6-speech-devel kf6-purpose-devel kf6-kbookmarks-devel
+ kf6-kcompletion-devel kf6-kconfig-devel
+ kf6-kconfigwidgets-devel kf6-kcoreaddons-devel kf6-kcrash-devel
+ kf6-kdoctools-devel kf6-kiconthemes-devel kf6-kio-devel kf6-kirigami-devel
+ kf6-kparts-devel kf6-kpty-devel kf6-kwallet-devel kf6-kwindowsystem-devel
+ kf6-threadweaver-devel kf6-ktextwidgets-devel plasma-activities-devel"
 depends="hicolor-icon-theme"
 checkdepends="ebook-tools dbus"
 short_desc="KDE Document Viewer"
@@ -16,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d5d51f69b176a250907ee70e8f97143fc9d705cee3ef7ff448626c8a529ce364
+checksum=431d36b72bec3954b53f625ff850740e9dff0087b03bc7b71699ca46aeef04de
 
 do_check() {
 	cd build

From ec22cecc87b338a6811ea91ca8c12428f9b3bfe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 08:37:37 +0700
Subject: [PATCH 07/25] kwalletmanager: update to 24.02.2.

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

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 24f89ccd77ee81..6932db32c74c6f 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,15 +1,17 @@
 # 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"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext kf6-kdoctools pkg-config
+ qt6-base qt6-tools kf6-kauth-tools kf6-kconfig kf6-kcmutils"
+makedepends="kf6-kauth-devel kf6-karchive-devel kf6-kconfig-devel kf6-kconfigwidgets-devel kf6-kdbusaddons-devel kf6-kdoctools-devel kf6-ki18n-devel kf6-kcmutils-devel kf6-kio-devel kf6-kwallet-devel kf6-kwindowsystem-devel kf6-kxmlgui-devel kf6-kcrash-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 018563aad6a86eb7df0a83243a1c8b3a2f578338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 08:38:05 +0700
Subject: [PATCH 08/25] kcron: update to 24.02.2.

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

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index d9d5a28df47112..61cb9e27954bb7 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,16 +1,17 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
- kauth pkg-config qt5-host-tools qt5-qmake kcmutils-devel"
-makedepends="kparts-devel kcmutils-devel qt5-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext kf6-kcoreaddons kf6-kdoctools
+ kf6-kauth-tools pkg-config qt6-base kf6-kcmutils"
+makedepends="kf6-kio-devel kf6-kconfigwidgets-devel kf6-kauth-devel kf6-kcoreaddons-devel kf6-ki18n-devel kf6-kio-devel kf6-kcmutils-devel"
 short_desc="KDE Configure and schedule tasks"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=02e9e34137fd5425948d87dfa47f1c09a979038f7c41e6304bbdd67d859ddc42
+checksum=2c55878af458cfc7b83ccf592da571736932c27d82412043319b71eebad710b5

From 53713dee5513d9b725f08f2105808a162a37c550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 08:38:33 +0700
Subject: [PATCH 09/25] kcharselect: update to 24.02.2.

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

diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template
index ee75cc72456d48..cb484fc41b3f66 100644
--- a/srcpkgs/kcharselect/template
+++ b/srcpkgs/kcharselect/template
@@ -1,18 +1,18 @@
 # Template file for 'kcharselect'
 pkgname=kcharselect
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons gettext"
-makedepends="qt5-devel kbookmarks-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules kf6-kcoreaddons gettext qt6-base qt6-tools
+ kf6-kconfig kf6-kdoctools python3"
+makedepends="kf6-kbookmarks-devel kf6-kcoreaddons-devel kf6-kcrash-devel kf6-ki18n-devel
+ kf6-kwidgetsaddons-devel kf6-kxmlgui-devel"
 short_desc="Character Selector"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kcharselect"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcharselect"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcharselect-${version}.tar.xz"
-checksum=bf22326c021188261031219c95b507524e3c1f0875de2ca87cf2dc940de86386
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kdoctools python3 qt5-host-tools qt5-qmake"
-fi
+checksum=a1854455137cc65f79d7c710246c16bfd0dd55831ba1c1fcf2146e891e29fd25

From f638bc226b36c414de05026cb1e288bf6e9b2796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 08:39:53 +0700
Subject: [PATCH 10/25] kcolorchooser: update to 24.02.2.

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

diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template
index 490b7f44c0a135..189cdae3d6fa47 100644
--- a/srcpkgs/kcolorchooser/template
+++ b/srcpkgs/kcolorchooser/template
@@ -1,21 +1,20 @@
 # Template file for 'kcolorchooser'
 pkgname=kcolorchooser
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons gettext"
-makedepends="qt5-devel kxmlgui-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules kf6-kcoreaddons gettext qt6-tools qt6-base
+ kf6-kcoreaddons kf6-kconfig"
+makedepends="qt6-base-devel kf6-kcoreaddons-devel kf6-ki18n-devel kf6-kxmlgui-devel"
 short_desc="KDE's Color Chooser"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://kde.org/applications/en/graphics/org.kde.kcolorchooser"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcolorchooser"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcolorchooser-${version}.tar.xz"
-checksum=c62a78191f423b7774930165424165e8866c16189b941323da1321f79992bb21
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
+checksum=7f1d7c7bfda80cf627a72beb62d0944e052873f48804ee99aaec1339198005ac
 
 post_install() {
 	vlicense COPYING

From 5d18f8d8549aa71edaa04f5140cdc07022d93575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 08:41:19 +0700
Subject: [PATCH 11/25] kcachegrind: update to 24.02.2.

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

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 9379d6baf3391c..18978923d568de 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,11 +1,15 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
- pkg-config qt5-host-tools qt5-qmake"
-makedepends="kparts-devel qt5-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext kf6-kcoreaddons kf6-kdoctools kf6-kconfig
+ pkg-config qt6-tools qt6-base"
+makedepends="kf6-karchive-devel kf6-kcoreaddons-devel kf6-kdoctools-devel
+ kf6-kwidgetsaddons-devel kf6-kxmlgui-devel kf6-ki18n-devel kf6-kconfig-devel
+ kf6-kio-devel kf6-kdbusaddons-devel"
 depends="python3 hicolor-icon-theme"
 short_desc="Visualization of Performance Profiling Data"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -13,5 +17,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=056687b7adb0049db0503738cf95a7051f3b889b3313fa8b78dc7d03c3dbb7b6
+checksum=1c43099fa42a389e9ff92613b550e6606a9de9d5b57a10a4b08ab513e5a67b9c
 python_version=3

From 1f2441dc736f41b4431f089f61389e57715fa273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 10:25:28 +0700
Subject: [PATCH 12/25] Quaternion: update to 0.0.96.1.

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

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 8f5eb751596562..cd564ce77aea4f 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,20 +1,18 @@
 # 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-declarative-host-tools qt6-tools"
+makedepends="qt6-declarative-devel libQuotient-devel
+ qtkeychain-qt6-devel olm-devel qt6-plugin-mysql qt6-plugin-odbc
+ qt6-plugin-pgsql qt6-plugin-sqlite qt6-plugin-tds"
+depends="qt6-declarative"
 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"

From 5d67fab916edabea578752fa70e574efb43962fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 13:30:59 +0700
Subject: [PATCH 13/25] New package: qt6-webview-6.6.0

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-webview-devel    |  1 +
 srcpkgs/qt6-webview/template | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-webview-devel
 create mode 100644 srcpkgs/qt6-webview/template

diff --git a/common/shlibs b/common/shlibs
index a3ed1b92a60fd9..2333bd7d734bf4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2157,6 +2157,8 @@ libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libQt6TextToSpeech.so.6 qt6-speech-6.6.0_1
 libQt6JsonRpc.so.6 qt6-languageserver-6.6.0_1
 libQt6LanguageServer.so.6 qt6-languageserver-6.6.0_1
+libQt6WebView.so.6 qt6-webview-6.6.0_1
+libQt6WebViewQuick.so.6 qt6-webview-6.6.0_1
 libQCoro6Core.so.0 qcoro-qt6-0.10.0_1
 libQCoro6DBus.so.0 qcoro-qt6-0.10.0_1
 libQCoro6Network.so.0 qcoro-qt6-0.10.0_1
diff --git a/srcpkgs/qt6-webview-devel b/srcpkgs/qt6-webview-devel
new file mode 120000
index 00000000000000..12aa5bd8a7cb31
--- /dev/null
+++ b/srcpkgs/qt6-webview-devel
@@ -0,0 +1 @@
+qt6-webview
\ No newline at end of file
diff --git a/srcpkgs/qt6-webview/template b/srcpkgs/qt6-webview/template
new file mode 100644
index 00000000000000..cc2273052907be
--- /dev/null
+++ b/srcpkgs/qt6-webview/template
@@ -0,0 +1,26 @@
+# Template file for 'qt6-webview'
+pkgname=qt6-webview
+version=6.6.0
+revision=1
+build_style=cmake
+hostmakedepends="qt6-base qt6-declarative-host-tools"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-webengine-devel"
+short_desc="Cross-platform application and UI framework - WebView"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only, GPL-2.0-only, LGPL-3.0-only"
+homepage="https://www.qt.io"
+distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebview-everywhere-src-${version}.tar.xz"
+checksum=a5a48d9b5dfac60b66a737f844dc57de311de9d154fe10ccd8ec498506753392
+
+qt6-webview-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.prl"
+		vmove "usr/lib/*.so"
+	}
+}

From 15f43daebb6ff6eede861026a3558d83f05bd228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 10:18:25 +0700
Subject: [PATCH 14/25] kquickimageeditor: update to 0.3.0.

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

diff --git a/srcpkgs/kquickimageeditor/template b/srcpkgs/kquickimageeditor/template
index a6bf3a1637c1c5..028ae20c34f173 100644
--- a/srcpkgs/kquickimageeditor/template
+++ b/srcpkgs/kquickimageeditor/template
@@ -1,26 +1,30 @@
 # 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="-DBUILD_WITH_QT6=ON -DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs/modules
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="cmake extra-cmake-modules qt6-base qt6-tools
+ qt6-declarative-host-tools"
+makedepends="qt6-base-devel 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
 }
 
 kquickimageeditor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/lib/cmake
-		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt6/mkspecs
 	}
 }

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

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

diff --git a/common/shlibs b/common/shlibs
index 2333bd7d734bf4..c180085d5de773 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3697,6 +3697,8 @@ 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.1.2_2
+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 7fa3aa7d699179f6f3519d02f49f4bc9a2a2bc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 10:18:18 +0700
Subject: [PATCH 16/25] kolourpaint: update to 24.02.2.

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

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index e58f75826c4a8c..5debc7abf06f98 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,18 +1,20 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
- qt5-host-tools qt5-qmake"
-makedepends="kdelibs4support-devel kparts-devel libksane-devel qt5-devel"
+configure_args="-DQT_MAJOR_VERSION=6 -DBUILD_TESTING=OFF
+ -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext kf6-kcoreaddons kf6-kdoctools
+ qt6-base kf6-kconfig"
+makedepends="kf6-kparts-devel kf6-ktextwidgets-devel libksane6-devel qt6-base-devel"
 short_desc="Free, easy-to-use paint program for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=942f6b588f24aba4f135de842e489bb94f2b16a405bb7fecfb5aab9896ea4ace
+checksum=0019fe41d968203dbe5c6c0166858ec53915e2d67e007ef16689e40ed19b9e84
 
 post_install() {
 	vlicense COPYING

From ee25e5dc7ead25ccce800a35d4e07c2cbe0582c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 10:18:47 +0700
Subject: [PATCH 17/25] skanlite: update to 24.02.2.

---
 srcpkgs/skanlite/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/skanlite/template b/srcpkgs/skanlite/template
index 4029a9481a2392..ff6c4a1d2d4d7f 100644
--- a/srcpkgs/skanlite/template
+++ b/srcpkgs/skanlite/template
@@ -1,19 +1,19 @@
 # Template file for 'skanlite'
 pkgname=skanlite
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
-makedepends="kio-devel libksane-devel"
+configure_args="-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON
+ -DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext kf6-kcoreaddons kf6-kdoctools
+ qt6-base kf6-kconfig"
+makedepends="libksane6-devel kf6-kio-devel kf6-ki18n-devel kf6-kcoreaddons-devel
+ kf6-kxmlgui-devel"
 short_desc="Image Scanning Application"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/skanlite"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#skanlite"
 distfiles="${KDE_SITE}/release-service/${version}/src/skanlite-${version}.tar.xz"
-checksum=667aca4dc89798f5a76c62c8f781d21102381b61d433942802cadf931f080dba
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake"
-fi
+checksum=d9abc771790bb5558cd7de6453977740d68d9d309e4ee963d2a1c2a27fd763c0

From 26179db6b9d0533d777cf037e23dec9f16ab4f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 14:29:39 +0700
Subject: [PATCH 18/25] New package: ksanecore6-24.02.2

---
 common/shlibs               |  1 +
 srcpkgs/ksanecore6-devel    |  1 +
 srcpkgs/ksanecore6/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/ksanecore6-devel
 create mode 100644 srcpkgs/ksanecore6/template

diff --git a/common/shlibs b/common/shlibs
index c180085d5de773..18720bebf9d257 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -490,6 +490,7 @@ libKPim5PimCommon.so.5 pimcommon-23.08.0_1
 libKPim5PimCommonAkonadi.so.5 pimcommon-23.08.0_1
 libKPim5Gravatar.so.5 libgravatar-23.04.0_1
 libKSaneCore.so.1 ksanecore-22.12.1_1
+libKSaneCore6.so.1 ksanecore6-24.02.0_1
 libKF5Sane.so.5 libksane-18.04.2_1
 libKPim5SMTP.so.5 ksmtp-23.04.0_1
 libKPim5MailTransport.so.5 kmailtransport-23.04.0_1
diff --git a/srcpkgs/ksanecore6-devel b/srcpkgs/ksanecore6-devel
new file mode 120000
index 00000000000000..6c6a450e8a03d8
--- /dev/null
+++ b/srcpkgs/ksanecore6-devel
@@ -0,0 +1 @@
+ksanecore6
\ No newline at end of file
diff --git a/srcpkgs/ksanecore6/template b/srcpkgs/ksanecore6/template
new file mode 100644
index 00000000000000..9da76d53ecae75
--- /dev/null
+++ b/srcpkgs/ksanecore6/template
@@ -0,0 +1,26 @@
+# Template file for 'ksanecore6'
+pkgname=ksanecore6
+version=24.02.2
+revision=1
+build_style=cmake
+configure_args="-DQT_MAJOR_VERSION=6 -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext qt6-base"
+makedepends="qt6-base-devel sane-devel kf6-kconfig-devel kf6-ki18n-devel"
+short_desc="Library providing logic to interface scanners"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://kde.org/applications/graphics"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksanecore"
+distfiles="${KDE_SITE}/release-service/${version}/src/ksanecore-${version}.tar.xz"
+checksum=18636264095bb56ee64185b4189d7ea14f33a69e392b818bbb0de6ffc1bb8170
+
+ksanecore6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
+	}
+}

From 97d6fa616a37786d3c528bbc3d62daa7bebd4a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 14:33:45 +0700
Subject: [PATCH 19/25] New package: libksane6-24.02.2

---
 common/shlibs              |  1 +
 srcpkgs/libksane6-devel    |  1 +
 srcpkgs/libksane6/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/libksane6-devel
 create mode 100644 srcpkgs/libksane6/template

diff --git a/common/shlibs b/common/shlibs
index 18720bebf9d257..b5b7bd3fd9aeb0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -492,6 +492,7 @@ libKPim5Gravatar.so.5 libgravatar-23.04.0_1
 libKSaneCore.so.1 ksanecore-22.12.1_1
 libKSaneCore6.so.1 ksanecore6-24.02.0_1
 libKF5Sane.so.5 libksane-18.04.2_1
+libKSaneWidgets6.so.6 libksane6-24.02.0_1
 libKPim5SMTP.so.5 ksmtp-23.04.0_1
 libKPim5MailTransport.so.5 kmailtransport-23.04.0_1
 libKPim5MailTransportAkonadi.so.5 kmailtransport-23.04.0_1
diff --git a/srcpkgs/libksane6-devel b/srcpkgs/libksane6-devel
new file mode 120000
index 00000000000000..dd434b6deaf43b
--- /dev/null
+++ b/srcpkgs/libksane6-devel
@@ -0,0 +1 @@
+libksane6
\ No newline at end of file
diff --git a/srcpkgs/libksane6/template b/srcpkgs/libksane6/template
new file mode 100644
index 00000000000000..b6772f6f18ef82
--- /dev/null
+++ b/srcpkgs/libksane6/template
@@ -0,0 +1,26 @@
+# Template file for 'libksane6'
+pkgname=libksane6
+version=24.02.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON"
+hostmakedepends="extra-cmake-modules gettext qt6-base"
+makedepends="qt6-base-devel kf6-ki18n-devel kf6-ktextwidgets-devel sane-devel
+ ksanecore6-devel"
+short_desc="Image scanning library"
+maintainer="travankor <travankor@tuta.io>"
+license="LGPL-2.1-or-later"
+homepage="https://kde.org/applications/graphics"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#libksane"
+distfiles="${KDE_SITE}/release-service/${version}/src/libksane-${version}.tar.xz"
+checksum=2ffc7fddb953ef0f9c38eb2c2bf402de0f9520c3542d3247f7b5c19ee185d8ff
+
+libksane6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ksanecore6-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
+	}
+}

From 2a464852e888f2562ece41da2ca5a1598d19e1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 08:42:46 +0700
Subject: [PATCH 20/25] konversation: update to 24.02.2.

---
 srcpkgs/konversation/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9077b7caa6b818..11f717a409908f 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,17 +1,19 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
- qt5-host-tools qt5-qmake gettext"
-makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel qt5-multimedia-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules kf6-kconfig kf6-kdoctools kf6-kcoreaddons
+ qt6-tools qt6-base gettext"
+makedepends="qt6-tools-devel qt6-qt5compat-devel qt6-multimedia-devel
+ kf6-karchive-devel kf6-kbookmarks-devel kf6-kcodecs-devel kf6-kconfig-devel kf6-kconfigwidgets-devel kf6-kcoreaddons-devel kf6-kcrash-devel kf6-kdbusaddons-devel kf6-kdoctools-devel kf6-ki18n-devel kf6-kidletime-devel kf6-kitemviews-devel kf6-kio-devel kf6-knewstuff-devel kf6-knotifications-devel kf6-knotifyconfig-devel kf6-kparts-devel kf6-kstatusnotifieritem-devel kf6-ktextwidgets-devel kf6-kwallet-devel kf6-kwidgetsaddons-devel kf6-kwindowsystem-devel"
 short_desc="User friendly IRC client for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=60576f16773789596b612969bbbf3a2762ef1cbab21bc19565483310e63d25be
+checksum=b8167b05465b0c4b7cba42636ab5b40ebccd98f088923451d34b039ffb15e249
 python_version=3

From c99320c2d41c544f4998ecc31b6e5c92b3114b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 08:41:51 +0700
Subject: [PATCH 21/25] neochat: update to 24.02.2.

---
 .../patches/delegatesizehelpertest_fix.patch  | 38 -------------------
 .../patches/empty_image.source_crash.patch    | 25 ------------
 srcpkgs/neochat/template                      | 38 ++++++++++++-------
 3 files changed, 24 insertions(+), 77 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..6977b880ea2a75 100644
--- a/srcpkgs/neochat/template
+++ b/srcpkgs/neochat/template
@@ -1,27 +1,37 @@
 # 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"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext pkg-config qt6-base qt6-tools
+ kf6-kcoreaddons kf6-kconfig python3 kf6-kdoctools qt6-declarative-host-tools"
+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-kstatusnotifieritem-devel kf6-qqc2-desktop-style-devel
+ kf6-sonnet-devel kf6-kitemmodels-devel kirigami-addons
+ kf6-kconfigwidgets-devel kf6-kio-devel kirigami-addons-devel
+ qcoro-qt6-devel olm-devel qt6-plugin-sqlite kquickimageeditor
+ $(vopt_if webview qt6-webview-devel)"
+depends="kquickimageeditor kf6-kitemmodels kf6-kirigami kirigami-addons
+ kf6-syntax-highlighting
+ 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"
+build_options="webview"
+desc_option_webview="Use Qt6 WebView"
+
+if [ "$XBPS_TARGET_ENDIAN" = "le" ] &&
+   [ "64" = "$XBPS_WORDSIZE" ] &&
+   [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+	build_options_default="webview"
 fi
 
 post_install() {

From fa388cea7fb4af2c7707329c9fd21ac2bdb8e0d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 10:18:47 +0700
Subject: [PATCH 22/25] skanpage: update to 24.02.2.

---
 srcpkgs/skanpage/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/skanpage/template b/srcpkgs/skanpage/template
index c61cd265dfacc0..933f4c2e0cc47c 100644
--- a/srcpkgs/skanpage/template
+++ b/srcpkgs/skanpage/template
@@ -1,17 +1,19 @@
 # Template file for 'skanpage'
 pkgname=skanpage
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
-makedepends="qt5-devel libksane-devel kcoreaddons-devel ki18n-devel
- kirigami2-devel kcrash-devel ksanecore-devel kconfig-devel purpose-devel
- kxmlgui-devel kquickimageeditor-devel"
-depends="kirigami2>=5.26.0 qt5-quickcontrols2"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools kf6-kcoreaddons kf6-kconfig"
+makedepends="qt6-base-devel libksane6-devel kf6-kcoreaddons-devel kf6-ki18n-devel
+ kf6-kirigami-devel kf6-kcrash-devel ksanecore6-devel kf6-kconfig-devel kf6-purpose-devel
+ kf6-kxmlgui-devel kquickimageeditor-devel leptonica-devel tesseract-ocr-devel libgomp-devel"
+depends="kf6-kirigami kf6-qqc2-desktop-style"
 short_desc="Multi-page scanning application"
 maintainer="Enrico Belleri <idesmi@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/skanpage"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#skanpage"
 distfiles="${KDE_SITE}/release-service/${version}/src/skanpage-${version}.tar.xz"
-checksum=38e2300e1466c43bb531989c29d11221ebcaa2e3e8bb062a814c1f03270b72bb
+checksum=a7361fe846e78ddac0290d956b4f003374bbb3549446d45a84a62f3f6a5731da

From 062be2d88feef47a491197b9c07bba231b991fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 10:18:46 +0700
Subject: [PATCH 23/25] pulseaudio-qt: update to 1.4.0.

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

diff --git a/common/shlibs b/common/shlibs
index b5b7bd3fd9aeb0..75bff07b9278aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -575,7 +575,7 @@ 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
+libKF6PulseAudioQt.so.4 pulseaudio-qt-1.4_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
diff --git a/srcpkgs/pulseaudio-qt/template b/srcpkgs/pulseaudio-qt/template
index e791d6d1fa975c..b5d195d4e94a18 100644
--- a/srcpkgs/pulseaudio-qt/template
+++ b/srcpkgs/pulseaudio-qt/template
@@ -1,22 +1,24 @@
 # 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
+configure_args="-DBUILD_WITH_QT6=ON"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools
  pkg-config AppStream"
-makedepends="qt5-declarative-devel pulseaudio-devel"
+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"
+	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		vmove usr/lib/pkgconfig
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"

From 482e6a4c46c45228da824da6ca0ad39e0b25ea7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 13 May 2024 10:16:50 +0700
Subject: [PATCH 24/25] kdeconnect: update to 24.02.2.

---
 common/shlibs               |  3 ---
 srcpkgs/kdeconnect/template | 32 ++++++++++++++++++--------------
 srcpkgs/kdeconnect/update   |  1 +
 3 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/kdeconnect/update

diff --git a/common/shlibs b/common/shlibs
index 75bff07b9278aa..2bd10d66218abd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3233,9 +3233,6 @@ librpmio.so.9 librpmio-4.15.0_1
 libsquirrel.so.0 squirrel-libs-3.1_1
 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
 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..b80a9b3c2f529d 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,25 +1,29 @@
 # 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"
-checkdepends="qca-qt5-ossl"
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="extra-cmake-modules qt6-tools
+ pkg-config wayland-devel qt6-base python3 kf6-kdoctools kf6-kpackage kf6-kconfig
+ kf6-kpackage qt6-wayland-tools kf6-kcoreaddons gettext qt6-declarative-host-tools
+ kf6-kcmutils"
+makedepends="kf6-kcmutils-devel kf6-kconfigwidgets-devel kf6-kdbusaddons-devel
+ kf6-kdoctools-devel kf6-ki18n-devel kf6-kiconthemes-devel kf6-kio-devel
+ kf6-kirigami-devel kf6-knotifications-devel kf6-kstatusnotifieritem-devel
+ kf6-kservice-devel kf6-qqc2-desktop-style-devel kf6-modemmanager-qt-devel
+ kf6-kpackage-devel kf6-kpeople-devel kpeoplevcard-devel kwayland-devel
+ libfakekey-devel qca-qt6-devel pulseaudio-qt-devel qt6-base-devel
+ qt6-connectivity-devel qt6-multimedia-devel kirigami-addons-devel"
+depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kf6-kirigami kf6-qqc2-desktop-style
+ breeze-icons kpeoplevcard kirigami-addons"
+#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
diff --git a/srcpkgs/kdeconnect/update b/srcpkgs/kdeconnect/update
new file mode 100644
index 00000000000000..96fa650352ca74
--- /dev/null
+++ b/srcpkgs/kdeconnect/update
@@ -0,0 +1 @@
+pkgname=kdeconnect-kde

From 878d78f181d69ef4976fd6e67e00888a743db14d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 14 May 2024 09:44:20 +0700
Subject: [PATCH 25/25] kf6-kfilemetadata: enable qmobipocket

---
 srcpkgs/kf6-kfilemetadata/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index 47aeb5423ea1b1..b836bd924d52dd 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,14 +1,13 @@
 # Template file for 'kf6-kfilemetadata'
 pkgname=kf6-kfilemetadata
 version=6.1.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
 hostmakedepends="extra-cmake-modules qt6-tools qt6-base
  gettext pkg-config"
-# libqmobipocket-devel Needs qt6 version
 makedepends="qt6-base-devel kf6-kcodecs-devel kf6-ki18n-devel kf6-karchive-devel
- kf6-kcoreaddons-devel kf6-kconfig-devel attr-devel taglib-devel
+ kf6-kcoreaddons-devel kf6-kconfig-devel attr-devel taglib-devel libqmobipocket6-devel
  exiv2-devel ffmpeg-devel ebook-tools-devel poppler-qt6-devel"
 short_desc="Library for extracting file metadata"
 maintainer="John <me@johnnynator.dev>"

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

* Re: [PR PATCH] [Merged]: More KDE6
  2024-05-13 18:23 [PR PATCH] More KDE6 TinfoilSubmarine
  2024-05-14  2:54 ` [PR PATCH] [Updated] " sgn
@ 2024-05-14  2:58 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2024-05-14  2:58 UTC (permalink / raw)
  To: ml

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

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

More KDE6
https://github.com/void-linux/void-packages/pull/50317

Description:
<!-- 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
-->


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