diff options
Diffstat (limited to 'dev-qt/qtcore')
| -rw-r--r-- | dev-qt/qtcore/Manifest | 5 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch | 56 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.15.2-r10.ebuild | 107 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.15.2-r3.ebuild (renamed from dev-qt/qtcore/qtcore-5.15.2-r2.ebuild) | 0 |
4 files changed, 167 insertions, 1 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index a4a62b7a8338..cdbf3e1d3324 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -4,7 +4,10 @@ AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d714 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 +AUX qtcore-5.15.2-revert-3a273ac4.patch 2373 BLAKE2B 4033cac8d0f4f1e96a519cf8ff524e40462fad2c5ff7e83a412108c2e4296db0e759fea93dd01835d1b9552041d15cb4ca0eccc01ef05aba14ade60cb542c478 SHA512 425f141a3a756721ef35191262885d52a3da948b079cd5f31c2c24a5eba76e0154e64486633758802f60912f0332b9814d11685b92bd2188ee08f4cf920a02ff +DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17 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-r2.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51 +EBUILD qtcore-5.15.2-r10.ebuild 2511 BLAKE2B c19f10a822863507b7d36faf243b538a74f666e5655e801222daba051136455311789ab8063ef30fc274a491d1bd89869c7556c46502900258562a0286f6bb17 SHA512 a5926114d78dd1ad39b507e5a0c063617aad21514090874094fadd6d48ee95ef0490e99daa1674db58b934307027105c6b201fa5729dad4807eeebe8668575c2 +EBUILD qtcore-5.15.2-r3.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51 MISC metadata.xml 832 BLAKE2B 20f3ca80bc8aea1203ca8c3f34314fb599151eed5639cb9ba6cee97b70a04152ce8c06a4bf1f41058515a3a9d32242bcdf84b6fc75b68b7183951f7c9747396d SHA512 ea1c7dfef8c3afeda436a1de09ee2002441b7d13b3aa40bda02324668f3664fceafcf276f87c897e83f49e246e9fb3ffcefa95098ccb2f5a8b503779686e1b3e diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch b/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch new file mode 100644 index 000000000000..a29e1b5256d4 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch @@ -0,0 +1,56 @@ +From d9a85af5f24d0608c79b2d87b01213833bee01e5 Mon Sep 17 00:00:00 2001 +From: David Faure <david.faure@kdab.com> +Date: Thu, 19 Aug 2021 15:07:13 +0200 +Subject: [PATCH] Revert "QString::lastIndexOf: fix off-by-one for zero length + matches" + +This reverts commit 3a273ac47f20e82a1f2f63411b210025ca0f4495. + +See QTBUG-94215 + +6cee204d56205e250b0675c9c6d4dd8a2367f3c4 for qtbase/dev changes the +behaviour even further, I'm pretty sure we don't want that in Qt 5.15.x, +see discussion in https://codereview.qt-project.org/c/qt/qtbase/+/365179. + +Change-Id: I663d74e0d44ebf46291fe0e8a7dc609be82eedc6 +--- + src/corelib/text/qstring.cpp | 4 ++-- + tests/auto/corelib/text/qstring/tst_qstring.cpp | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp +index 02a9fe3a30..e6e7cbaad4 100644 +--- a/src/corelib/text/qstring.cpp ++++ b/src/corelib/text/qstring.cpp +@@ -4558,13 +4558,13 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress + return -1; + } + +- int endpos = (from < 0) ? (size() + from + 1) : (from); ++ int endpos = (from < 0) ? (size() + from + 1) : (from + 1); + QRegularExpressionMatchIterator iterator = re.globalMatch(*this); + int lastIndex = -1; + while (iterator.hasNext()) { + QRegularExpressionMatch match = iterator.next(); + int start = match.capturedStart(); +- if (start <= endpos) { ++ if (start < endpos) { + lastIndex = start; + if (rmatch) + *rmatch = std::move(match); +diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp +index 8f53824050..4c4a8f0416 100644 +--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp ++++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp +@@ -1674,7 +1674,7 @@ void tst_QString::lastIndexOf() + QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected); + QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs), expected); + +- if (from >= -1 && from < haystack.size() && needle.size() > 0) { ++ if (from >= -1 && from < haystack.size()) { + // unfortunately, QString and QRegExp don't have the same out of bound semantics + // I think QString is wrong -- See file log for contact information. + { +-- +GitLab + diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild new file mode 100644 index 000000000000..d8791013a67c --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619 +QT5_MODULE="qtbase" +inherit linux-info qt5-build + +DESCRIPTION="Cross-platform application development framework" +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/qtchooser-66-r1 +" + +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 + # Revert to 5.15.2 (upstream Qt release) behavior, QTBUG-94215 + # See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/46 + "${FILESDIR}"/${P}-revert-3a273ac4.patch +) + +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 +} diff --git a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild index dadcd5585a58..dadcd5585a58 100644 --- a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild |