Received: by mail.netbsd.org (Postfix, from userid 605) id 262C384CFD; Tue, 24 Mar 2020 20:38:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A221D84CEF for ; Tue, 24 Mar 2020 20:38:04 +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 XcHdj2Mhe-Y5 for ; Tue, 24 Mar 2020 20:38:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 134E684CE3 for ; Tue, 24 Mar 2020 20:38:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0D5E0FB27; Tue, 24 Mar 2020 20:38:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585082284189880" MIME-Version: 1.0 Date: Tue, 24 Mar 2020 20:38:04 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/x11/qt4-libs To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200324203804.0D5E0FB27@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. --_----------=_1585082284189880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Mar 24 20:38:03 UTC 2020 Modified Files: pkgsrc/x11/qt4-libs: distinfo pkgsrc/x11/qt4-libs/patches: patch-aq Log Message: Drop webkit check from GCC, we don't care about such ancient versions here and it actually breaks with recent clang versions. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 pkgsrc/x11/qt4-libs/distinfo cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/qt4-libs/patches/patch-aq Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585082284189880 Content-Disposition: inline Content-Length: 3763 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt4-libs/distinfo diff -u pkgsrc/x11/qt4-libs/distinfo:1.117 pkgsrc/x11/qt4-libs/distinfo:1.118 --- pkgsrc/x11/qt4-libs/distinfo:1.117 Sun Dec 1 13:28:09 2019 +++ pkgsrc/x11/qt4-libs/distinfo Tue Mar 24 20:38:03 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.117 2019/12/01 13:28:09 adam Exp $ +$NetBSD: distinfo,v 1.118 2020/03/24 20:38:03 joerg Exp $ SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166 @@ -20,7 +20,7 @@ SHA1 (patch-am) = 018a5982834737ca8ceb64 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 SHA1 (patch-ao) = 981b506bdf5d9d21940880308318d6ac3f59742d SHA1 (patch-ap) = f18e8d0c70bfc31a91d1b8660513ece38646b79c -SHA1 (patch-aq) = 7533741c81086cd1992d3e96a47c28d9ade27cbc +SHA1 (patch-aq) = d22c825680592ccca51a255fcfbc78fcf9169eac SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b Index: pkgsrc/x11/qt4-libs/patches/patch-aq diff -u pkgsrc/x11/qt4-libs/patches/patch-aq:1.19 pkgsrc/x11/qt4-libs/patches/patch-aq:1.20 --- pkgsrc/x11/qt4-libs/patches/patch-aq:1.19 Wed Jan 17 18:37:34 2018 +++ pkgsrc/x11/qt4-libs/patches/patch-aq Tue Mar 24 20:38:03 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-aq,v 1.19 2018/01/17 18:37:34 markd Exp $ +$NetBSD: patch-aq,v 1.20 2020/03/24 20:38:03 joerg Exp $ --- configure.orig 2015-05-07 14:14:56.000000000 +0000 +++ configure @@ -92,16 +92,28 @@ $NetBSD: patch-aq,v 1.19 2018/01/17 18:3 ;; 3.4*) canBuildQtXmlPatterns="no" -@@ -7734,7 +7747,7 @@ case "$XPLATFORM" in - *-g++*) - # Check gcc's version - case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +@@ -7731,20 +7744,6 @@ case "$XPLATFORM" in + canBuildWebKit="no" + canBuildQtXmlPatterns="no" + ;; +- *-g++*) +- # Check gcc's version +- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in - 5*|4*|3.4*) -+ [4-9]*|3.4*) - ;; - 3.3*) - canBuildWebKit="no" -@@ -7981,7 +7994,7 @@ fi +- ;; +- 3.3*) +- canBuildWebKit="no" +- ;; +- *) +- canBuildWebKit="no" +- canBuildQtXmlPatterns="no" +- ;; +- esac +- ;; + solaris-cc*) + # Check the compiler version + case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in +@@ -7981,7 +7980,7 @@ fi # env. variable. if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ]; then case "$PLATFORM" in @@ -110,7 +122,7 @@ $NetBSD: patch-aq,v 1.19 2018/01/17 18:3 # Avoid overriding the default settings when building clang/libc++. ;; *) -@@ -8050,7 +8063,7 @@ g++*) +@@ -8050,7 +8049,7 @@ g++*) 3.*) COMPILER_VERSION="3.*" ;; @@ -119,7 +131,7 @@ $NetBSD: patch-aq,v 1.19 2018/01/17 18:3 COMPILER_VERSION="4" ;; *) -@@ -8485,7 +8498,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -8485,7 +8484,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" @@ -128,7 +140,7 @@ $NetBSD: patch-aq,v 1.19 2018/01/17 18:3 if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -8701,6 +8714,7 @@ cat >>"$QTCONFIG.tmp" <>"$QTCONFIG.tmp" <