CVS commit: pkgsrc/x11/qt5-qtbase

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Oct 19 23:13:18 UTC 2023

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches:
            patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp

Log Message:
qt5-qtbase: Remove uses of 4 symbols which libxkbcommon-1.6.0 removes

* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_input_xkbcommon_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/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.134 pkgsrc/x11/qt5-qtbase/Makefile:1.135
--- pkgsrc/x11/qt5-qtbase/Makefile:1.134        Fri Jun 23 17:29:12 2023
+++ pkgsrc/x11/qt5-qtbase/Makefile      Thu Oct 19 23:13:18 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2023/06/23 17:29:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.135 2023/10/19 23:13:18 ryoon Exp $
 
 DISTNAME=      qtbase-everywhere-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.79 pkgsrc/x11/qt5-qtbase/distinfo:1.80
--- pkgsrc/x11/qt5-qtbase/distinfo:1.79 Sat Oct  7 20:00:32 2023
+++ pkgsrc/x11/qt5-qtbase/distinfo      Thu Oct 19 23:13:18 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2023/10/07 20:00:32 adam Exp $
+$NetBSD: distinfo,v 1.80 2023/10/19 23:13:18 ryoon Exp $
 
 BLAKE2s (qtbase-everywhere-opensource-src-5.15.11.tar.xz) = e53cb08cf8a1b512e4fb1989a25893d1556383b82c37cc64180e3302446c69a0
 SHA512 (qtbase-everywhere-opensource-src-5.15.11.tar.xz) = 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
@@ -23,6 +23,7 @@ SHA1 (patch-src_network_configure.json) 
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
 SHA1 (patch-src_network_kernel_qnetworkproxy__libproxy.cpp) = 4cb3a47d1fdd2d165b5d884192fff74e5ec8d5c1
 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
+SHA1 (patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp) = c77df4f77817c1c2c6670dc6e0799b9fd55bea06
 SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
 SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = e369001cba31e865adf010ab714ad132b96c1bef

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp:1.1
--- /dev/null   Thu Oct 19 23:13:18 2023
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp      Thu Oct 19 23:13:18 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp,v 1.1 2023/10/19 23:13:18 ryoon Exp $
+
+* libxkbcommon-1.6.0 removes these 4 symbols.
+
+--- src/platformsupport/input/xkbcommon/qxkbcommon.cpp.orig    2023-06-09 14:30:54.000000000 +0000
++++ src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+@@ -273,10 +273,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.