[PR PATCH] qt6-base: Update to 6.6.2

[PR PATCH] qt6-base: Update to 6.6.2

[fvalasiad]

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

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

https://github.com/fvalasiad/void-packages kde6
https://github.com/void-linux/void-packages/pull/49549

qt6-base: Update to 6.6.2
Removed patches/libxkbcommon1.6.0.patch since it was patched upstream.

Updated patches/zfs-storage.patch to match upstream.

#### Testing the changes
- I tested the changes in this PR: briefly

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl


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

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

From cb1b8bb89670910d676c32eaef8fdac18cf5d797 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Tue, 26 Mar 2024 14:14:08 +0200
Subject: [PATCH] qt6-base: Update to 6.6.2

Removed patches/libxkbcommon1.6.0.patch since it was patched upstream.

Updated patches/zfs-storage.patch to match upstream.

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 .../qt6-base/patches/libxkbcommon1.6.0.patch  | 39 -------------------
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 25 ++++++------
 srcpkgs/qt6-base/template                     |  4 +-
 3 files changed, 16 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch

diff --git a/srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch b/srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch
deleted file mode 100644
index 7c1b0e8e9851e5..00000000000000
--- a/srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
-https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
-https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
-
-Pick-to: 6.6 6.5 6.2 5.15
-Fixes: QTBUG-117950
-Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
----
- src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
-index 26d87c5ff59..7b611790c67 100644
---- a/src/gui/platform/unix/qxkbcommon.cpp
-+++ b/src/gui/platform/unix/qxkbcommon.cpp
-@@ -237,10 +237,14 @@ static constexpr const auto KeyTbl = qMakeArray(
-         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
-+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
-+   The define check is kind of version check here. */
-+#ifdef XKB_KEY_dead_lowline
-         Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
-         Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
-         Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
-         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-+#endif
- 
-         // Special keys from X.org - This include multimedia keys,
-         // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
index 0473836ba7d665..6d06bfb2717aa4 100644
--- a/srcpkgs/qt6-base/patches/zfs-storage.patch
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -1,11 +1,14 @@
---- qt6-base-6.4.2.orig/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
-+++ qt6-base-6.4.2/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
-@@ -165,6 +165,8 @@ void tst_QStorageInfo::tempFile()
- #ifdef Q_OS_LINUX
-     if (storage1.fileSystemType() == "btrfs")
-         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
-+    if (storage1.fileSystemType() == "zfs")
-+        QSKIP("This test doesn't work on zfs");
- #endif
- 
-     qint64 free = storage1.bytesFree();
+--- qtbase-everywhere-src-6.6.2/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp	2024-02-08 18:01:05.000000000 +0200
++++ sth	2024-03-26 15:56:00.112000000 +0200
+@@ -180,6 +180,11 @@
+                      __FILE__, __LINE__);
+         return false;
+     }
++    if (storage.fileSystemType() == "zfs") {
++	QTest::qSkip("This test doesn't work on zfs",
++		    __FILE__, __LINE__);
++	return false;
++    }
+ #else
+     Q_UNUSED(file);
+     Q_UNUSED(storage);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 7dce54ae9c7bf1..eda32610fba248 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.6.0
+version=6.6.2
 revision=1
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -32,7 +32,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e
+checksum=b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

Re: qt6-base: Update to 6.6.2

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49549#issuecomment-2020536215

Comment:
@Johnnynator Either I am blind or 6.6.3 was just released as I was making this patch.

Re: qt6-base: Update to 6.6.2

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49549#issuecomment-2020536215

Comment:
@Johnnynator Either I am blind or 6.6.3 was just released as I was making this patch.

It was actually released this morning, w/e, do you want me to update the PR to 6.3?

Re: qt6-base: Update to 6.6.2

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49549#issuecomment-2020536215

Comment:
@Johnnynator Either I am blind or 6.6.3 was just released as I was making this patch.

EDIT:
It was actually released this morning, w/e, do you want me to update the PR to 6.3?

Re: [PR PATCH] [Updated] qt6-base: Update to 6.6.2

[fvalasiad]

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

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

https://github.com/fvalasiad/void-packages kde6
https://github.com/void-linux/void-packages/pull/49549

qt6-base: Update to 6.6.2
Removed patches/libxkbcommon1.6.0.patch since it was patched upstream.

Updated patches/zfs-storage.patch to match upstream.

