From 16b2c45302b9ddb3030738b8c846150e0d20a9b4 Mon Sep 17 00:00:00 2001 From: markd Date: Wed, 27 Mar 2019 10:16:34 +0000 Subject: qt5-qtbase: explictly disable tslib in case its found in base system remove tslib related entries from PLIST.Linux --- x11/qt5-qtbase/Makefile | 3 ++- x11/qt5-qtbase/PLIST.Linux | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'x11') diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 1d2215c1c7b..dec8473945f 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2019/03/26 11:14:16 adam Exp $ +# $NetBSD: Makefile,v 1.71 2019/03/27 10:16:34 markd Exp $ DISTNAME= qtbase-everywhere-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} @@ -29,6 +29,7 @@ CONFIGURE_ARGS+= -no-sql-psql CONFIGURE_ARGS+= -no-sql-sqlite2 CONFIGURE_ARGS+= -no-sql-tds CONFIGURE_ARGS+= -no-strip +CONFIGURE_ARGS+= -no-tslib CONFIGURE_ARGS+= -no-use-gold-linker CONFIGURE_ARGS+= -pkg-config CONFIGURE_ARGS+= -release diff --git a/x11/qt5-qtbase/PLIST.Linux b/x11/qt5-qtbase/PLIST.Linux index 5ae0399d37a..98806d718f0 100644 --- a/x11/qt5-qtbase/PLIST.Linux +++ b/x11/qt5-qtbase/PLIST.Linux @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.Linux,v 1.6 2018/12/18 09:57:18 adam Exp $ +@comment $NetBSD: PLIST.Linux,v 1.7 2019/03/27 10:16:34 markd Exp $ qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardhandler_p.h qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardmanager_p.h @@ -26,7 +26,6 @@ qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake -qt5/lib/cmake/Qt5Gui/Qt5Gui_QTsLibPlugin.cmake qt5/lib/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake qt5/lib/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake qt5/lib/libQt5InputSupport.a @@ -38,5 +37,4 @@ qt5/plugins/generic/libqevdevkeyboardplugin.so qt5/plugins/generic/libqevdevmouseplugin.so qt5/plugins/generic/libqevdevtabletplugin.so qt5/plugins/generic/libqevdevtouchplugin.so -qt5/plugins/generic/libqtslibplugin.so qt5/plugins/platforms/libqlinuxfb.so -- cgit v1.2.3