CVS commit: pkgsrc/x11/qt5-qtbase

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Mar 27 10:16:34 UTC 2019

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile PLIST.Linux

Log Message:
qt5-qtbase: explictly disable tslib in case its found in base system
remove tslib related entries from PLIST.Linux


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/qt5-qtbase/PLIST.Linux

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.70 pkgsrc/x11/qt5-qtbase/Makefile:1.71
--- pkgsrc/x11/qt5-qtbase/Makefile:1.70 Tue Mar 26 11:14:16 2019
+++ pkgsrc/x11/qt5-qtbase/Makefile      Wed Mar 27 10:16:34 2019
@@ -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

Index: pkgsrc/x11/qt5-qtbase/PLIST.Linux
diff -u pkgsrc/x11/qt5-qtbase/PLIST.Linux:1.6 pkgsrc/x11/qt5-qtbase/PLIST.Linux:1.7
--- pkgsrc/x11/qt5-qtbase/PLIST.Linux:1.6       Tue Dec 18 09:57:18 2018
+++ pkgsrc/x11/qt5-qtbase/PLIST.Linux   Wed Mar 27 10:16:34 2019
@@ -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_QEvdevMouseP
 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/libqevdevkeyboardplu
 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