Received: by mail.netbsd.org (Postfix, from userid 605) id 9D61B84FCB; Thu, 19 Apr 2018 08:23:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 93A3384FC0 for ; Thu, 19 Apr 2018 08:23:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Pi7ycrwT7Jge for ; Thu, 19 Apr 2018 08:23:12 +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 CD7E784FC9 for ; Thu, 19 Apr 2018 08:23:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B2BA7FBEC; Thu, 19 Apr 2018 08:23:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_152412619293320" MIME-Version: 1.0 Date: Thu, 19 Apr 2018 08:23:12 +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: <20180419082312.B2BA7FBEC@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. --_----------=_152412619293320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Apr 19 08:23:12 UTC 2018 Modified Files: pkgsrc/x11/qt5-qtbase: distinfo Added Files: pkgsrc/x11/qt5-qtbase/patches: patch-src_corelib_global_qglobal.h Log Message: qt5: Pull in upstream fix for init_priority. Fixes PR#53197 from Mike Owens. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/qt5-qtbase/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_152412619293320 Content-Disposition: inline Content-Length: 2142 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtbase/distinfo diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.39 pkgsrc/x11/qt5-qtbase/distinfo:1.40 --- pkgsrc/x11/qt5-qtbase/distinfo:1.39 Thu Mar 1 20:09:49 2018 +++ pkgsrc/x11/qt5-qtbase/distinfo Thu Apr 19 08:23:12 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2018/03/01 20:09:49 adam Exp $ +$NetBSD: distinfo,v 1.40 2018/04/19 08:23:12 jperkin Exp $ SHA1 (qtbase-everywhere-src-5.10.1.tar.xz) = 234275f97ca401ae3df5e0c3d937e68056957bbe RMD160 (qtbase-everywhere-src-5.10.1.tar.xz) = b0587af8736bedc9b80ceb85f10ece64389a904c @@ -13,6 +13,7 @@ SHA1 (patch-qmake_generators_makefile.cp 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_global_qglobal.h) = ba87f0711ed0151f3b98ca5269634d47b8cbd6c9 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 Added files: Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h:1.1 --- /dev/null Thu Apr 19 08:23:12 2018 +++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h Thu Apr 19 08:23:12 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_corelib_global_qglobal.h,v 1.1 2018/04/19 08:23:12 jperkin Exp $ + +Pull in upstream fix from https://codereview.qt-project.org/#/c/221071 + +--- src/corelib/global/qglobal.h.orig 2018-02-08 18:24:48.000000000 +0000 ++++ src/corelib/global/qglobal.h +@@ -508,7 +508,7 @@ using qsizetype = QIntegerForSizeof