summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-08-15 12:37:37 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-08-15 12:37:37 +0200
commit0f18ee87c123a9194c6caee268403ecc7dc45e80 (patch)
treeed41832de105f0e3f0508a1fa017c07d4dc0e6cf /dev-qt/qtcore
parentdev-qt/qtconcurrent: drop 5.15.5 (diff)
downloadgentoo-0f18ee87c123a9194c6caee268403ecc7dc45e80.tar.gz
gentoo-0f18ee87c123a9194c6caee268403ecc7dc45e80.tar.bz2
gentoo-0f18ee87c123a9194c6caee268403ecc7dc45e80.zip
dev-qt/qtcore: drop 5.15.5-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r--dev-qt/qtcore/Manifest1
-rw-r--r--dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch61
-rw-r--r--dev-qt/qtcore/qtcore-5.15.5-r1.ebuild102
3 files changed, 0 insertions, 164 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 9667a62512b5..88d6a49f0581 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch b/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
deleted file mode 100644
index 1be46b496cf9..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://invent.kde.org/qt/qt/qtbase/-/commit/6d3d164bec17876f5b24ae9102767ef1236aa37b
-
-From 6d3d164bec17876f5b24ae9102767ef1236aa37b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 20 Jun 2022 20:35:12 +0100
-Subject: [PATCH] QArrayData: fix UB via reinterpret_cast (crash with
- FORTIFY_SOURCE=3)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-FORTIFY_SOURCE=3 is a new level of FORTIFY_SOURCE available with GCC 12+.
-
-With Qt 5.15, it ends up triggering UB in the pointer arithmetic
-in QArrayData which breaks various FOSS applications using qtcore.
-
-Qt upstream fixed this independently for 6.x (in at least
-eab6eb64d2fab21c4791738323ca7d670a907de1) but did so at the same time as
-various internal changes and hence is not appropriate for cherry-picking to 5.15.x.
-
-I reported the issue to Qt (QTBUG-103782) and they've created a fix for 5.15 which
-is not yet public but based on the description in the bug, should be functionally
-the same as this. They have not backported the intrusive internal changes
-from 6.x.
-
-Originally grabbed from https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtbase/mitigate-FORTIFY_SOURCE-3.patch.
-
-Bug: https://bugs.gentoo.org/847145
-Bug: https://bugs.gentoo.org/852974
-Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964
-Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-Task-number: QTBUG-103782
-Thanks-to: Martin Liška <mliska@suse.cz>
---- a/src/corelib/tools/qarraydata.h
-+++ b/src/corelib/tools/qarraydata.h
-@@ -42,6 +42,7 @@
-
- #include <QtCore/qrefcount.h>
- #include <string.h>
-+#include <cstdint>
-
- QT_BEGIN_NAMESPACE
-
-@@ -58,14 +59,14 @@ struct Q_CORE_EXPORT QArrayData
- {
- Q_ASSERT(size == 0
- || offset < 0 || size_t(offset) >= sizeof(QArrayData));
-- return reinterpret_cast<char *>(this) + offset;
-+ return reinterpret_cast<void *> (reinterpret_cast<uintptr_t>(this) + offset);
- }
-
- const void *data() const
- {
- Q_ASSERT(size == 0
- || offset < 0 || size_t(offset) >= sizeof(QArrayData));
-- return reinterpret_cast<const char *>(this) + offset;
-+ return reinterpret_cast<void *> (reinterpret_cast<uintptr_t>(this) + offset);
- }
-
- // This refers to array data mutability, not "header data" represented by
-GitLab
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
deleted file mode 100644
index 80b1d1cbcbf4..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ~loong 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}"
-
-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}"/${P}-fortify-source-3.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
- qt5_symlink_binary_to_path qmake 5
-
- 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
-}