svn commit: r514242 - in head/x11-toolkits/qt5-gui: . files
Adriaan de Groot
adridg at FreeBSD.org
Thu Oct 10 19:02:30 UTC 2019
Author: adridg
Date: Thu Oct 10 19:02:28 2019
New Revision: 514242
URL: https://svnweb.freebsd.org/changeset/ports/514242
Log:
Try to fix build of qt5-gui in the presence of evdev-proto
In Qt 5.13, a "helpful" upstream added #includes of the interal
FreeBSD event headers; these conflict with evdev-proto headers.
Back out that helpful fix, and rely on evdev-proto everywhere
(in particular, for dependent ports that use evdev-proto themselves).
PR: 240965
Reported by: Walter Schwarzenfeld
Added:
head/x11-toolkits/qt5-gui/files/
head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp (contents, props changed)
head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h (contents, props changed)
head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp (contents, props changed)
head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevmouse_qevdevmousehandler.cpp (contents, props changed)
head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp (contents, props changed)
head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp (contents, props changed)
Modified:
head/x11-toolkits/qt5-gui/Makefile
Modified: head/x11-toolkits/qt5-gui/Makefile
==============================================================================
--- head/x11-toolkits/qt5-gui/Makefile Thu Oct 10 19:01:36 2019 (r514241)
+++ head/x11-toolkits/qt5-gui/Makefile Thu Oct 10 19:02:28 2019 (r514242)
@@ -2,14 +2,15 @@
PORTNAME= gui
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits graphics
PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt graphical user interface module
-BUILD_DEPENDS= at-spi2-core>=0:accessibility/at-spi2-core
+BUILD_DEPENDS= at-spi2-core>=0:accessibility/at-spi2-core \
+ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libevdev.so:devel/libevdev \
libfontconfig.so:x11-fonts/fontconfig \
Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp Thu Oct 10 19:02:28 2019 (r514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig 2019-06-13 04:18:18 UTC
++++ src/platformsupport/devicediscovery/qdevicediscovery_static.cpp
+@@ -47,11 +47,7 @@
+ #include <QLoggingCategory>
+ #include <QtCore/private/qcore_unix_p.h>
+
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+ #include <fcntl.h>
+
+ /* android (and perhaps some other linux-derived stuff) don't define everything
Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h Thu Oct 10 19:02:28 2019 (r514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig 2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
+@@ -52,11 +52,7 @@
+ //
+
+ #include "qnamespace.h"
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include "linux/input.h"
+-#endif
+
+ // no QT_BEGIN_NAMESPACE, since we include it internally...
+
Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp Thu Oct 10 19:02:28 2019 (r514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+@@ -52,11 +52,7 @@
+ #include <QtGui/private/qguiapplication_p.h>
+ #include <QtGui/private/qinputdevicemanager_p.h>
+
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+
+ QT_BEGIN_NAMESPACE
+
Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevmouse_qevdevmousehandler.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevmouse_qevdevmousehandler.cpp Thu Oct 10 19:02:28 2019 (r514242)
@@ -0,0 +1,15 @@
+--- src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp.orig 2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+@@ -53,12 +53,8 @@
+
+ #include <errno.h>
+
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/kd.h>
+ #include <linux/input.h>
+-#endif
+
+ #define TEST_BIT(array, bit) (array[bit/8] & (1<<(bit%8)))
+
Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp Thu Oct 10 19:02:28 2019 (r514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig 2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
+@@ -45,11 +45,7 @@
+ #include <QLoggingCategory>
+ #include <QtCore/private/qcore_unix_p.h>
+ #include <qpa/qwindowsysteminterface.h>
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+
+ QT_BEGIN_NAMESPACE
+
Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp Thu Oct 10 19:02:28 2019 (r514242)
@@ -0,0 +1,14 @@
+--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2019-06-13 04:18:18 UTC
++++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+@@ -49,11 +49,7 @@
+ #include <QtCore/private/qcore_unix_p.h>
+ #include <QtGui/private/qhighdpiscaling_p.h>
+ #include <QtGui/private/qguiapplication_p.h>
+-#ifdef Q_OS_FREEBSD
+-#include <dev/evdev/input.h>
+-#else
+ #include <linux/input.h>
+-#endif
+
+ #include <math.h>
+
More information about the svn-ports-head
mailing list