#### Testing the changes
- I tested the changes in this PR: briefly

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl


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

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

From 861e7c58d2ab44d35bc6b6132b8cf765b9dfbeda Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Tue, 26 Mar 2024 14:14:08 +0200
Subject: [PATCH] qt6-base: Update to 6.6.3

Removed patches/libxkbcommon1.6.0.patch since it was patched upstream.

Updated patches/zfs-storage.patch to match upstream.

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 .../qt6-base/patches/libxkbcommon1.6.0.patch  | 39 -------------------
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 25 ++++++------
 srcpkgs/qt6-base/template                     |  4 +-
 3 files changed, 16 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch

diff --git a/srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch b/srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch
deleted file mode 100644
index 7c1b0e8e9851e5..00000000000000
--- a/srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
-https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
-https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
-
-Pick-to: 6.6 6.5 6.2 5.15
-Fixes: QTBUG-117950
-Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
----
- src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
-index 26d87c5ff59..7b611790c67 100644
---- a/src/gui/platform/unix/qxkbcommon.cpp
-+++ b/src/gui/platform/unix/qxkbcommon.cpp
-@@ -237,10 +237,14 @@ static constexpr const auto KeyTbl = qMakeArray(
-         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
-+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
-+   The define check is kind of version check here. */
-+#ifdef XKB_KEY_dead_lowline
-         Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
-         Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
-         Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
-         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-+#endif
- 
-         // Special keys from X.org - This include multimedia keys,
-         // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
index 0473836ba7d665..6d06bfb2717aa4 100644
--- a/srcpkgs/qt6-base/patches/zfs-storage.patch
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -1,11 +1,14 @@
---- qt6-base-6.4.2.orig/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
-+++ qt6-base-6.4.2/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
-@@ -165,6 +165,8 @@ void tst_QStorageInfo::tempFile()
- #ifdef Q_OS_LINUX
-     if (storage1.fileSystemType() == "btrfs")
-         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
-+    if (storage1.fileSystemType() == "zfs")
-+        QSKIP("This test doesn't work on zfs");
- #endif
- 
-     qint64 free = storage1.bytesFree();
+--- qtbase-everywhere-src-6.6.2/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp	2024-02-08 18:01:05.000000000 +0200
++++ sth	2024-03-26 15:56:00.112000000 +0200
+@@ -180,6 +180,11 @@
+                      __FILE__, __LINE__);
+         return false;
+     }
++    if (storage.fileSystemType() == "zfs") {
++	QTest::qSkip("This test doesn't work on zfs",
++		    __FILE__, __LINE__);
++	return false;
++    }
+ #else
+     Q_UNUSED(file);
+     Q_UNUSED(storage);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 7dce54ae9c7bf1..8ba365871f6941 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.6.0
+version=6.6.3
 revision=1
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -32,7 +32,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e
+checksum=0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

Re: qt6-base: Update to 6.6.2

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49549#issuecomment-2020536215

Comment:
@Johnnynator Either I am blind or 6.6.3 was just released as I was making this patch.

EDIT:
It was actually released this morning, w/e, do you want me to update the PR to 6.3?

EDIT2:
Nvm updated it.

Re: qt6-base: Update to 6.6.3

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/49549#issuecomment-2020816857

Comment:
We should update all qt 6 components at the same time.

Re: qt6-base: Update to 6.6.3

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49549#issuecomment-2020960387

Comment:
Ah the build failed for x86, was it cause of the failed tests? We have to patch all those?

@Johnnynator Honestly I am trying to setup plasma 6 to work and I am still trying to figure out the layout of qt in the repositories in an attempt to upgrade to qt6.

Now there is a `qt5` package creating all the subpackages but there ain't no `qt6` yet, rather there is just `qt6-base` which is a minimal version. Then there is no `qt5-base`, while additionally some subpackages originally created from `qt5` are now separate packages for `qt6`.

I wonder have you got any reason to hold back plasma 6 or is it just an issue of time? Since you mention that all qt components need to be updated in parallel, should I bother trying in my spare time?

Re: qt6-base: Update to 6.6.3

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49549#issuecomment-2021292255

Comment:
Should I patch 'em all in this PR? Basically every package starting with qt6 that is not a symbolic link?

here is a way to print all such packages:

```
find /path/to/srcpkgs -name "qt6*" -type d -maxdepth 1
```