From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 56B83158088 for ; Wed, 12 Jan 2022 16:14:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4624E2BC02B; Wed, 12 Jan 2022 16:14:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF6A32BC007 for ; Wed, 12 Jan 2022 16:14:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7717134327A for ; Wed, 12 Jan 2022 16:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B949275 for ; Wed, 12 Jan 2022 16:14:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1642003933.652c73b5e469b985670628eb7001e03076aeabf7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtcore/Manifest dev-qt/qtcore/qtcore-5.15.2-r13.ebuild X-VCS-Directories: dev-qt/qtcore/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 652c73b5e469b985670628eb7001e03076aeabf7 X-VCS-Branch: master Date: Wed, 12 Jan 2022 16:14:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e8d6fab3-7176-4fd4-af7f-502eb06ebae5 X-Archives-Hash: 33b55c2a5c568d31ec9fb54172117f0d commit: 652c73b5e469b985670628eb7001e03076aeabf7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 12 12:55:53 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 12 16:12:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652c73b5 dev-qt/qtcore: 5.15.2-r13 version bump at KDE 38ad2f39 Changes since 7c6c0030cf80ef7b9ace42996b0e0c3a72f76860: Alexander Volkov (1): Call statx() with AT_NO_AUTOMOUNT Allan Sandfeld Jensen (1): Avoid mixing atomic futex changes and QAtomic Andreas Buhr (1): Fix segmentation fault in QObject::dumpObjectInfo Andreas Sturmlechner (1): QDateTime: Don't require c++17 Antonio Rojas (1): Restore C++11 compatibility after e8b9f4c28d3ab5e960dc54f2dc0c4b749b0b50e0 Ievgenii Meshcheriakov (2): QThread: Reset the system thread ID when thread exits on Unix QThread: Remove superfluous initialization of threadId on Unix Jarek Kobus (1): Fix pattern type matching Marc Mutz (8): QVarLengthArray: fix UB (precondition violation) in range-erase() QString: fix UB (pointer arithmetic on nullptr) in qLastIndexOf QDateTime: fix UB (signed overflow) in addDays() QVariantAnimation: fix UB (FP 0/0) in interpolated() arg calculation QThread: fix UB (invalid enum value) on Private::Priority QVarLengthArray: assert that the range passed to erase() is valid QVarLengthArray: fix insert() type/alias mismatch between decl and impl QVarLengthArray: fix size update on failed append() Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtcore/Manifest | 1 + dev-qt/qtcore/qtcore-5.15.2-r13.ebuild | 104 +++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 8f45ea5ec73a..4f0dd80dbe1f 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc diff --git a/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild new file mode 100644 index 000000000000..0b8f86d5973a --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924 +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 ~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 +) + +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 +}