diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/Manifest.gz | bin | 10173 -> 10169 bytes | |||
| -rw-r--r-- | dev-qt/qtsvg/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtsvg/qtsvg-5.15.2-r12.ebuild | 25 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild | 67 |
5 files changed, 78 insertions, 18 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 61c7cb988ded..a7219610b394 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 72384422fd41..e57a58030ecf 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,3 +1,5 @@ +DIST qtsvg-5.15.2-0cb681ea.tar.gz 2779754 BLAKE2B 80abdc1b9bd41bee97e8fbcb64927a8d1b42d7189d0a2f8754650383d9092be62c93eb084a59fa71e2a73f06a9eb69e09a52dc8b927e1715fcbe5f544c28726d SHA512 4e2472997b78ac7bfc586e6b89fb36f2f3771540c0740af9896dde95a2d52d5b52e589f1b65a9f9776a700a9072165b4b5313f901d22af81435d3d39c4fff283 DIST qtsvg-5.15.2-24128cdf.tar.gz 2779708 BLAKE2B 5e52a0b1c7b3e21ab58b2e6e091c8fc85d5432e247313f74bd8c4d8899cd2634e3242d5d328174d3702544d050504dd3870c1c075a2b7a87c268c371c95b0c76 SHA512 c0840608ff66b0f335f8e5d883a5f8c113de91608ea8b613743c4881a103ff1c9981337c29a0e272ca2bccd4077df9cd8fde320e09eec1e8f6a3eead5cb75198 EBUILD qtsvg-5.15.2-r11.ebuild 535 BLAKE2B abf9b0983cf4b988af93bdbfcf2630675f04399dab050d31b2e0efa4075f529ea6583d58304aa53e80f4efbdd4df9b5e20b97bdb3cbffb9d23d30081bcc17e8f SHA512 00a809f635a1ff84881f780dcc5d4dfcba1d90320a886f4c3928fd3f12a6e26d493fc45c66caaa261153e980c812da58774c7a032d11c4fcaea225428e3be1d5 +EBUILD qtsvg-5.15.2-r12.ebuild 541 BLAKE2B 92aedf0a4ca1bdef01cc1ade3e8d15c0a0f3f2b8a2246e3fa6e557299cdfbcbd375a2eafca1a8b306b131e752b8f13a3bea2b2f39008a6f5ac4cb92de0f55269 SHA512 fe183bb2e740251a9bfd9aa4e5e091fe53b409aee8be622d5c134657b16be8147d3c8a6ed07f3c28c7f91cce6531a3979144365058b2d9f42735527dabf0c093 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r12.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r12.ebuild new file mode 100644 index 000000000000..b9bd656a8e8f --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-5.15.2-r12.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=0cb681eacca0f757702fa409bb05d3d3650aba4e +inherit qt5-build + +DESCRIPTION="SVG rendering library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="" + +RDEPEND=" + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* + sys-libs/zlib:= +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtxml-${QT5_PV}* ) +" diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 34c49c649483..7b2121ead2d5 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -9,5 +9,5 @@ AUX qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch 977 BLAKE2B c75ae3b6a8 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89 DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2 SHA512 f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3 -EBUILD qtwebengine-5.15.2_p20211216.ebuild 7702 BLAKE2B f30331e47399b8b9de88f55060d1c4463c62289f3f530ecc3e76e3c2173ab2955912c2ebbb3a53e4a9c458f35979bf3522d07891863e1099a36f4bb699c5acb2 SHA512 cc58e4d95304cb4c08511b1a3347726876b064867c8d00113a146d9b554ceb8637a6ce15f31eaf00117782274f74f0d091f0eaf3803ed8f99f1f0d690fe51996 +EBUILD qtwebengine-5.15.2_p20211216.ebuild 8492 BLAKE2B c7a0703cf11aafc9761cb1826ca6b0d539f374085cd5397ba16f348a57453ce81679310b7dd2d6f9ad6f3f1cece897a9457178e2a1058b5a3604f3365e13b153 SHA512 f6cfa9f0fb79cda2772bfed848bdf88134f853a354d34ddd384566933faf0b63b241a9563042b87dd88c8be6095e3bae5230906928e5a8b41eefa9c79d8d1e67 MISC metadata.xml 1270 BLAKE2B 6ac8693b4a994904a8d7dd5728a0f47679b2b7553750a17fa64a7b8fd8cd74abd54ffbcb7da00d5b43622a67dedb3e3bcc93029bef2872e921e333a24892ca47 SHA512 4675ec29c3d6ac329b177f10b920dcf75ea5ed18a21aee1c500ee28430d85fcaaeac6df28a942c4bdcdf8692196017b1ea456e9f66d129afd1254d7931083eda diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild index 7923a290ab0e..55f8f5631a65 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="xml(+)" -inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build +inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" HOMEPAGE="https://www.qt.io/" @@ -110,29 +110,51 @@ PATCHES=( "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957 ) -pkg_preinst() { - elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with" - elog "additional security fixes from newer versions. Extensive as it is, the" - elog "list of backports is impossible to evaluate, but always bound to be behind" - elog "Chromium's release schedule." - elog "In addition, various online services may deny service based on an outdated" - elog "user agent version (and/or other checks). Google is already known to do so." - elog - elog "tldr: Your web browsing experience will be compromised." -} - -src_unpack() { - # bug 307861 +qtwebengine_check-reqs() { + # bug #307861 eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then - ewarn ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." ewarn "You may experience really long compilation times and/or increased memory usage." ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." - ewarn fi eshopts_pop + [[ ${MERGE_TYPE} == binary ]] && return + + # (check-reqs added for bug #570534) + # + # Estimate the amount of RAM required + # Multiplier is *10 because Bash doesn't do floating point maths. + # Let's crudely assume ~2GB per compiler job for GCC. + local multiplier=20 + + # And call it ~1.5GB for Clang. + if tc-is-clang ; then + multiplier=15 + fi + + local CHECKREQS_DISK_BUILD="7G" + local CHECKREQS_DISK_USR="150M" + if ! has "distcc" ${FEATURES} ; then + # bug #830661 + # Not super realistic to come up with good estimates for distcc right now + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G + fi + + check-reqs_${EBUILD_PHASE_FUNC} +} + +pkg_pretend() { + qtwebengine_check-reqs +} + +pkg_setup() { + qtwebengine_check-reqs + python-any-r1_pkg_setup +} + +src_unpack() { case ${QT5_BUILD_TYPE} in live) git-r3_src_unpack ;& release) default ;; @@ -231,3 +253,14 @@ src_install() { die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" fi } + +pkg_preinst() { + elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with" + elog "additional security fixes from newer versions. Extensive as it is, the" + elog "list of backports is impossible to evaluate, but always bound to be behind" + elog "Chromium's release schedule." + elog "In addition, various online services may deny service based on an outdated" + elog "user agent version (and/or other checks). Google is already known to do so." + elog + elog "tldr: Your web browsing experience will be compromised." +} |