From 8c8f1cfd2aa9e839aad7dad6fd43b370cfbc0a1e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jan 2024 13:02:42 +0000 Subject: gentoo auto-resync : 10:01:2024 - 13:02:42 --- dev-qt/Manifest.gz | Bin 11573 -> 11574 bytes dev-qt/qtcore/Manifest | 2 +- dev-qt/qtcore/qtcore-5.15.12-r1.ebuild | 162 +++++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.15.12.ebuild | 119 ------------------ dev-qt/qtwebengine/Manifest | 8 +- dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 7 ++ dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 7 ++ dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 7 ++ dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 ++ 9 files changed, 195 insertions(+), 124 deletions(-) create mode 100644 dev-qt/qtcore/qtcore-5.15.12-r1.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.15.12.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 196adccced17..200704746ccc 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 72adf067fbd5..c922aad6587f 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -5,5 +5,5 @@ DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21e DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 EBUILD qtcore-5.15.11-r1.ebuild 2906 BLAKE2B b3ce53367db45981d90b87eeff12c62c3ad30be3a7f995141a183806fdeec50c2891659cdf59378ba20dc8eecb81b11614ef3b3803a372300331bc3b3b5a96f8 SHA512 b00fff15531cc4f6ef3784be5350f5087f12f575c31a6de9d2f6f8ea580ad209d16d0844779ca99bb9b40dde95b18f2b55b72d4c34c248a40279e478cbc44aab -EBUILD qtcore-5.15.12.ebuild 2912 BLAKE2B ce754f3e592b4bcd3a86a4ed71d4cf942a76ed72f663bce2861915ea85354c32c91ad10706ea90c9b21265613ca9ed09d1bc9e25316073797f1b35694a7af5a1 SHA512 84d33f87836fa152f5485ee568beaa3b4686ab5b75cdaa40c75515f73fcaba1eb9f9e37827b09fc534c0b800164917118e0fe1209ac1a5c612499cd973402a11 +EBUILD qtcore-5.15.12-r1.ebuild 4308 BLAKE2B 843c0e9c9bbe03042159380cb72f6d8c34a75a1911f9cdc6daef94b2d3335a3b95b318f299b5850177836c96941e7d138c16a1371939622c58d5c145729a7665 SHA512 d3fd4cef75c665b628fb933035c701367fbd3366761a913da26842c380bc28485765ab6f171a929f1aa5b8f3cc65590d9e6f0e16aa91046c3315d1ded24f29f2 MISC metadata.xml 594 BLAKE2B 0cefc88e620290c30db5f52e6804c43541617009ba05cc517a5c8b1c4039be9af9991e6e5b893577da3df52a83b70bd9f07a8061c518e9b52fdfdeb93a7df17f SHA512 73036ec739b85ea13025828f2526bce9d9fa6a3db3578925e4a4294be92a15dbe0f3af4db206690e3e786237312b3a23cb028a15abdd216e251db849a381a5be diff --git a/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild new file mode 100644 index 000000000000..fc74cab8e807 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + 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" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) +" +RDEPEND="${DEPEND} + != -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 tc-enables-fortify-source ; 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 + + qt5-build_src_prepare + + # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header + qt5_syncqt_version +} + +src_configure() { + local myconf=( + $(qt_use icu) + $(qt_use !icu iconv) + ) + 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.12.ebuild b/dev-qt/qtcore/qtcore-5.15.12.ebuild deleted file mode 100644 index a5a67b73e2a5..000000000000 --- a/dev-qt/qtcore/qtcore-5.15.12.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 - 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" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) -" -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 tc-enables-fortify-source ; 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 - - qt5-build_src_prepare - - # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header - qt5_syncqt_version -} - -src_configure() { - local myconf=( - $(qt_use icu) - $(qt_use !icu iconv) - ) - 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/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 3b1a93857add..9071c3a28668 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -13,8 +13,8 @@ DIST qtwebengine-6.7-patchset-2.tar.xz 8252 BLAKE2B 00e0c6b6ea596dc314c5897012e8 DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0 EBUILD qtwebengine-5.15.11_p20231120.ebuild 8984 BLAKE2B ee7c16795f9f012e0d70815693ddc9445e74cb29d84f011f30592396af9d5e03738b6598f8989cf3511123f3cf16e3120320f43be3afbe4dbca8c744ee1dd504 SHA512 d27c267821fa07c3eab2b02cef71a9f5d65cc58e71b25db26faa467b84bdee3a0a67387a0cf2034f70e01fc9452fec9b232ad431ed3a811ec64df7ec3bfaaf1e EBUILD qtwebengine-5.15.12_p20231219.ebuild 8865 BLAKE2B 64fd4a6916e1b93e299b3647160b667cc1335a5a8d6c2e3bebe72f1a1bbffc652814f21b18e7ffd6781a5778d2b92276cfbcf7240a14ee95c56f0c72cf30265d SHA512 c021ff7d6da6e5dadde5272fe7e77d6277015072210a714d76b24f26c402513bfa436870f8c135b10870b449cc1d883d27b88979b3f0d3568973fca7cbfd9b11 -EBUILD qtwebengine-6.6.1.ebuild 9222 BLAKE2B 060097276bfd64bd2ecbb1d7c0b8b2d34267099b8f9d8c32a56023daa43a56b07e92ce2ffae5961d86e9d1b8334572688968d04561e6eea774b8575a33fcbf5e SHA512 1d68888f51ff2b45b2faf3b9d0e0ef90e442b64f3aa3f47b3a77786be79e8d2d8266b554c9ecbd751b724d5d576371ad36874b4e77f446459e392ab1acdc4e3e -EBUILD qtwebengine-6.6.9999.ebuild 9216 BLAKE2B 4533cd2a5e5d7a1023c225ffd9146cc0284b3d3c0127809f409d332a97d6c486088acfc0581d377f52f433e21a2a271eb4cc50bc6f6c1c96eb575b5141a4d7c9 SHA512 d62cafefd80b654237df8e402727d70715c067862708550a9724e47e01e9fa0de265822c4846e717f5a3be22affff9bda01c1b3f4421d1ebf2c3493fc449ee0e -EBUILD qtwebengine-6.7.9999.ebuild 9220 BLAKE2B 288e073d434ec366ce5c577c903ee1bd85b9648e378430e64d2719a7fcabc963c40144b42721de9a096a931fa6bb23085fb1a60783ec9db72777d83ad6dc3100 SHA512 f5b7a84061d63a0e9b49ef1cf0dc71dfc9e7eb6a747300b0904c6efc51bba03c9a0fc72229a275f0f4aba6581d4c73a1ecb7a2bc6ee94b5ff039a44cd23f6c5b -EBUILD qtwebengine-6.9999.ebuild 9220 BLAKE2B 288e073d434ec366ce5c577c903ee1bd85b9648e378430e64d2719a7fcabc963c40144b42721de9a096a931fa6bb23085fb1a60783ec9db72777d83ad6dc3100 SHA512 f5b7a84061d63a0e9b49ef1cf0dc71dfc9e7eb6a747300b0904c6efc51bba03c9a0fc72229a275f0f4aba6581d4c73a1ecb7a2bc6ee94b5ff039a44cd23f6c5b +EBUILD qtwebengine-6.6.1.ebuild 9386 BLAKE2B e1c665139f15791a751528a0e64273feb922a8d05eedf7b01a7b7eda94a34fa827c061840c4ded41b4983cc5a8f30ab13d4b643c052668b82a491a7337d8636b SHA512 1909532fa4517e80784352f464c1c2e383e8ed491fe2368b30aa88c906d3f4beed8390dada46936d5405291f6ebdb677bdfb0202d79cdb2f74ed97b32e956775 +EBUILD qtwebengine-6.6.9999.ebuild 9380 BLAKE2B 5b77e810647267fa2231b4af2eb5fd0f62f4e242785eb27c712627f3b3811dd4ae9c3bb100cc6b064c9c5f837466a2b3fbe8adf39e792551fabbb5e9c547f888 SHA512 cbfa5acb8564c7a952baf145413725713153409ff7ee43fc3f17b93608900a2ede68174ad47270e7581fb2d08a3042bb5f7329ade17f2fda538d86acf56eb7c7 +EBUILD qtwebengine-6.7.9999.ebuild 9384 BLAKE2B b9c3cab728dd648d4015bc8cfce040400a05e898fc120dc2d149811b0e61ac0e0a8e2abafd037b184a8c6f6bd2ad1644e3b6eb0792b9074a8857ead00b78c60d SHA512 4246d0ea2cf14f4d67afe4a5f6b6163e83e8fec1368cb3c19297d8b808c7dde5c6a162fa2cddec677b7cde00454ba64a6ceb0d2e95c19fd70b58d984e49d5f45 +EBUILD qtwebengine-6.9999.ebuild 9384 BLAKE2B b9c3cab728dd648d4015bc8cfce040400a05e898fc120dc2d149811b0e61ac0e0a8e2abafd037b184a8c6f6bd2ad1644e3b6eb0792b9074a8857ead00b78c60d SHA512 4246d0ea2cf14f4d67afe4a5f6b6163e83e8fec1368cb3c19297d8b808c7dde5c6a162fa2cddec677b7cde00454ba64a6ceb0d2e95c19fd70b58d984e49d5f45 MISC metadata.xml 1312 BLAKE2B 4473aad7240926735bbabbeaeff862f3bc253c3e79e09086c17fb9b603ba5e9dc25ecbbc423a60a344bf471e11634c9b4728222e66f3d19022e3f3d2c9cc2f60 SHA512 797e67cf05a37dcb5ad5712cabef051b4a8f5dcb9601b627bcf029e4c99d0a09fa62b03cb9dcb64b5b6e5f29104e72711136d4c9aa79928c34f6bfe212742e2d diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild index 880963955ebc..5e9631cd0c14 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild @@ -250,6 +250,13 @@ src_configure() { qt6-build_src_configure } +src_compile() { + # tentatively work around a possible (rare) race condition (bug #921680) + cmake_build WebEngineCore_sync_all_public_headers + + cmake_src_compile +} + src_test() { if [[ ${EUID} == 0 ]]; then # almost every tests fail, so skip entirely diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index 65de6a9759b5..92a315e96855 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -250,6 +250,13 @@ src_configure() { qt6-build_src_configure } +src_compile() { + # tentatively work around a possible (rare) race condition (bug #921680) + cmake_build WebEngineCore_sync_all_public_headers + + cmake_src_compile +} + src_test() { if [[ ${EUID} == 0 ]]; then # almost every tests fail, so skip entirely diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index eb94f0e7e253..b08109bae395 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -250,6 +250,13 @@ src_configure() { qt6-build_src_configure } +src_compile() { + # tentatively work around a possible (rare) race condition (bug #921680) + cmake_build WebEngineCore_sync_all_public_headers + + cmake_src_compile +} + src_test() { if [[ ${EUID} == 0 ]]; then # almost every tests fail, so skip entirely diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index eb94f0e7e253..b08109bae395 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -250,6 +250,13 @@ src_configure() { qt6-build_src_configure } +src_compile() { + # tentatively work around a possible (rare) race condition (bug #921680) + cmake_build WebEngineCore_sync_all_public_headers + + cmake_src_compile +} + src_test() { if [[ ${EUID} == 0 ]]; then # almost every tests fail, so skip entirely -- cgit v1.2.3