Received: by mail.netbsd.org (Postfix, from userid 605) id 3EFD484D72; Wed, 31 Jan 2018 12:36:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BB51A84D65 for ; Wed, 31 Jan 2018 12:36:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id fminA87TgjlS for ; Wed, 31 Jan 2018 12:36:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EA33E84C74 for ; Wed, 31 Jan 2018 12:36:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DFF6FFB40; Wed, 31 Jan 2018 12:36:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15174022173340" MIME-Version: 1.0 Date: Wed, 31 Jan 2018 12:36:57 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/x11/qt5-qtbase To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180131123657.DFF6FFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_15174022173340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed Jan 31 12:36:57 UTC 2018 Modified Files: pkgsrc/x11/qt5-qtbase: Makefile Makefile.common distinfo pkgsrc/x11/qt5-qtbase/files: qmake.conf Added Files: pkgsrc/x11/qt5-qtbase/patches: patch-src_corelib_global_qconfig-bootstrapped.h patch-src_network_kernel_qnetworkinterface__unix.cpp Log Message: qt5-qtbase: Various fixes, primarily for SunOS/clang. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/qt5-qtbase/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/qt5-qtbase/Makefile.common cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/qt5-qtbase/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/qt5-qtbase/files/qmake.conf cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h \ pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkinterface__unix.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15174022173340 Content-Disposition: inline Content-Length: 8098 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtbase/Makefile diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.51 pkgsrc/x11/qt5-qtbase/Makefile:1.52 --- pkgsrc/x11/qt5-qtbase/Makefile:1.51 Sun Jan 28 20:11:10 2018 +++ pkgsrc/x11/qt5-qtbase/Makefile Wed Jan 31 12:36:57 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2018/01/28 20:11:10 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2018/01/31 12:36:57 jperkin Exp $ DISTNAME= qtbase-everywhere-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} @@ -64,7 +64,7 @@ PLIST_VARS+= egl .include "../../mk/compiler.mk" .if ${OPSYS} == "SunOS" -. if !empty(CC_VERSION:Mgcc*) +. if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang) . if ${ABI:U} == "64" CONFIGURE_ARGS+= -platform solaris-g++-64 . else @@ -77,7 +77,7 @@ CONFIGURE_ARGS+= -platform solaris-cc-64 CONFIGURE_ARGS+= -platform solaris-cc . endif . endif -SYS_LIBS= -lresolv -lsocket -lnsl -lrt +NETWORK_LIBS= -lsocket -lnsl .elif ${OPSYS} == "Interix" CONFIGURE_ARGS+= -platform interix-g++ CFLAGS+= -I/usr/local/include/bind @@ -104,7 +104,7 @@ LDFLAGS.FreeBSD+= -lutil REPLACE_PERL+= bin/fixqt4headers.pl REPLACE_PERL+= bin/syncqt.pl -REPLACE_PERL+= mkspecs/features/uikit/devices.pl +REPLACE_PERL+= mkspecs/features/data/unix/findclasslist.pl PTHREAD_OPTS+= require UNLIMIT_RESOURCES= datasize @@ -133,6 +133,11 @@ SUBST_FILES.opt= mkspecs/common/gcc-base SUBST_SED.opt= -e 's,-O[s23],,' SUBST_SED.opt+= -e 's,-fvisibility=hidden,,' +SUBST_CLASSES.SunOS+= vscript +SUBST_STAGE.vscript= pre-configure +SUBST_FILES.vscript= mkspecs/common/gcc-base-unix.conf +SUBST_SED.vscript= -e '/QMAKE_LFLAGS_VERSION_SCRIPT/d' + SUBST_CLASSES+= path SUBST_STAGE.path= pre-configure SUBST_MESSAGE.path= Add to default XDG path. @@ -156,6 +161,7 @@ pre-configure: -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ + -e 's:@NETWORK_LIBS@:${NETWORK_LIBS:Q}:g' \ -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ -e 's:@LEX@:${LEX}:g' \ -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ Index: pkgsrc/x11/qt5-qtbase/Makefile.common diff -u pkgsrc/x11/qt5-qtbase/Makefile.common:1.24 pkgsrc/x11/qt5-qtbase/Makefile.common:1.25 --- pkgsrc/x11/qt5-qtbase/Makefile.common:1.24 Thu Jan 18 09:15:29 2018 +++ pkgsrc/x11/qt5-qtbase/Makefile.common Wed Jan 31 12:36:57 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2018/01/18 09:15:29 markd Exp $ +# $NetBSD: Makefile.common,v 1.25 2018/01/31 12:36:57 jperkin Exp $ # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile # used by x11/qt5-psql/Makefile @@ -32,6 +32,9 @@ BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLI USE_LANGUAGES= c c++11 USE_TOOLS+= gmake perl:build pkg-config +# Avoid failures to due 'register' usage in X11 headers. +CFLAGS+= -Wno-register + # wcstof(3) etc. is used in C++ code. CFLAGS.NetBSD+= -D_NETBSD_SOURCE Index: pkgsrc/x11/qt5-qtbase/distinfo diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.35 pkgsrc/x11/qt5-qtbase/distinfo:1.36 --- pkgsrc/x11/qt5-qtbase/distinfo:1.35 Wed Jan 17 19:30:46 2018 +++ pkgsrc/x11/qt5-qtbase/distinfo Wed Jan 31 12:36:57 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2018/01/17 19:30:46 markd Exp $ +$NetBSD: distinfo,v 1.36 2018/01/31 12:36:57 jperkin Exp $ SHA1 (qtbase-everywhere-src-5.10.0.tar.xz) = 34fa3d4e7bb2b1545247a616190efaf74804db49 RMD160 (qtbase-everywhere-src-5.10.0.tar.xz) = d6f9ab8526ebe50791b9b948930806dc8b3be73b @@ -12,11 +12,13 @@ SHA1 (patch-qmake_Makefile.unix) = ec1af SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = f0a4fdd304af2ee6c1b63022ccfcebd2640f0fcb SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = 4387447f0f23f0f8c623c0c019ab632bc1cb5617 +SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = ec5487cc27518b2588d40e7ad59eeee89e93b055 SHA1 (patch-src_corelib_io_io.pri) = fd2f93b5af4dda729b274dd0d8f82ca29b3cb62a 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 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 3131d74a547abdcca7594b49b739cc1c0eed68f5 +SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 1655b2320b250defcfa406c95e58a1b728c0f2d9 SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 655ca6601ddd1768b92758cfdfd8d1c3514fba94 Index: pkgsrc/x11/qt5-qtbase/files/qmake.conf diff -u pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.5 pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.6 --- pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.5 Wed Jan 17 19:30:47 2018 +++ pkgsrc/x11/qt5-qtbase/files/qmake.conf Wed Jan 31 12:36:57 2018 @@ -38,6 +38,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_ QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = @PTHREAD_LIBS@ +QMAKE_LIBS_NETWORK = @NETWORK_LIBS@ QMAKE_AR = @AR@ cqs QMAKE_OBJCOPY = objcopy Added files: Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h:1.1 --- /dev/null Wed Jan 31 12:36:57 2018 +++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h Wed Jan 31 12:36:57 2018 @@ -0,0 +1,18 @@ +$NetBSD: patch-src_corelib_global_qconfig-bootstrapped.h,v 1.1 2018/01/31 12:36:57 jperkin Exp $ + +SunOS does not have getauxval. + +--- src/corelib/global/qconfig-bootstrapped.h.orig 2017-11-30 13:49:46.000000000 +0000 ++++ src/corelib/global/qconfig-bootstrapped.h +@@ -78,7 +78,11 @@ + #define QT_FEATURE_cxx11_random (QT_HAS_INCLUDE() ? 1 : -1) + #define QT_NO_DATASTREAM + #define QT_FEATURE_datetimeparser -1 ++#ifdef __sun ++# define QT_FEATURE_getauxval -1 ++#else + #define QT_FEATURE_getauxval (QT_HAS_INCLUDE() ? 1 : -1) ++#endif + #define QT_FEATURE_getentropy -1 + #define QT_NO_GEOM_VARIANT + #define QT_FEATURE_iconv -1 Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkinterface__unix.cpp diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkinterface__unix.cpp:1.1 --- /dev/null Wed Jan 31 12:36:57 2018 +++ pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkinterface__unix.cpp Wed Jan 31 12:36:57 2018 @@ -0,0 +1,44 @@ +$NetBSD: patch-src_network_kernel_qnetworkinterface__unix.cpp,v 1.1 2018/01/31 12:36:57 jperkin Exp $ + +Support ifr_index. + +--- src/network/kernel/qnetworkinterface_unix.cpp.orig 2017-11-30 13:49:46.000000000 +0000 ++++ src/network/kernel/qnetworkinterface_unix.cpp +@@ -136,7 +136,11 @@ uint QNetworkInterfaceManager::interface + + uint id = 0; + if (qt_safe_ioctl(socket, SIOCGIFINDEX, &req) >= 0) ++#ifdef ifr_ifindex + id = req.ifr_ifindex; ++#else ++ id = req.ifr_index; ++#endif + qt_safe_close(socket); + return id; + #else +@@ -155,7 +159,11 @@ QString QNetworkInterfaceManager::interf + int socket = qt_safe_socket(AF_INET, SOCK_STREAM, 0); + if (socket >= 0) { + memset(&req, 0, sizeof(ifreq)); ++#ifdef ifr_ifindex + req.ifr_ifindex = index; ++#else ++ req.ifr_index = index; ++#endif + + if (qt_safe_ioctl(socket, SIOCGIFNAME, &req) >= 0) { + qt_safe_close(socket); +@@ -232,10 +240,10 @@ static QNetworkInterfacePrivate *findInt + // Get the interface index + # ifdef SIOCGIFINDEX + if (qt_safe_ioctl(socket, SIOCGIFINDEX, &req) >= 0) +-# if defined(Q_OS_HAIKU) +- ifindex = req.ifr_index; +-# else ++# ifdef ifr_ifindex + ifindex = req.ifr_ifindex; ++# else ++ ifindex = req.ifr_index; + # endif + # else + ifindex = if_nametoindex(req.ifr_name); --_----------=_15174022173340--