diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
tree | db33a91259730be84999e13a8d8168c799f50ac0 /dev-qt/qtcore | |
parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) |
gentoo resync : 20.10.2021
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r-- | dev-qt/qtcore/Manifest | 8 | ||||
-rw-r--r-- | dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch | 88 | ||||
-rw-r--r-- | dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch | 54 | ||||
-rw-r--r-- | dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch | 38 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.15.2-r10.ebuild | 2 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.15.2-r3.ebuild | 110 |
6 files changed, 2 insertions, 298 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index a51fde7df472..f124a0ce2dff 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,12 +1,6 @@ AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097 -AUX qtcore-5.15.2-fix-UB-in-QDateTime.patch 3707 BLAKE2B 7b1ed1b539d04e299b3148acf85d69c014a8a76882a682910b323117e176c68dab8b48de12c0a5c885508dd6d97a4ae9da4a27162323ba743d25f9a83319b367 SHA512 62beec1be070ff6136f1b52c1789e31f877bf728ca12c54c90de6302f6c35008d0d9e939f99a92465ca14ee977faed507b2acdea553d8904eb201aed41a97805 -AUX qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch 1944 BLAKE2B 71f3a02d89e3604cec0f021fe28bddc0ab43e242742d0f5af17a46bbfdc444f7d3244fe995195ef0c1c9119313a472bd7e64a6fd02986f7cb6cb544553fbd36d SHA512 6f9f57eb2b374b56576fe0046518810e07482aae1a74f45c9692ffbd797ad1653aedfcd896d89909ade4572564164e92698de64da9f98ce876952c2c96b15aa3 -AUX qtcore-5.15.2-gcc11.patch 1002 BLAKE2B 5104165920881f0ec960a96b5e82430acf32eaf2a3b2a1724844c18a2b0661d71820401d4f6c8d25e56b3a5dfb99cc47f024a96c8fc48f9ddcb1fb8dacc8a90d SHA512 658169f8d7fa42d492f69b44feadd369bccf9a76d01989fd8b14991f97cdf3c8291ff316e195a05a8bb015bae477d5c49d495eefcfc4f3e25dbc58f33688854e DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtcore-5.15.2-r10.ebuild 2327 BLAKE2B a5535fa9f65e6f99df0e964896594f063dc4730312b6262b8aa2cbe80cf47d0705593724f5fbe6df0501f574a77e0c1ebf62f17e3b24303515a2f7bf22b2eb00 SHA512 3851c850f13eb28edf4a0dd06b628b2675803eaf7419b7338a726a3a500c42764fc7c0146f3bae718cdf1de191f030ee0c9e07d32a0e2ad8c3362cee72fe9ca6 -EBUILD qtcore-5.15.2-r3.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51 +EBUILD qtcore-5.15.2-r10.ebuild 2325 BLAKE2B 14b93476a682c92c918445bdb3d8e66c097c60e90065050b13240c990c5cebed882fb0dc9be85a5ca2de487d4f20ba45c53a553f85ec217897c0ea6b7281c85a SHA512 1edc816208a111a4efbbcb2ab229c24e3ec8ed1ecd72961d42f1df17318a1d81dcb28f8ca61526a1c4cd0a6da3b19d962e5c06b2b7e46b6969fe870d18f951bf MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch deleted file mode 100644 index b131b7af3657..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d2c0fc2b5f1c07c1e0acb1c0127578066b6f9b8e Mon Sep 17 00:00:00 2001 -From: Edward Welbourne <edward.welbourne@qt.io> -Date: Tue, 24 Nov 2020 12:45:11 +0100 -Subject: [PATCH] Bounds-check time-zone offsets when parsing - -Parsing of time-zone offsets should check the offset string conforms -to the expected format and has valid values in its fields. The -QDateTime parser, fromOffsetString(), neglected the bounds check on -hours; the QTzTimeZonePrivate parser, parsePosixTime(), neglected all -upper bounds checks, only checking against negative valus. - -Drive-by - refined phrasing of a comment. - -Fixes: QTBUG-88656 -Change-Id: If04cdbe65064108eaa87c42310527783ad21b4c0 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e) -Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> ---- - src/corelib/time/qdatetime.cpp | 2 +- - src/corelib/time/qtimezoneprivate_tz.cpp | 27 ++++++++++++++++----------- - 2 files changed, 17 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp -index e824787880c..a2816e87f4a 100644 ---- a/src/corelib/time/qdatetime.cpp -+++ b/src/corelib/time/qdatetime.cpp -@@ -240,7 +240,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept - const QStringView hhRef = time.left(qMin(hhLen, time.size())); - bool ok = false; - const int hour = C.toInt(hhRef, &ok); -- if (!ok) -+ if (!ok || hour > 23) // More generous than QTimeZone::MaxUtcOffsetSecs - return 0; - - const QStringView mmRef = time.mid(qMin(mmIndex, time.size())); -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index b816b4ecff2..adc590878d7 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -394,29 +394,34 @@ static int parsePosixTime(const char *begin, const char *end) - // Format "hh[:mm[:ss]]" - int hour, min = 0, sec = 0; - -- // Note that the calls to qstrtoll do *not* check the end pointer, which -- // means they proceed until they find a non-digit. We check that we're -- // still in range at the end, but we may have read from past end. It's the -- // caller's responsibility to ensure that begin is part of a -- // null-terminated string. -+ // Note that the calls to qstrtoll do *not* check against the end pointer, -+ // which means they proceed until they find a non-digit. We check that we're -+ // still in range at the end, but we may have read past end. It's the -+ // caller's responsibility to ensure that begin is part of a null-terminated -+ // string. - -+ const int maxHour = QTimeZone::MaxUtcOffsetSecs / 3600; - bool ok = false; -- hour = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || hour < 0) -+ const char *cut = begin; -+ hour = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || hour < 0 || hour > maxHour || cut > begin + 2) - return INT_MIN; -+ begin = cut; - if (begin < end && *begin == ':') { - // minutes - ++begin; -- min = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || min < 0) -+ min = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || min < 0 || min > 59 || cut > begin + 2) - return INT_MIN; - -+ begin = cut; - if (begin < end && *begin == ':') { - // seconds - ++begin; -- sec = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || sec < 0) -+ sec = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || sec < 0 || sec > 59 || cut > begin + 2) - return INT_MIN; -+ begin = cut; - } - } - --- -2.16.3 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch deleted file mode 100644 index 892d89d2948c..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001 -From: Kai Koehne <kai.koehne@qt.io> -Date: Tue, 13 Oct 2020 15:47:31 +0200 -Subject: [PATCH] Fix allocated memory of QByteArray returned by - QIODevice::readLine - -If the maxSize argument is 0 (the default), QIODevice::readLine will -allocate a QByteArray with the size of the next chunk of data, which -may be quite large. Before returning, it then resizes the byte array -to the actual size that was read. - -But since change 6b884d2aa129, QByteArray::resize() does no -longer shrink the capacity. This means that the returned QByteArray -keeps it's maximum size as allocated memory. This can lead to -excessive memory consumption, especially if the returned QByteArray's -are stored for further processing in the client code. - -Fix this by explicitly calling QByteArray::squeeze() before returning. - -[ChangeLog][QtCore][QIODevice] Fixes a regression in Qt 5.15 causing -QByteArray's that are returned by QIODevice::readLine() to -consume large amounts of memory. - -Fixes: QTBUG-87010 -Change-Id: I1f95fc4098849e900680fc945238bfeda881022c -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry picked from commit 263b29eedb223dec1ecaee193302070af87a1852, -limited squeeze() call if bytes are actually read to preserve retVal.isNull() -behavior in 5.15) ---- - src/corelib/io/qiodevice.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp -index cc1d1102522..0f11c2e805c 100644 ---- a/src/corelib/io/qiodevice.cpp -+++ b/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; - } --- -2.16.3 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch b/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch deleted file mode 100644 index 9d391311c345..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: include <limits> to fix some GCC 11 build issues -Origin: upstream, commits: - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 -Last-Update: 2021-01-26 - ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -44,6 +44,8 @@ - #include <QtCore/qfloat16.h> - #include <QtCore/qglobal.h> - -+#include <limits> -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include <stdlib.h> - #include <string.h> ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -43,6 +43,7 @@ - - #include <QtCore/qglobal.h> - #include <QtCore/qmetatype.h> -+#include <limits> - #include <string.h> - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> - -+#include <limits> -+ - QT_BEGIN_NAMESPACE - - diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild index 44e955e9f6e0..ee99b42e8112 100644 --- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework" SLOT=5/${QT5_PV} if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="icu old-kernel systemd" diff --git a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild deleted file mode 100644 index dadcd5585a58..000000000000 --- a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit linux-info qt5-build - -DESCRIPTION="Cross-platform application development framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="icu old-kernel systemd" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND} - !<dev-qt/qtcore-4.8.7-r4:4 - dev-qt/qtchooser -" - -QT5_TARGET_SUBDIRS=( - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/corelib - src/tools/qlalr - doc -) - -QT5_GENTOO_PRIVATE_CONFIG=( - !:network - !:sql - !:testlib - !:xml -) - -PATCHES=( - "${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306 - "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914 - "${FILESDIR}"/${P}-fix-UB-in-QDateTime.patch # QTBUG-88656 - "${FILESDIR}"/${P}-fix-alloc-mem-of-QByteArray.patch # QTBUG-87010 - "${FILESDIR}"/${P}-gcc11.patch # bug 768342, 768354 - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 -) - -pkg_pretend() { - use kernel_linux || return - get_running_version - if kernel_is -lt 4 11 && ! use old-kernel; then - ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" - ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" - fi -} - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die - - # fix missing qt_version_tag symbol w/ LTO, bug 674382 - sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(qt_use icu) - $(qt_use !icu iconv) - $(qt_use systemd journald) - ) - use old-kernel && myconf+=( - -no-feature-renameat2 # needs Linux 3.16, bug 669994 - -no-feature-getentropy # needs Linux 3.17, bug 669994 - -no-feature-statx # needs Linux 4.11, bug 672856 - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - local flags=( - DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG - OPENGL OPENSSL SSL WIDGETS - ) - - for flag in ${flags[@]}; do - cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} |