[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase qt5-qtbase: add QMAKE_PLATFORM+=linux t...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6330803b3f1b
branches:  trunk
changeset: 325247:6330803b3f1b
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Nov 13 09:24:37 2018 +0000

description:
qt5-qtbase: add QMAKE_PLATFORM+=linux to the linux qmake.conf

remove patch that was working around the lack of the above.
no PKGREVISON bump as linux wasn't building without this and other
platforms haven't changed.

diffstat:

 x11/qt5-qtbase/Makefile                            |   9 ++++++++-
 x11/qt5-qtbase/PLIST.Linux                         |   4 +++-
 x11/qt5-qtbase/distinfo                            |   4 ++--
 x11/qt5-qtbase/files/qmake.conf                    |   2 ++
 x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri |  12 ++----------
 5 files changed, 17 insertions(+), 14 deletions(-)

diffs (109 lines):

diff -r 334b1363ec60 -r 6330803b3f1b x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Tue Nov 13 09:04:58 2018 +0000
+++ b/x11/qt5-qtbase/Makefile   Tue Nov 13 09:24:37 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2018/11/12 03:51:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2018/11/13 09:24:37 markd Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
@@ -152,6 +152,12 @@
                        Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
                        Qt5Widgets.pc Qt5Xml.pc
 
+.if ${OPSYS} == "Linux"
+QMAKE_EXTRA=           QMAKE_PLATFORM += linux
+.else
+QMAKE_EXTRA=
+.endif
+
 pre-configure:
        ${SED}  -e 's:@LOCALBASE@:${LOCALBASE}:g' \
                -e 's:@X11BASE@:${X11BASE}:g' \
@@ -171,6 +177,7 @@
                -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
                -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
                -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
+               -e 's:@QMAKE_EXTRA@:${QMAKE_EXTRA:Q}:g' \
                ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
                for dir in ${WRKSRC}/mkspecs/*; do \
                        cp ${WRKSRC}/qmake.conf $${dir}; \
diff -r 334b1363ec60 -r 6330803b3f1b x11/qt5-qtbase/PLIST.Linux
--- a/x11/qt5-qtbase/PLIST.Linux        Tue Nov 13 09:04:58 2018 +0000
+++ b/x11/qt5-qtbase/PLIST.Linux        Tue Nov 13 09:24:37 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.4 2018/05/18 15:22:02 bacon Exp $
+@comment $NetBSD: PLIST.Linux,v 1.5 2018/11/13 09:24:37 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,6 +26,7 @@
 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
@@ -37,4 +38,5 @@
 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
diff -r 334b1363ec60 -r 6330803b3f1b x11/qt5-qtbase/distinfo
--- a/x11/qt5-qtbase/distinfo   Tue Nov 13 09:04:58 2018 +0000
+++ b/x11/qt5-qtbase/distinfo   Tue Nov 13 09:24:37 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2018/10/01 17:44:47 adam Exp $
+$NetBSD: distinfo,v 1.45 2018/11/13 09:24:37 markd Exp $
 
 SHA1 (qtbase-everywhere-src-5.11.2.tar.xz) = 6f337bdf04fd988f2da4d0fbce431a82224b1c4e
 RMD160 (qtbase-everywhere-src-5.11.2.tar.xz) = dcbc0b2dcba794c243253be747f7d624b4ef9459
@@ -13,7 +13,7 @@
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = f0a4fdd304af2ee6c1b63022ccfcebd2640f0fcb
 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
 SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = bb29280da569d5644ee4a45609fd7e672c7f4f63
-SHA1 (patch-src_corelib_io_io.pri) = fd2f93b5af4dda729b274dd0d8f82ca29b3cb62a
+SHA1 (patch-src_corelib_io_io.pri) = 01936f91c6f09acd3ead5f15a3d7a457c806173a
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 37f61c305335ca6a690b0491220ca8de508bfdb6
diff -r 334b1363ec60 -r 6330803b3f1b x11/qt5-qtbase/files/qmake.conf
--- a/x11/qt5-qtbase/files/qmake.conf   Tue Nov 13 09:04:58 2018 +0000
+++ b/x11/qt5-qtbase/files/qmake.conf   Tue Nov 13 09:24:37 2018 +0000
@@ -6,6 +6,8 @@
 CONFIG += qt warn_on release link_prl incremental gdb_dwarf_index
 QMAKE_INCREMENTAL_STYLE = sublib
 
+@QMAKE_EXTRA@
+
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 include(../common/unix.conf)
diff -r 334b1363ec60 -r 6330803b3f1b x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri        Tue Nov 13 09:04:58 2018 +0000
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri        Tue Nov 13 09:24:37 2018 +0000
@@ -1,20 +1,12 @@
-$NetBSD: patch-src_corelib_io_io.pri,v 1.5 2018/01/17 19:30:47 markd Exp $
+$NetBSD: patch-src_corelib_io_io.pri,v 1.6 2018/11/13 09:24:37 markd Exp $
 
 * Add DragonFly support
 * Patch sent and merged upstream:
   http://codereview.qt-project.org/#/c/111741/
-* fix linux test.
 
 --- src/corelib/io/io.pri.orig 2017-01-18 14:20:58.000000000 +0000
 +++ src/corelib/io/io.pri
-@@ -169,13 +169,13 @@ win32 {
-                 io/qstorageinfo_unix.cpp
-         }
- 
--        linux|if(qnx:qtConfig(inotify)) {
-+        linux*|if(qnx:qtConfig(inotify)) {
-             SOURCES += io/qfilesystemwatcher_inotify.cpp
-             HEADERS += io/qfilesystemwatcher_inotify_p.h
+@@ -175,7 +175,7 @@ win32 {
          }
  
          !nacl {