pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase make this build with older xinput (eg, ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b9af04c96bf
branches:  trunk
changeset: 649429:8b9af04c96bf
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Fri Apr 03 09:28:20 2015 +0000

description:
make this build with older xinput (eg, netbsd-6.)

diffstat:

 x11/qt5-qtbase/distinfo                                                       |   3 +-
 x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp |  18 ++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 16da63032405 -r 8b9af04c96bf x11/qt5-qtbase/distinfo
--- a/x11/qt5-qtbase/distinfo   Fri Apr 03 09:18:28 2015 +0000
+++ b/x11/qt5-qtbase/distinfo   Fri Apr 03 09:28:20 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/03/28 17:04:50 bsiegert Exp $
+$NetBSD: distinfo,v 1.18 2015/04/03 09:28:20 mrg Exp $
 
 SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd
 RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909
@@ -24,6 +24,7 @@
 SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
 SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64
 SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d
+SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp) = cee1a36f16cabaaba45815c54ee262db90df0c98
 SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 46c40c3d205fc5bffd26dac1b231d7c5a33c2dba
 SHA1 (patch-src_tools_moc_main.cpp) = d5888014ad648cb06fa8c348e52102133e6a5f4b
 SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
diff -r 16da63032405 -r 8b9af04c96bf x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp     Fri Apr 03 09:28:20 2015 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp,v 1.1 2015/04/03 09:28:20 mrg Exp $
+
+handle earlier Xinput versions.
+
+--- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp.orig      2015-04-03 00:37:14.000000000 -0700
++++ src/plugins/platforms/xcb/qxcbconnection_xi2.cpp   2015-04-03 00:35:27.000000000 -0700
+@@ -175,9 +175,11 @@
+             case XIKeyClass:
+                 qCDebug(lcQpaXInputDevices) << "   it's a keyboard";
+                 break;
++#ifdef XITouchClass
+             case XITouchClass:
+                 // will be handled in deviceForId()
+                 break;
++#endif
+             default:
+                 qCDebug(lcQpaXInputDevices) << "   has class" << devices[i].classes[c]->type;
+                 break;



Home | Main Index | Thread Index | Old Index