CVS commit: pkgsrc/x11/qt6-qtbase

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Oct 20 07:56:57 UTC 2023

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile distinfo
Added Files:
        pkgsrc/x11/qt6-qtbase/patches:
            patch-src_gui_platform_unix_qxkbcommon.cpp

Log Message:
qt6-qtbase: apply patch from qt5-qtbase for xkb compatibility issue


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/qt6-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_platform_unix_qxkbcommon.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.14 pkgsrc/x11/qt6-qtbase/Makefile:1.15
--- pkgsrc/x11/qt6-qtbase/Makefile:1.14 Fri Sep 29 21:12:15 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile      Fri Oct 20 07:56:57 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2023/09/29 21:12:15 adam Exp $
+# $NetBSD: Makefile,v 1.15 2023/10/20 07:56:57 tnn Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 CATEGORIES=    x11
 

Index: pkgsrc/x11/qt6-qtbase/distinfo
diff -u pkgsrc/x11/qt6-qtbase/distinfo:1.5 pkgsrc/x11/qt6-qtbase/distinfo:1.6
--- pkgsrc/x11/qt6-qtbase/distinfo:1.5  Fri Sep 29 21:12:15 2023
+++ pkgsrc/x11/qt6-qtbase/distinfo      Fri Oct 20 07:56:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2023/09/29 21:12:15 adam Exp $
+$NetBSD: distinfo,v 1.6 2023/10/20 07:56:57 tnn Exp $
 
 BLAKE2s (qtbase-everywhere-src-6.5.3.tar.xz) = a5017281c4536fade24f3f0d3e276b830ff602cbab18d24137546421b0158462
 SHA512 (qtbase-everywhere-src-6.5.3.tar.xz) = 31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9
@@ -18,6 +18,7 @@ SHA1 (patch-src_corelib_io_qstorageinfo_
 SHA1 (patch-src_corelib_qt__cmdline.cmake) = 96dda2094d2d80f1eb7b1301390ff3f123887812
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 47047f5af4383b622c59c3969145e44c6ac4bf18
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = afc18daab2b7e5b957339bafd5f7007e9a446c36
+SHA1 (patch-src_gui_platform_unix_qxkbcommon.cpp) = 142de65f99b76e700cff2812fe76b88e6036a948
 SHA1 (patch-src_network_configure.cmake) = 754461c21574b99232efc95af3a80765b2edbecc
 SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be

Added files:

Index: pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_platform_unix_qxkbcommon.cpp
diff -u /dev/null pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_platform_unix_qxkbcommon.cpp:1.1
--- /dev/null   Fri Oct 20 07:56:57 2023
+++ pkgsrc/x11/qt6-qtbase/patches/patch-src_gui_platform_unix_qxkbcommon.cpp    Fri Oct 20 07:56:57 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_gui_platform_unix_qxkbcommon.cpp,v 1.1 2023/10/20 07:56:57 tnn Exp $
+
+* libxkbcommon-1.6.0 removes these 4 symbols.
+
+--- src/gui/platform/unix/qxkbcommon.cpp.orig  2023-09-21 19:24:26.000000000 +0000
++++ src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMa
+         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>,
+-        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>,
+ 
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.