summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2019-03-27 10:16:34 +0000
committermarkd <markd@pkgsrc.org>2019-03-27 10:16:34 +0000
commit16b2c45302b9ddb3030738b8c846150e0d20a9b4 (patch)
treee215b0d4cf5abe78e1c8f8e727be6acf2d14ff8c /x11
parent71e1887a0faa9314e7d036cc99bfe37cf00fcca1 (diff)
downloadpkgsrc-16b2c45302b9ddb3030738b8c846150e0d20a9b4.tar.gz
qt5-qtbase: explictly disable tslib in case its found in base system
remove tslib related entries from PLIST.Linux
Diffstat (limited to 'x11')
-rw-r--r--x11/qt5-qtbase/Makefile3
-rw-r--r--x11/qt5-qtbase/PLIST.Linux4
2 files changed, 3 insertions, 4 deletions
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