diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-04-09 23:35:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-09 23:35:30 +0100 |
commit | 47d5e233005d470dbd431a280e64ce6073fc7149 (patch) | |
tree | 135efe53d72c541429f68d7ed82186f2b34fcdb6 /dev-qt/qtcore | |
parent | bac9556f73da9ac333933778ce81c053bd989a26 (diff) |
gentoo auto-resync : 09:04:2023 - 23:35:30
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r-- | dev-qt/qtcore/Manifest | 4 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 123 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 2 |
3 files changed, 2 insertions, 127 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 9fdcae2de110..863dc4bcc78a 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,7 +1,5 @@ DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e -DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce -EBUILD qtcore-5.15.8-r3.ebuild 3101 BLAKE2B 8210baf74e0b5540a0cf5626a343a71486bb916e5a8d233b9c73598a926fbf018b48fa489ec60f7219388862bdec0af1aeb3ec242ca768eba93c07cba97f9ed1 SHA512 535109e632ff78bd42cd468015a4622d67a230eddd03bf9c970dad50b4fdf52968bb99b5162fbc510bc2e5ff702cfe4b7911ecf2342013efdc82949995d62604 -EBUILD qtcore-5.15.8-r4.ebuild 3107 BLAKE2B fe3e2a30efcd42176f3d41d77e9fbb837bdcfa098bf30aa3cbb9ff46598d32890c4b71d1e623340f4947c32985651d4fcaad2a2a0272664e866bbfe4c5bb923d SHA512 9ed7ccb069bf037cac68445710037929f746d3363df6fd5b975d971bbe073ec039d363d86144179b77fa2897b4d20277daaa2f69e8038170db4eae9477bcec70 +EBUILD qtcore-5.15.8-r4.ebuild 3101 BLAKE2B 13af6082eaee95d509976e38037141e242ea0ef6a5fd644a6fee0b6bc34dcc2a54138b11b493302a332071494bfca91172be6e52c5f8b3657234c1896f4f109a SHA512 ccd88e7f60996f70e3e6a3a90732a8ede7ae6ca118af604eff79359c27a001b9622510356f20db1e9cd0ccadbd46626df35850a6cbb8f915988bf1c8d002424e MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5 diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild deleted file mode 100644 index 3b65d3d1fa82..000000000000 --- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=5 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit linux-info flag-o-matic toolchain-funcs qt5-build - -DESCRIPTION="Cross-platform application development framework" -SLOT=5/${QT5_PV} - -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 -) - -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 - - # Broken with FORTIFY_SOURCE=3 - # Our toolchain sets F_S=2 by default w/ >= -O2, so we need - # to unset F_S first, then explicitly set 2, to negate any default - # and anything set by the user if they're choosing 3 (or if they've - # modified GCC to set 3). - # - # Refs: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078 - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709 - # https://bugreports.qt.io/browse/QTBUG-103782 - # bug #847145 - if is-flagq '-O[23]' || is-flagq '-Ofast' ; then - # We can't unconditionally do this b/c we fortify needs - # some level of optimisation. - filter-flags -D_FORTIFY_SOURCE=3 - # (Qt doesn't seem to respect CPPFLAGS?) - append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 - fi - - # Leads to miscompiled qtcore, bug #865339 - tc-is-clang && append-flags -fno-stack-clash-protection - - qt5-build_src_prepare - - # workaround for 0148-Annotate-QMutex-...patch adding a header - perl bin/syncqt.pl -version ${PV} || die -} - -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 -} diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild index 0f9acb2db2e4..4752b953c9a7 100644 --- a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=6 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase" |