Date: Sat, 31 Oct 2020 17:56:44 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> 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 Message-ID: <202010311756.09VHuiKo093372@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010311756.09VHuiKo093372>