From owner-svn-ports-head@freebsd.org Sat Oct 31 17:56:44 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B599C45286D; Sat, 31 Oct 2020 17:56:44 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CNn1S4LzKz3WfW; Sat, 31 Oct 2020 17:56:44 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7895AB717; Sat, 31 Oct 2020 17:56:44 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09VHuiGB093375; Sat, 31 Oct 2020 17:56:44 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09VHuiKo093372; Sat, 31 Oct 2020 17:56:44 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202010311756.09VHuiKo093372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 31 Oct 2020 17:56:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553789 - in head/devel/qt5-core: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/devel/qt5-core: . files X-SVN-Commit-Revision: 553789 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Oct 2020 17:56:44 -0000 Author: danfe Date: Sat Oct 31 17:56:43 2020 New Revision: 553789 URL: https://svnweb.freebsd.org/changeset/ports/553789 Log: Pull upstream patch for QTBUG-87010 which fixes a regression in Qt 5.15 causing QByteArray's that are returned by QIODevice::readLine() to consume large amounts of memory. This is required to unbreak `astro/stellarium' on e.g. i386, where `lconvert' utility runs out of 32-bit address space. Reference: https://bugreports.qt.io/browse/QTBUG-87010 Approved by: kde (tcberner) Added: head/devel/qt5-core/files/patch-src_corelib_io_qiodevice.cpp (contents, props changed) Modified: head/devel/qt5-core/Makefile Modified: head/devel/qt5-core/Makefile ============================================================================== --- head/devel/qt5-core/Makefile Sat Oct 31 17:55:01 2020 (r553788) +++ head/devel/qt5-core/Makefile Sat Oct 31 17:56:43 2020 (r553789) @@ -2,7 +2,7 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt5- Added: head/devel/qt5-core/files/patch-src_corelib_io_qiodevice.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-core/files/patch-src_corelib_io_qiodevice.cpp Sat Oct 31 17:56:43 2020 (r553789) @@ -0,0 +1,17 @@ +--- src/corelib/io/qiodevice.cpp.orig 2020-05-11 08:15:08 UTC ++++ src/corelib/io/qiodevice.cpp +@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize) + } else + readBytes = readLine(result.data(), result.size()); + +- if (readBytes <= 0) ++ if (readBytes <= 0) { + result.clear(); +- else ++ } else { + result.resize(readBytes); ++ result.squeeze(); ++ } + + return result; + }