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 | |
parent | bac9556f73da9ac333933778ce81c053bd989a26 (diff) |
gentoo auto-resync : 09:04:2023 - 23:35:30
Diffstat (limited to 'dev-qt')
26 files changed, 8 insertions, 1898 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 0541f8b0655a..2bee09fc5630 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz 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" diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 4342b4b261fa..a7f7861a6ccc 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/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 qtgui-5.15.8-r3.ebuild 3836 BLAKE2B 6b35db18970ba14fdddfaf066c32d4463572e95e3210993a364cc32b0f1c7e88340efcca888bb1e6a49cddc84fc837c3f22b836761a5b8bd733b2eafb01e3859 SHA512 580277345d941089306cf416d143ee0cb6c03b83d9a0dd939ff4e66c784fcb1ef3067a3692b50d1b59453ae1ad5d269aee5d1cdc3be5e206c6ed4cdb19cbb454 -EBUILD qtgui-5.15.8-r4.ebuild 3842 BLAKE2B 61d69b6b00f2427a8b4c25b249442404baae909b3aaa6c0093ca1f8982d16980bdee9634b4d76c5c4ca80b3922fba2142649815fb319e363a51f4d2ab85f8db8 SHA512 477c95e0f3d17d1f4e00b39ec983455d690d7d2efeea77400f20a66bc225a712c87d621f36ac3f81f02c68f970ab60be4791ee2bf2ba048b5584045abff4624e +EBUILD qtgui-5.15.8-r4.ebuild 3836 BLAKE2B a33363b1cada6643b8f225631c4a554ec159a9ca36bc272a6c94ddac85b5aaf383a0e7fe53424ae5168b8bc690eb8d3b59ee54f9f7cf1dfe41fd32afbec49dfd SHA512 ed269c233158aa16858f31ad5a2d58f40364830d73513b193802e37a77b93dbde794980c6d3d191cb008a409d8bb223080e6fb02f92a0fb4d51f443d4f49a2ad MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5 diff --git a/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild deleted file mode 100644 index 920dd819362a..000000000000 --- a/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild +++ /dev/null @@ -1,177 +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 qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" - -SLOT=5/${QT5_PV} # bug 707658 -IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput - linuxfb +png tslib tuio +udev vnc vulkan wayland +X" -REQUIRED_USE=" - || ( eglfs linuxfb vnc X ) - accessibility? ( dbus X ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - X? ( gles2-only? ( egl ) ) -" - -RDEPEND=" - dev-libs/glib:2 - =dev-qt/qtcore-${QT5_PV}*:5= - dev-util/gtk-update-icon-cache - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - sys-libs/zlib:= - dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) - eglfs? ( - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) - evdev? ( sys-libs/mtdev ) - jpeg? ( media-libs/libjpeg-turbo:= ) - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X] ) - libinput? ( - dev-libs/libinput:= - x11-libs/libxkbcommon - ) - png? ( media-libs/libpng:= ) - tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) - udev? ( virtual/libudev:= ) - vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libxkbcommon[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -DEPEND="${RDEPEND} - evdev? ( sys-kernel/linux-headers ) - linuxfb? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -PDEPEND=" - ibus? ( app-i18n/ibus ) - wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) -" - -QT5_TARGET_SUBDIRS=( - src/tools/qvkgen - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl:egl: - eglfs:eglfs: - eglfs:eglfs_egldevice: - eglfs:eglfs_gbm: - evdev:evdev: - evdev:mtdev: - :fontconfig: - :system-freetype:FREETYPE - !:no-freetype: - gles2-only::OPENGL_ES - gles2-only:opengles2:OPENGL_ES_2 - !:no-gui: - :system-harfbuzz: - !:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - libinput - libinput:xkbcommon: - :opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - tslib:tslib: - udev:libudev: - vulkan:vulkan: - X:xcb: - X:xcb-glx: - X:xcb-plugin: - X:xcb-render: - X:xcb-sm: - X:xcb-xlib: - X:xcb-xinput: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die - - # egl_x11 is activated when both egl and X are enabled - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.pro || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(usev dbus -dbus-linked) - $(qt_use egl) - $(qt_use eglfs) - $(usev eglfs '-gbm -kms') - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - -gui - -system-harfbuzz - $(qt_use jpeg libjpeg system) - $(qt_use libinput) - $(qt_use linuxfb) - -opengl $(usex gles2-only es2 desktop) - $(qt_use png libpng system) - $(qt_use tslib) - $(qt_use udev libudev) - $(qt_use vulkan) - $(qt_use X xcb) - $(usev X '-xcb-xlib') - ) - if use libinput || use X; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/dev-qt/qtgui/qtgui-5.15.8-r4.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r4.ebuild index 9e6464df2a92..9e2bb815c4fa 100644 --- a/dev-qt/qtgui/qtgui-5.15.8-r4.ebuild +++ b/dev-qt/qtgui/qtgui-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" diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 8a3e30591f8a..3b125968cf2b 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,24 +1,9 @@ -AUX qtwebengine-5.15.2-disable-fatal-warnings.patch 442 BLAKE2B d2f303f03f817c1e10d0c3c64deaefce773cb63852e8a37ba1c4611e26e850c5722e708425525a6fbfe170ce757a7fcb89e0324e3ea41f4ddeafd4bc15cc5c3b SHA512 79503e9278b50b5ac799852958850c54027c329f32242747514bbc7253192893c9ce5b9c6feeae7918f9e0f4047526adfb1c9ac9c0c5dcc625fe7b1507a93d23 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47 -AUX qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch 7361 BLAKE2B 0a5ab9077982df3afea7d156e0dbaf11384d7b9ab6ea70ef4dc0b82f1690e455144318734cb50b7bf2349a95b99325e67bbfcbdf5c88f55f3ecc65c7e593c468 SHA512 585dab11bf6cf811b657831292d5b6b90dd01d9e4c1fa4b6a446d0eb66f436c46a6fcd4851e9c6b6b0bda8a41cbea57fe74ca5ecca4e40cb35f85d7c2f5265e7 -AUX qtwebengine-5.15.2_p20210224-disable-git.patch 501 BLAKE2B a295e5061830da6bfaf0c0ae6db832c86f797fa2426ec29e244133e862c0998a03373c11a2a31944bc09e0a20bf30c0a0a91eb06b1f8a9fdcdd9762f5ba7c542 SHA512 b795328058be945e7a323ea50f01cd5c11b130bc1204c8274fec920e04cce1643d8f9313e975f451dbb7dfecd6214f9ff9ea0aec87ad29237b6e9bb1b4114c5f AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da -AUX qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch 2182 BLAKE2B cc19cc0c1242f7193f62a550ceb6358e43fcbdf6f95ddee373a3a775448908d6d0a661c6406e6c7578013a32ae280198263a94804e76c87e99db064dc972db7c SHA512 8890ab95300c148e21315a201ac56d04aca1ccc402e464b6ec1b90a69127a4fa02398893007f98eb40ea78d0abe56d459c34eba3c5cdd1521d4ab567225bced1 -AUX qtwebengine-5.15.3_p20220329-clang14.patch 1883 BLAKE2B 9f4afae3ea240841f8b009df0cc71f9f23361f5205a3ced968b6ddaaf36b16fb880baffe4f4eb0def9d45fa267a7a4e43dcccacc47ea474e0914f4159877ee56 SHA512 8de250760738386799523b3ad29dfae37120a69d4d469274e96d80ade8b26afad39f54651ec80b8a17ac5b2083193283b167a0ed0438b1d926e45ff69f067a14 -AUX qtwebengine-5.15.3_p20220406-ffmpeg5.patch 8393 BLAKE2B 07dee5bd305699378353796fc6c9f06daba31d9c152c565fa9391215334b064cc926915e7d47a7d1361f8a209ea812c7eea79bfcbcbbacb49cd79d77454b5962 SHA512 12b735976924c916654fda5582239354e9ef0f99ea1ba0e768b2225b29bee4bfd10ca6d3a861874bd310ed3afd885696e78d678e84be85458efdbc16cf1039d7 -AUX qtwebengine-5.15.3_p20220406-gcc12-includes.patch 1139 BLAKE2B ba451fcef0dd235f6044622913197581fe2d2f3de8b6342fd9dc0f6706c28a16d8d6b6ad5429f6f2ea3a211a3cd01b730a1b36fd1f34e61b4391d19e0db1ae91 SHA512 7104313aec55fc8eede53cc966833f8e2632d175e4206dd90da2fa42807795152a01010e2cce7bacd57f30cd3fdbbfef32624d5763210d08362beda77a5724cd -AUX qtwebengine-5.15.3_p20220505-extra-gn.patch 458 BLAKE2B 0595f06d31fd83a04cc0ef9fb7567374c28c4d09c8774e6584d288aa18c2386efe699bd1d155fdee96f5960d3575baff6a6aa7a694d0c953401f80add9daf6c3 SHA512 81498f04c1ad4d73e888bba31fb1129e24990bcddb1d68111b004bba2e4fdab91698b3fe1d01bd94a0bf904e52f614cddc4ba6f70ffaf6a1d45e37a53e583629 -AUX qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch 1911 BLAKE2B fb59f9ae06031bd52460856951653e193ee9a2d6f965fe0aab940822d8a7a90aea830ba9548a5879ac8644b5b80fb1ffbaf14dfb91de44e07c2ef4f5c470db6d SHA512 c490c2650f061e584523b06d28b3986a2ba940a478fa0aff1f1f4891495423c5dd432cc96a690ad02871e8e626d77978aaa9b97b4a8d0122e0638849e4225b3c -AUX qtwebengine-5.15.8_p20230106-widevine.patch 4482 BLAKE2B 25cb06e27d51011df57b63053bc97f20bf0062167d0915b2d4da5b5b7164b5f35ef66b19da69acd3fac16bf9264e85e5d69987a6c38284033c77058b9146ea20 SHA512 f05969ce3355ca23cdaad822e052f4a12350598cd9a5bf5af72f9f10e1cf43bbbc86f2af3b5e27cd6a9198bd025a7afddb4db35444542d57c9963f3f47a6de97 -AUX qtwebengine-5.15.8_p20230112-gcc13.patch 13359 BLAKE2B d53cfd67c5e72a9f6f3d5e99c1ec6d5b90d9a4fdb5d462bc5d4e44e0c70b27fff2ab0128ea8f07a4f21429ddb33a3ec94b59b1459ebc6930290409e7cfdda6b7 SHA512 7bd8089a7fcd4603b0af41d3ff1c6be22d8074c6e5a2463884304cca94565ce720c30826678dd73509d042b0ae11ea213cbe9e8244c1dcd0c3fc6305cbe77de2 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.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840 -DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577 DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39 -EBUILD qtwebengine-5.15.8_p20230112.ebuild 9539 BLAKE2B da7abf15aef811b8d1339e72a3b3a820b745fe942c5d35099cb76924aaa01f71441792b02f92aeb436e3a57437c4cd394110403fbd844ad24786d4d9037b029c SHA512 4e001b9fc77762ba864931a4a55e3e4032fc8f217b357bbb7a0bfa67de4a54a6bb2f2b071daa1f9cbbae781f47d446263fbe5266f0c8cdf2657913ef332bb07c -EBUILD qtwebengine-5.15.8_p20230313.ebuild 8254 BLAKE2B 5712faff7d846c0708efba175d168f69cd8934c10b163cdefb27314e82c88c38cafbdc88dd91b68020b9b08bb297f9f40016a478e15f484673fa56191b028815 SHA512 2a97dd8f71e5a3e087748c06b2537a5fbe1cca1b9f2ab19740ff5868b25a13a54ec2c793d30cf85f09b9a01559cb3467b5cf1e2f947644d543b73ff21813f3f1 +EBUILD qtwebengine-5.15.8_p20230313.ebuild 8252 BLAKE2B 5490ebd0c7ec96948f6ecc0a5305f1d09fc87dd16498a0ea70e3a88f7b9902fc5f4221a83fe883ec54c305b7cd0d75fceb9580ed1d41a56fb04d3d4ecc8b8596 SHA512 92aac8358b6777bfe1fbac3329b79fb862673cb119a446cf31732bbc09f454e08652c0bfb92ed5f10120dce1c405e614c7d91629baeaf4f087cb182f9a37103b EBUILD qtwebengine-6.4.3.ebuild 7634 BLAKE2B b7a9e50c5653c8fbe50d180e48de9c52c6135ffe23869d58b9b703b52e667c24afe918b365fe9c0397834d4688d54fca1432985f6f5b848a3d21416ce880f3a6 SHA512 a10a58f330d9dbb480107cfe67fe79747c98fb70451c14e87430759ce49e902cad791cdd919cf1218baeba67dabe3a1835d64d70495f5522758e7657bdaa4d0f MISC metadata.xml 1258 BLAKE2B 450cb9e683a52475729881c910e7b0b79587d3d672d4eb90613b91194ec19ab7c0fb86bf4ff4bf631686ed3cad49859eed07405b1f7d6129f40b5f4edba68e43 SHA512 971dbe74479e6bf3ed3cda00724bb4a60d6382c4020ee6ce3a730646a69af0a66785fb135706a2a0cc00ff3190674e724aa3def03f43c8e9ed5e5d317ae271f0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch deleted file mode 100644 index b0f5f3d30e0b..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri -index cf990c79..910a88ca 100644 ---- a/src/buildtools/config/common.pri -+++ b/src/buildtools/config/common.pri -@@ -26,6 +26,7 @@ gn_args += \ - skia_use_dawn=false \ - toolkit_views=false \ - treat_warnings_as_errors=false \ -+ fatal_linker_warnings=false \ - use_allocator_shim=false \ - use_allocator=\"none\" \ - use_custom_libcxx=false \ diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch deleted file mode 100644 index a6856975a663..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch +++ /dev/null @@ -1,192 +0,0 @@ -From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Tue, 03 Nov 2020 23:20:37 -0800 -Subject: [PATCH] Update to ICU68-1 - -ICU68-1 change the output skeleton format. So we need to change -resolvedOptions code for 68 migration. - -Chromium roll -https://chromium-review.googlesource.com/c/chromium/src/+/2474093 - -Bug: v8:10945 -Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431 -Commit-Queue: Frank Tang <ftang@chromium.org> -Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> -Reviewed-by: Shu-yu Guo <syg@chromium.org> -Cr-Commit-Position: refs/heads/master@{#70972} - -(ported to work with <ICU-68.1 and rebased chromium) ---- - -diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -index 45b0eab..d18b133 100644 ---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -@@ -389,17 +389,20 @@ Handle<String> CurrencySignString(Isolate* isolate, - Handle<String> UnitDisplayString(Isolate* isolate, - const icu::UnicodeString& skeleton) { - // Ex: skeleton as -- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name" -+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name". -+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name" - if (skeleton.indexOf("unit-width-full-name") >= 0) { - return ReadOnlyRoots(isolate).long_string_handle(); - } - // Ex: skeleton as -- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow". -+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow". -+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow". - if (skeleton.indexOf("unit-width-narrow") >= 0) { - return ReadOnlyRoots(isolate).narrow_string_handle(); - } - // Ex: skeleton as -- // "measure-unit/length-foot .### rounding-mode-half-up" -+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up" -+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up" - return ReadOnlyRoots(isolate).short_string_handle(); - } - -@@ -422,7 +425,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) { - return Notation::COMPACT; - } - // Ex: skeleton as -- // "measure-unit/length-foot .### rounding-mode-half-up" -+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up" -+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up" - return Notation::STANDARD; - } - -@@ -562,14 +566,23 @@ namespace { - - // Ex: percent .### rounding-mode-half-up - // Special case for "percent" --// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .### --// rounding-mode-half-up" should return "kilometer-per-unit". --// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return --// "year". -+// <ICU-68.1: -+// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .### -+// rounding-mode-half-up" should return "kilometer-per-unit". -+// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return -+// >=ICU-68.1: -+// Ex: "unit/milliliter-per-acre .### rounding-mode-half-up" -+// should return "milliliter-per-acre". -+// Ex: "unit/year .### rounding-mode-half-up" should return -+// "year". - std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - std::string str; - str = skeleton.toUTF8String<std::string>(str); -+#if U_ICU_VERSION_MAJOR_NUM < 68 - std::string search("measure-unit/"); -+#else -+ std::string search("unit/"); -+#endif - size_t begin = str.find(search); - if (begin == str.npos) { - // Special case for "percent". -@@ -578,20 +591,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - } - return ""; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - // Skip the type (ex: "length"). - // "measure-unit/length-kilometer per-measure-unit/duration-hour" - // b - begin = str.find("-", begin + search.size()); -+#else -+ // Ex: -+ // "unit/acre .### rounding-mode-half-up" -+ // b -+ // Ex: -+ // "unit/milliliter-per-acre .### rounding-mode-half-up" -+ // b -+ begin += search.size(); -+#endif - if (begin == str.npos) { - return ""; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - begin++; // Skip the '-'. -+#endif - // Find the end of the subtype. - size_t end = str.find(" ", begin); -- // "measure-unit/length-kilometer per-measure-unit/duration-hour" -- // b e -+ // <ICU-68.1: -+ // "measure-unit/length-kilometer per-measure-unit/duration-hour" -+ // b e -+ // >=ICU-68.1: -+ // Ex: -+ // "unit/acre .### rounding-mode-half-up" -+ // b e -+ // Ex: -+ // "unit/milliliter-per-acre .### rounding-mode-half-up" -+ // b e - if (end == str.npos) { - end = str.size(); -+#if U_ICU_VERSION_MAJOR_NUM < 68 - return str.substr(begin, end - begin); - } - // "measure-unit/length-kilometer per-measure-unit/duration-hour" -@@ -625,17 +659,36 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - // "measure-unit/length-kilometer per-measure-unit/duration-hour" - // [result ] b e - return result + "-per-" + str.substr(begin, end - begin); -+#else -+ } -+ return str.substr(begin, end - begin); -+#endif - } - - Style StyleFromSkeleton(const icu::UnicodeString& skeleton) { - if (skeleton.indexOf("currency/") >= 0) { - return Style::CURRENCY; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - if (skeleton.indexOf("measure-unit/") >= 0) { - if (skeleton.indexOf("scale/100") >= 0 && - skeleton.indexOf("measure-unit/concentr-percent") >= 0) { -+#else -+ if (skeleton.indexOf("percent") >= 0) { -+ // percent precision-integer rounding-mode-half-up scale/100 -+ if (skeleton.indexOf("scale/100") >= 0) { -+#endif - return Style::PERCENT; -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ } else { -+ return Style::UNIT; -+#endif - } -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ } -+ // Before ICU68: "measure-unit/", since ICU68 "unit/" -+ if (skeleton.indexOf("unit/") >= 0) { -+#endif - return Style::UNIT; - } - return Style::DECIMAL; -diff --git a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -index 267343aaae..64d56a1c12 100644 ---- a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -+++ b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -@@ -195,9 +195,18 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New( - } - } - -+#if U_ICU_VERSION_MAJOR_NUM < 68 - icu::DecimalFormat* decimal_format = - static_cast<icu::DecimalFormat*>(number_format); - decimal_format->setMinimumGroupingDigits(-2); -+#else -+ if (number_format->getDynamicClassID() == -+ icu::DecimalFormat::getStaticClassID()) { -+ icu::DecimalFormat* decimal_format = -+ static_cast<icu::DecimalFormat*>(number_format); -+ decimal_format->setMinimumGroupingDigits(-2); -+ } -+#endif - - // Change UDISPCTX_CAPITALIZATION_NONE to other values if - // ECMA402 later include option to change capitalization. diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch deleted file mode 100644 index c31e8970eaef..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch +++ /dev/null @@ -1,15 +0,0 @@ -generate_gni.sh: update_readme() runs git at the end of process, prevent it. - -Thanks-to: Georgy Yakovlev <gyakovlev@gentoo.org> - ---- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-07 12:51:49.438514897 +0100 -+++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-21 16:23:38.375724515 +0100 -@@ -519,8 +519,3 @@ - - gn format --in-place $BASE_DIR/BUILD.gn - gn format --in-place $BASE_DIR/libvpx_srcs.gni -- --cd $BASE_DIR/$LIBVPX_SRC_DIR --update_readme -- --cd $BASE_DIR diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch deleted file mode 100644 index b3c2ffb315a5..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch +++ /dev/null @@ -1,79 +0,0 @@ -Description: Use system lcms2 -Author: Sandro Knauß <hefee@debian.org> -Origin: Debian -Forwarded: https://bugreports.qt.io/browse/QTBUG-61746 -Reviewed-by: Sandro Knauß <hefee@debian.org> -Last-Update: 2021-03-08 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn -@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths - } - } - --config("fx_lcms2_warnings") { -- visibility = [ ":*" ] -- if (is_clang) { -- cflags = [ -- # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this -- # library doesn't appear to have this problem. -- "-Wno-missing-braces", -- ] -- } -+import("//build/shim_headers.gni") -+ -+shim_headers("lcms2_shim") { -+ root_path = "lcms/include" -+ headers = [ -+ "lcms2.h", -+ "lcms2_plugin.h", -+ ] - } - - source_set("fx_lcms2") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- "//build/config/sanitizers:cfi_icall_generalize_pointers", -- ":pdfium_third_party_config", -- -- # Must be after no_chromium_code for warning flags to be ordered correctly. -- ":fx_lcms2_warnings", -- ] -- sources = [ -- "lcms/include/lcms2.h", -- "lcms/include/lcms2_plugin.h", -- "lcms/src/cmsalpha.c", -- "lcms/src/cmscam02.c", -- "lcms/src/cmscgats.c", -- "lcms/src/cmscnvrt.c", -- "lcms/src/cmserr.c", -- "lcms/src/cmsgamma.c", -- "lcms/src/cmsgmt.c", -- "lcms/src/cmshalf.c", -- "lcms/src/cmsintrp.c", -- "lcms/src/cmsio0.c", -- "lcms/src/cmsio1.c", -- "lcms/src/cmslut.c", -- "lcms/src/cmsmd5.c", -- "lcms/src/cmsmtrx.c", -- "lcms/src/cmsnamed.c", -- "lcms/src/cmsopt.c", -- "lcms/src/cmspack.c", -- "lcms/src/cmspcs.c", -- "lcms/src/cmsplugin.c", -- "lcms/src/cmsps2.c", -- "lcms/src/cmssamp.c", -- "lcms/src/cmssm.c", -- "lcms/src/cmstypes.c", -- "lcms/src/cmsvirt.c", -- "lcms/src/cmswtpnt.c", -- "lcms/src/cmsxform.c", -- ] -- deps = [ "../core/fxcrt" ] -+ deps = [ ":lcms2_shim" ] -+ libs = ["lcms2"] - } - - if (!build_with_chromium) { diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch deleted file mode 100644 index c1a98d0934fb..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0825e7bc64e47d87e1f1026cc80c933550f114f5 Mon Sep 17 00:00:00 2001 -From: Dimitry Andric <dim@FreeBSD.org> -Date: Mon, 14 Feb 2022 13:55:25 +0100 -Subject: www/qt5-webengine: fix build with clang 14 - -Fixes compile error: - -In file included from gen/third_party/blink/renderer/platform/platform_jumbo_63.cc:8: -src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:122:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition -typedef struct { - ^ - UTextWithBuffer -src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:123:3: note: type is not C-compatible due to this member declaration - DISALLOW_NEW(); - ^~~~~~~~~~~~~~ -src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h:40:2: note: expanded from macro 'DISALLOW_NEW' - public: \ - ^~~~~~~ -src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:126:3: note: type is given name 'UTextWithBuffer' for linkage purposes by this typedef declaration -} UTextWithBuffer; - ^ - -PR: 261949 -Approved by: adridg (maintainer) -MFH: 2022Q1 - ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc -@@ -119,11 +119,11 @@ enum TextContext { kNoContext, kPriorContext, kPrimary - - const int kTextBufferCapacity = 16; - --typedef struct { -+struct UTextWithBuffer { - DISALLOW_NEW(); - UText text; - UChar buffer[kTextBufferCapacity]; --} UTextWithBuffer; -+}; - - static inline int64_t TextPinIndex(int64_t& index, int64_t limit) { - if (index < 0) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch deleted file mode 100644 index 15c192667f22..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 05f6ffbbce0a2aad01dc05d682cbe4a1ec44fad5 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Tue, 25 Jan 2022 10:51:58 +0000 -Subject: [PATCH] Fix build with ffmpeg 5 - ---- - chromium/media/ffmpeg/ffmpeg_common.h | 1 + - chromium/media/filters/audio_file_reader.cc | 2 +- - chromium/media/filters/ffmpeg_audio_decoder.cc | 2 +- - chromium/media/filters/ffmpeg_demuxer.cc | 12 ++++++------ - chromium/media/filters/ffmpeg_glue.cc | 4 ---- - chromium/media/filters/ffmpeg_video_decoder.cc | 2 +- - chromium/media/filters/media_file_checker.cc | 2 +- - .../video_coding/codecs/h264/h264_decoder_impl.cc | 2 +- - 8 files changed, 12 insertions(+), 15 deletions(-) - -diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h -index 2734a485cbd..70b1877a43c 100644 ---- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h -+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h -@@ -29,6 +29,7 @@ extern "C" { - #include <libavformat/avformat.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> -+#include <libavutil/channel_layout.h> - #include <libavutil/imgutils.h> - #include <libavutil/log.h> - #include <libavutil/mastering_display_metadata.h> -diff --git a/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc -index cb81d920def..bd73908d0ca 100644 ---- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc -+++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc -@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() { - } - - bool AudioFileReader::OpenDecoder() { -- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); -+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); - if (codec) { - // MP3 decodes to S16P which we don't support, tell it to use S16 instead. - if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P) -diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc b/chromium/media/filters/ffmpeg_audio_decoder.cc -index 0d825ed791b..72fac6167ef 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc -@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) { - } - } - -- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); -+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); - if (!codec || - avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) { - DLOG(ERROR) << "Could not initialize audio decoder: " -diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc -index d34db63f3ef..427565b00c1 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc -@@ -98,12 +98,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) { - - // Next try to use the first DTS value, for codecs where we know PTS == DTS - // (excludes all H26x codecs). The start time must be returned in PTS. -- if (stream->first_dts != kNoFFmpegTimestamp && -+ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp && - stream->codecpar->codec_id != AV_CODEC_ID_HEVC && - stream->codecpar->codec_id != AV_CODEC_ID_H264 && - stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) { - const base::TimeDelta first_pts = -- ConvertFromTimeBase(stream->time_base, stream->first_dts); -+ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream)); - if (first_pts < start_time) - start_time = first_pts; - } -@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { - scoped_refptr<DecoderBuffer> buffer; - - if (type() == DemuxerStream::TEXT) { -- int id_size = 0; -+ size_t id_size = 0; - uint8_t* id_data = av_packet_get_side_data( - packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); - -- int settings_size = 0; -+ size_t settings_size = 0; - uint8_t* settings_data = av_packet_get_side_data( - packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); - -@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { - buffer = DecoderBuffer::CopyFrom(packet->data, packet->size, - side_data.data(), side_data.size()); - } else { -- int side_data_size = 0; -+ size_t side_data_size = 0; - uint8_t* side_data = av_packet_get_side_data( - packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size); - -@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { - packet->size - data_offset); - } - -- int skip_samples_size = 0; -+ size_t skip_samples_size = 0; - const uint32_t* skip_samples_ptr = - reinterpret_cast<const uint32_t*>(av_packet_get_side_data( - packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size)); -diff --git a/chromium/media/filters/ffmpeg_glue.cc b/chromium/media/filters/ffmpeg_glue.cc -index 0ef3521473d..8483ecc348f 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc -@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) { - } - - void FFmpegGlue::InitializeFFmpeg() { -- av_register_all(); - } - - static void LogContainer(bool is_local_file, -@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) { - // Enable fast, but inaccurate seeks for MP3. - format_context_->flags |= AVFMT_FLAG_FAST_SEEK; - -- // Ensures we can read out various metadata bits like vp8 alpha. -- format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; -- - // Ensures format parsing errors will bail out. From an audit on 11/2017, all - // instances were real failures. Solves bugs like http://crbug.com/710791. - format_context_->error_recognition |= AV_EF_EXPLODE; -diff --git a/chromium/media/filters/ffmpeg_video_decoder.cc b/chromium/media/filters/ffmpeg_video_decoder.cc -index ef12477ee89..7996606f5f9 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc -@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config, - if (decode_nalus_) - codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS; - -- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); -+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); - if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) { - ReleaseFFmpegResources(); - return false; -diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc -index 59c2a2fc618..1a9872c7acb 100644 ---- a/src/3rdparty/chromium/media/filters/media_file_checker.cc -+++ b/src/3rdparty/chromium/media/filters/media_file_checker.cc -@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) { - auto context = AVStreamToAVCodecContext(format_context->streams[i]); - if (!context) - continue; -- AVCodec* codec = avcodec_find_decoder(cp->codec_id); -+ const AVCodec* codec = avcodec_find_decoder(cp->codec_id); - if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) { - auto loop = std::make_unique<FFmpegDecodingLoop>(context.get()); - stream_contexts[i] = {std::move(context), std::move(loop)}; -diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc -index 9002b874611..d12fade8b63 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc -@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings, - // a pointer |this|. - av_context_->opaque = this; - -- AVCodec* codec = avcodec_find_decoder(av_context_->codec_id); -+ const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id); - if (!codec) { - // This is an indication that FFmpeg has not been initialized or it has not - // been compiled/initialized with the correct set of codecs. --- -2.35.1 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch deleted file mode 100644 index cd476564037a..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch?expand=1 -https://bugs.gentoo.org/840326 - -From 68799a1e0815b20ca59ce354a55280399257a201 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fvogt@suse.de> -Date: Fri, 25 Mar 2022 15:29:28 +0100 -Subject: [PATCH] skia: Some includes to fix build with GCC 12 - -Those includes got introduced upstream for other reasons and fixed building -with GCC 12 as a side effect. ---- a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h -+++ b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h -@@ -12,6 +12,8 @@ - #include "include/core/SkScalar.h" - #include "include/core/SkTypes.h" - -+#include <array> -+ - /** \file SkColor.h - - Types, consts, functions, and macros for colors. ---- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -@@ -8,6 +8,8 @@ - - #include "include/utils/SkParse.h" - -+#include <algorithm> // std::lower_bound -+ - static constexpr const char* gColorNames[] = { - "aliceblue", - "antiquewhite", diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch deleted file mode 100644 index a319f521ca67..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/core/gn_run.pro -+++ b/src/core/gn_run.pro -@@ -64,6 +64,7 @@ - } - } else { - gn_args+= "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\"" -+ gn_args += $$(EXTRA_GN) - gn_args = $$system_quote($$gn_args) - gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir())) - gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch deleted file mode 100644 index b1fe0f69801c..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a5cea1bfc38ceafc74f4baddd6ab94ea13757ef8 Mon Sep 17 00:00:00 2001 -From: Lei Zhang <thestig@chromium.org> -Date: Fri, 21 May 2021 10:55:53 -0700 -Subject: [PATCH] Mark Node::opcode() and Operator::opcode() as constexpr. - -Without the explicit constexpr keyword, Clang seems to be able to treat -these methods as constexpr, whereas MSVC will not. - -Bug: v8:11760 -Change-Id: I9f6492f38fb50dcaf7a4f09da0bd79c0da6a50eb -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2912916 -Reviewed-by: Clemens Backes <clemensb@chromium.org> -Reviewed-by: Maya Lekova <mslekova@chromium.org> -Commit-Queue: Lei Zhang <thestig@chromium.org> -Cr-Commit-Position: refs/heads/master@{#74791} ---- - -diff --git a/src/3rdparty/chromium/v8/src/compiler/node.h b/src/3rdparty/chromium/v8/src/compiler/node.h -index 37b45c4..57d49fe 100644 ---- a/src/3rdparty/chromium/v8/src/compiler/node.h -+++ b/src/3rdparty/chromium/v8/src/compiler/node.h -@@ -50,7 +50,7 @@ - - const Operator* op() const { return op_; } - -- IrOpcode::Value opcode() const { -+ constexpr IrOpcode::Value opcode() const { - DCHECK_GE(IrOpcode::kLast, op_->opcode()); - return static_cast<IrOpcode::Value>(op_->opcode()); - } -diff --git a/src/3rdparty/chromium/v8/src/compiler/operator.h b/src/3rdparty/chromium/v8/src/compiler/operator.h -index 4206e75..f641394 100644 ---- a/src/3rdparty/chromium/v8/src/compiler/operator.h -+++ b/src/3rdparty/chromium/v8/src/compiler/operator.h -@@ -73,7 +73,7 @@ - // A small integer unique to all instances of a particular kind of operator, - // useful for quick matching for specific kinds of operators. For fast access - // the opcode is stored directly in the operator object. -- Opcode opcode() const { return opcode_; } -+ constexpr Opcode opcode() const { return opcode_; } - - // Returns a constant string representing the mnemonic of the operator, - // without the static parameters. Useful for debugging. diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-widevine.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-widevine.patch deleted file mode 100644 index dcfdeae3c6f3..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-widevine.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b99042fb839021a0a3d2fe0cac7ac3899c4acbba Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Tue, 14 Jun 2022 14:19:24 +0200 -Subject: [PATCH] Find modern Chrome, Chromium and Firefox CDM modules - -The default download location has moved again, but we can now -also use firefox CDMs. - -Pick-to: 6.4 6.3 -Task-number: QTBUG-104238 -Change-Id: I7ee581fa63e50df970acb31ea6d3f67d332aef59 -Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> ---- - src/core/content_client_qt.cpp | 54 ++++++++++++++++++++++++++++++---- - 1 file changed, 49 insertions(+), 5 deletions(-) - -diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp -index 6c914b7729..7167332d9b 100644 ---- a/src/core/content_client_qt.cpp -+++ b/src/core/content_client_qt.cpp -@@ -250,15 +251,56 @@ static bool IsWidevineAvailable(base::FilePath *cdm_path, - } - } - #elif defined(Q_OS_LINUX) -- pluginPaths << QStringLiteral("/opt/google/chrome/libwidevinecdm.so") // Old Google Chrome -+ QList<QDir> potentialWidevineVersionDirs; -+ -+ // Google Chrome widevine modules -+ QDir chromeWidevineDir(QDir::homePath() + "/.config/google-chrome/WidevineCdm"); -+ if (chromeWidevineDir.exists()) -+ potentialWidevineVersionDirs << chromeWidevineDir; -+ -+ // Firefox widevine modules -+ QDir firefoxPotentialProfilesDir(QDir::homePath() + "/.mozilla/firefox"); -+ if (firefoxPotentialProfilesDir.exists()) { -+ QFileInfoList firefoxProfileDirs = firefoxPotentialProfilesDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed); -+ for (const QFileInfo &info : firefoxProfileDirs) { -+ QDir widevinePluginsDir(info.absoluteFilePath() + "/gmp-widevinecdm"); -+ if (widevinePluginsDir.exists()) -+ potentialWidevineVersionDirs << widevinePluginsDir; -+ } -+ } -+ -+ // Chromium widevine modules (might not work with proprietary codecs) -+ QDir chromiumWidevineDir(QDir::homePath() + "/.config/chromium/WidevineCdm"); -+ if (chromiumWidevineDir.exists()) -+ potentialWidevineVersionDirs << chromiumWidevineDir; -+ -+ // Search for widewine versions -+ for (const QDir &dir : potentialWidevineVersionDirs) { -+ QFileInfoList widevineVersionDirs = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed); -+ // ### alternatively look up in the manifest.json and take the path from there. - #if Q_PROCESSOR_WORDSIZE == 8 -- << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so") -+ const QString library = QLatin1String("/_platform_specific/linux_x64/libwidevinecdm.so"); - #else -- << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x86/libwidevinecdm.so") -+ const QString library = QLatin1String("/_platform_specific/linux_x86/libwidevinecdm.so"); - #endif -- << QStringLiteral("/usr/lib/chromium/libwidevinecdm.so") // Arch -+ for (const QFileInfo &info : widevineVersionDirs) { -+ pluginPaths << info.absoluteFilePath() + "/libwidevinecdm.so"; -+ pluginPaths << info.absoluteFilePath() + library; -+ } -+ } -+ -+ // Fixed paths: -+ pluginPaths << QStringLiteral("/usr/lib/chromium/libwidevinecdm.so") // Arch - << QStringLiteral("/usr/lib/chromium-browser/libwidevinecdm.so") // Ubuntu/neon -- << QStringLiteral("/usr/lib64/chromium/libwidevinecdm.so"); // OpenSUSE style -+ << QStringLiteral("/usr/lib64/chromium/libwidevinecdm.so") // OpenSUSE style -+#if Q_PROCESSOR_WORDSIZE == 8 -+ << QStringLiteral("/usr/lib64/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so") // Gentoo -+ << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so") // Old Google Chrome -+#else -+ << QStringLiteral("/usr/lib/chromium-browser/WidevineCdm/_platform_specific/linux_x86/libwidevinecdm.so") // Gentoo -+ << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x86/libwidevinecdm.so") // Old Google Chrome -+#endif -+ << QStringLiteral("/opt/google/chrome/libwidevinecdm.so"); // Older Google Chrome - #endif - } - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch deleted file mode 100644 index b9df5b0fe445..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch +++ /dev/null @@ -1,431 +0,0 @@ -Upstream: -- https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/468198 - -Gentoo bugs: -- https://bugs.gentoo.org/889724 -- https://bugs.gentoo.org/895196 -- https://bugs.gentoo.org/898902 -- https://bugs.gentoo.org/898634 (bundled abseil) - -Based on the following from Fedora: -- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/14bbdcc0567223a4c96421ab2dfe2a668831ec98?branch=rawhide -- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/9a37c86a90d1d3c0684aa1428657fc7ed22390ac?branch=rawhide -- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/5dc49e01024ab2adae3705d14a9be76d706b7e52?branch=rawhide -- Whole thing: https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-fix-build.patch ---- a/src/3rdparty/chromium/base/debug/profiler.h -+++ b/src/3rdparty/chromium/base/debug/profiler.h -@@ -5,6 +5,7 @@ - #ifndef BASE_DEBUG_PROFILER_H_ - #define BASE_DEBUG_PROFILER_H_ - -+#include <cstdint> - #include <stddef.h> - - #include <string> ---- a/src/3rdparty/chromium/base/debug/stack_trace.h -+++ b/src/3rdparty/chromium/base/debug/stack_trace.h -@@ -7,6 +7,7 @@ - - #include <stddef.h> - -+#include <cstdint> - #include <iosfwd> - #include <string> - ---- a/src/3rdparty/chromium/cc/trees/target_property.cc -+++ b/src/3rdparty/chromium/cc/trees/target_property.cc -@@ -4,6 +4,8 @@ - - #include "cc/trees/target_property.h" - -+#include <cstdint> -+ - namespace cc { - - static_assert(TargetProperty::LAST_TARGET_PROPERTY < kMaxTargetPropertyIndex, ---- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -+++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -@@ -5,6 +5,7 @@ - #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ - #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ - -+#include <cstdint> - #include <string> - #include <vector> - #include "base/callback_forward.h" ---- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc -+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc -@@ -4,6 +4,8 @@ - - #include "device/base/synchronization/one_writer_seqlock.h" - -+#include <cstdint> -+ - namespace device { - - OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {} ---- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -+++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -@@ -5,6 +5,7 @@ - #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ - #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h -+++ b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h -@@ -5,6 +5,7 @@ - #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_ - #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_ - -+#include <cstdint> - #include <map> - #include <string> - ---- a/src/3rdparty/chromium/extensions/common/constants.h -+++ b/src/3rdparty/chromium/extensions/common/constants.h -@@ -11,6 +11,8 @@ - #include "components/version_info/channel.h" - #include "ui/base/layout.h" - -+#include <cstdint> -+ - namespace extensions { - - // Scheme we serve extension content from. ---- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h -+++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h -@@ -5,6 +5,8 @@ - #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ - #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ - -+#include <cstdint> -+ - namespace gpu { - namespace webgpu { - ---- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h -+++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h -@@ -5,6 +5,7 @@ - #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_ - #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_ - -+#include <cstdint> - #include <string.h> - - #include "gpu/command_buffer/common/gl2_types.h" ---- a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h -+++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h -@@ -5,6 +5,7 @@ - #ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_ - #define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_ - -+#include <cstdint> - #include <memory> - #include <vector> - ---- a/src/3rdparty/chromium/gpu/config/device_perf_info.h -+++ b/src/3rdparty/chromium/gpu/config/device_perf_info.h -@@ -5,6 +5,7 @@ - #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_ - #define GPU_CONFIG_DEVICE_PERF_INFO_H_ - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -@@ -5,6 +5,7 @@ - #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ - #define GPU_CONFIG_GPU_FEATURE_INFO_H_ - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/3rdparty/chromium/gpu/config/gpu_preferences.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_preferences.h -@@ -5,6 +5,7 @@ - #ifndef GPU_CONFIG_GPU_PREFERENCES_H_ - #define GPU_CONFIG_GPU_PREFERENCES_H_ - -+#include <cstdint> - #include <stddef.h> - #include <string> - #include <vector> ---- a/src/3rdparty/chromium/gpu/config/gpu_util.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_util.h -@@ -5,6 +5,8 @@ - #ifndef GPU_CONFIG_GPU_UTIL_H_ - #define GPU_CONFIG_GPU_UTIL_H_ - -+#include <cstdint> -+ - #include "build/build_config.h" - #include "gpu/config/gpu_feature_info.h" - #include "gpu/gpu_export.h" ---- a/src/3rdparty/chromium/net/base/parse_number.h -+++ b/src/3rdparty/chromium/net/base/parse_number.h -@@ -9,6 +9,8 @@ - #include "base/strings/string_piece.h" - #include "net/base/net_export.h" - -+#include <cstdint> -+ - // This file contains utility functions for parsing numbers, in the context of - // network protocols. - // ---- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -+++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -@@ -5,6 +5,7 @@ - #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ - #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/3rdparty/chromium/pdf/document_attachment_info.h -+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h -@@ -7,6 +7,8 @@ - - #include "base/strings/string16.h" - -+#include <cstdint> -+ - namespace chrome_pdf { - - struct DocumentAttachmentInfo { ---- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h -+++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h -@@ -38,6 +38,10 @@ namespace pp { - /// As a further optimization, we can add support for this later. - class ThreadSafeThreadTraits { - public: -+ -+ typedef pp::Lock Lock; -+ typedef pp::AutoLock AutoLock; -+ - class RefCount { - public: - /// Default constructor. In debug mode, this checks that the object is being -@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits { - int32_t ref_; - }; - -- typedef pp::Lock Lock; -- typedef pp::AutoLock AutoLock; - }; - - /// The non-thread-safe version of thread traits. Using this class as the ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -@@ -19,6 +19,7 @@ - #include <limits.h> - - #include <cstddef> -+#include <cstdint> - #include <cstring> - #include <ostream> - ---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -@@ -12,6 +12,7 @@ - - #include <algorithm> - #include <array> -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h -+++ b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h -@@ -15,6 +15,7 @@ - # include "absl/container/flat_hash_map.h" - #endif // defined(ANGLE_USE_ABSEIL) - -+#include <cstdint> - #include <climits> - #include <cstdarg> - #include <cstddef> ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h -@@ -33,6 +33,7 @@ - #include <assert.h> - #include <sys/types.h> - -+#include <cstdint> - #include <string> - - #include "client/linux/handler/microdump_extra_info.h" ---- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc -+++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc -@@ -30,6 +30,7 @@ - #include <cstddef> - #include <cstdint> - #include <cstring> -+#include <cstdio> - #include <new> - #include <utility> - ---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -@@ -5,6 +5,8 @@ - #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ - #define CONSTANTS_ANNOTATION_FLAGS_H_ - -+#include <cstdint> -+ - namespace pdfium { - namespace annotation_flags { - ---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -@@ -18,6 +18,7 @@ - #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ - - #include <array> -+#include <cstdint> - #include <string> - - #include "perfetto/ext/base/optional.h" ---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h -+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h -@@ -21,6 +21,8 @@ - #include "perfetto/trace_processor/status.h" - #include "src/trace_processor/trace_blob_view.h" - -+#include <cstdint> -+ - namespace perfetto { - - namespace protos { ---- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -@@ -9,6 +9,9 @@ - #include "include/utils/SkParse.h" - - #include <algorithm> // std::lower_bound -+#include <algorithm> -+#include <cstring> -+#include <iterator> - - static constexpr const char* gColorNames[] = { - "aliceblue", ---- a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h -+++ b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h -@@ -11,6 +11,7 @@ - #ifndef CALL_RTP_DEMUXER_H_ - #define CALL_RTP_DEMUXER_H_ - -+#include <cstdint> - #include <map> - #include <set> - #include <string> ---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -@@ -12,6 +12,7 @@ - #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml -+++ b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml -@@ -89,7 +89,7 @@ OF THIS SOFTWARE. - </reply> - </request> - -- <request name="Pixmap" opcode="1"> -+ <request name="PresentPixmap" opcode="1"> - <required_start_align align="8" /> - <field type="WINDOW" name="window" /> - <field type="PIXMAP" name="pixmap" /> ---- a/src/3rdparty/chromium/ui/events/gesture_event_details.h -+++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h -@@ -5,6 +5,7 @@ - #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_ - #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_ - -+#include <cstdint> - #include <string.h> - - #include "base/check_op.h" ---- a/src/3rdparty/chromium/ui/events/types/scroll_types.h -+++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h -@@ -5,6 +5,8 @@ - #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_ - #define UI_EVENTS_TYPES_SCROLL_TYPES_H_ - -+#include <cstdint> -+ - namespace ui { - - enum class ScrollGranularity : uint8_t { ---- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc -+++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc -@@ -4,6 +4,7 @@ - - #include "ui/gl/gl_surface_glx.h" - -+#include <cstdint> - #include <utility> - - #include "base/bind.h" ---- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h -+++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h -@@ -5,6 +5,7 @@ - #ifndef UI_GL_GL_SURFACE_GLX_H_ - #define UI_GL_GL_SURFACE_GLX_H_ - -+#include <cstdint> - #include <stdint.h> - - #include <memory> ---- a/src/3rdparty/chromium/v8/src/base/logging.h -+++ b/src/3rdparty/chromium/v8/src/base/logging.h -@@ -5,6 +5,7 @@ - #ifndef V8_BASE_LOGGING_H_ - #define V8_BASE_LOGGING_H_ - -+#include <cstdint> - #include <cstring> - #include <sstream> - #include <string> ---- a/src/3rdparty/chromium/v8/src/base/macros.h -+++ b/src/3rdparty/chromium/v8/src/base/macros.h -@@ -5,6 +5,7 @@ - #ifndef V8_BASE_MACROS_H_ - #define V8_BASE_MACROS_H_ - -+#include <cstdint> - #include <limits> - #include <type_traits> - ---- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -+++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -@@ -5,6 +5,7 @@ - #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - -+#include <cstdint> - #include <string> - - // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may ---- a/src/core/browsing_data_remover_delegate_qt.h -+++ b/src/core/browsing_data_remover_delegate_qt.h -@@ -42,6 +42,8 @@ - - #include "content/public/browser/browsing_data_remover_delegate.h" - -+#include <cstdint> -+ - namespace QtWebEngineCore { - - class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate { - diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild deleted file mode 100644 index a9eb384e9067..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9,10} ) -PYTHON_REQ_USE="xml(+)" -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/" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" - if [[ ${PV} == ${QT5_PV}_p* ]]; then - SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" - S="${WORKDIR}/${P}" - QT5_BUILD_DIR="${S}_build" - fi -else - EGIT_BRANCH="5.15" - EGIT_REPO_URI=( - "https://code.qt.io/qt/${QT5_MODULE}.git" - "https://github.com/qt/${QT5_MODULE}.git" - ) - inherit git-r3 -fi - -# ppc64 patchset based on https://github.com/chromium-ppc64le releases -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2 - https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz - ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )" - -IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets" -REQUIRED_USE="designer? ( widgets )" - -RDEPEND=" - app-arch/snappy:= - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/re2:= - =dev-qt/qtcore-${QT5_PV}* - =dev-qt/qtdeclarative-${QT5_PV}* - =dev-qt/qtgui-${QT5_PV}* - =dev-qt/qtnetwork-${QT5_PV}* - =dev-qt/qtprintsupport-${QT5_PV}* - =dev-qt/qtwebchannel-${QT5_PV}*[qml] - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libvpx-1.5:=[svc(+)] - media-libs/libwebp:= - media-libs/opus - sys-apps/dbus - sys-apps/pciutils - sys-libs/zlib[minizip] - virtual/libudev - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - alsa? ( media-libs/alsa-lib ) - designer? ( =dev-qt/designer-${QT5_PV}* ) - geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* ) - kerberos? ( virtual/krb5 ) - pulseaudio? ( media-libs/libpulse ) - screencast? ( media-video/pipewire:= ) - system-ffmpeg? ( media-video/ffmpeg:0= ) - system-icu? ( >=dev-libs/icu-69.1:= ) - widgets? ( - =dev-qt/qtdeclarative-${QT5_PV}*[widgets] - =dev-qt/qtwidgets-${QT5_PV}* - ) -" -DEPEND="${RDEPEND} - media-libs/libglvnd -" -BDEPEND="${PYTHON_DEPS} - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex - ppc64? ( >=dev-util/gn-0.1807 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446 - "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186 - "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 - "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix - "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746 - "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604 - "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326 - "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957 - "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3 - "${FILESDIR}/${PN}-5.15.8_p20230106-v8-opcode-constexpr.patch" # bug 889042 - "${FILESDIR}/${PN}-5.15.8_p20230106-widevine.patch" # bug 888783 - "${FILESDIR}/${PN}-5.15.8_p20230112-gcc13.patch" # bug 889724, bug 895196, bug 898902, bug 898634 -) - -qtwebengine_check-reqs() { - # bug #307861 - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - 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." - 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 ;; - esac -} - -src_prepare() { - if [[ ${PV} == ${QT5_PV}_p* ]]; then - # This is made from git, and for some reason will fail w/o .git directories. - mkdir -p .git src/3rdparty/chromium/.git || die - fi - # We need to make sure this integrates well into Qt 5.15.3 installation. - # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. - # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions - sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die - - # QTBUG-88657 - jumbo-build could still make trouble - if ! use jumbo-build; then - sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ - src/buildtools/config/common.pri || die - fi - - # bug 620444 - ensure local headers are used - find "${S}" -type f -name "*.pr[fio]" | \ - xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die - - if use system-icu; then - # Sanity check to ensure that bundled copy of ICU is not used. - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. - local file - while read file; do - echo "#error This file should not be used!" > "${file}" || die - done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) - fi - - # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++` - if tc-is-clang ; then - if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then - eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch" - fi - fi - - if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then - eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437 - fi - - qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri - qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri - - qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro - - qt_use_disable_mod widgets widgets src/src.pro - - qt5-build_src_prepare - - # we need to generate ppc64 stuff because upstream does not ship it yet - if use ppc64; then - einfo "Patching for ppc64le and generating build files" - eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" - pushd src/3rdparty/chromium > /dev/null || die - eapply -p0 "${WORKDIR}/${PN}-ppc64le" - popd > /dev/null || die - pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die - mkdir -vp source/config/linux/ppc64 || die - mkdir -p source/libvpx/test || die - touch source/libvpx/test/test.mk || die - # clang-format is used to re-format sources - # but we'd rather make it a no-op than introduce a clang dependency - # https://bugs.gentoo.org/849458 - clang-format() { : ; } - export -f clang-format || die - ./generate_gni.sh || die - popd >/dev/null || die - fi -} - -src_configure() { - export NINJA_PATH=/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" - - local myqmakeargs=( - -- - -no-build-qtpdf - -printing-and-pdf - -system-opus - -system-webp - $(qt_use alsa) - $(qt_use !bindist proprietary-codecs) - $(qt_use geolocation webengine-geolocation) - $(qt_use kerberos webengine-kerberos) - $(qt_use pulseaudio) - $(usex screencast -webengine-webrtc-pipewire '') - $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg) - $(qt_use system-icu webengine-icu) - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # bug 601472 - if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then - 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.144," - elog "with 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." -} diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild index a1974da9731d..513947fbdd92 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic HOMEPAGE="https://www.qt.io/" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" if [[ ${PV} == ${QT5_PV}_p* ]]; then SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" S="${WORKDIR}/${P}" diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index b7d19df12e6a..24b8db598ef3 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,9 +1,5 @@ -AUX qtwidgets-5.15.8-QTBUG-106569.patch 1986 BLAKE2B f8030cf8c3f683517d36a80fd3b8da575b74801adba771b8f267745877a809d92ff5f23fac0bde08efdcabc431338829cf96cb6d13eb4d43552a0bb7e3d7868e SHA512 19b6643361683c852d817d850108055ae86a27f658b0fd7dfa5b98bfe47374113ad4c149a120b48d25444d7d54ce645b01c3a94d4f980fc0055f2269961bbe48 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 qtwidgets-5.15.8-r2.ebuild 1200 BLAKE2B 81fb29cbaccc25e1ee0a094551410909e1869ee23c85d1c86c05beb0c9f93046a1672a7619ba4a41fad91f59db5e6cba250d82263a57c960695cd69d5c713b60 SHA512 95a331bbaa646d7bbf48a183434300a64e887cb51a1c5a3bf2683267d4f99d479639fe394d043dfe00996933382c2c7f2f886638c9d9dcd404085138ae5bf2ca -EBUILD qtwidgets-5.15.8-r3.ebuild 1253 BLAKE2B da2efc3cd5815a3abe41aab2e9ce54ab309d22983f71d7790c911463ce574def908f02469b4a91fc0ea2be001fb52117535845c2df9c8db2be1d07000a56fb69 SHA512 050efc3b7bcfebf988f9ae73ccdc7512ccebca2cebf0865fb85c377fa16e5bcad217d6ede9b8ec9e4b0a7dd1ce39b44fd1abd7e536be1de06ed1734c4a8be6f8 -EBUILD qtwidgets-5.15.8-r4.ebuild 1206 BLAKE2B 19adde31e27352891be060d2eac7d7939ab98815e2230a64ae83d6fc9a56d405d4a979051d03693dec170788950009cd6074829553b57fe038ac6d2aa6c583e7 SHA512 0b34b199305325c1a181ddc59b0f3b7ba6e1cf324537b6edda38ce58319f8e0f3f30103294cc3fee97723b2465947335dbcac24ac8685bca8e1793f0f56a1067 +EBUILD qtwidgets-5.15.8-r4.ebuild 1200 BLAKE2B 57e9f18072ffad18c20740250b0b448f96aaf35d3049bce3294cf53214cf76e137a1822c473ab00f9da91330b71b7539cb8cb41eb2d876987110d5f0b2b95aa7 SHA512 e5f16b55d009c67da5bf754daefe4334119339d5dbaa5e239e7e8b51f3f042491d2f478153807be1259c4176c5e2f5501b9c90501bed300de7982adec203db12 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1 diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch deleted file mode 100644 index c6ad77e54d44..000000000000 --- a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9a42df40228d246260cdcd40d2d582a2684439e4 Mon Sep 17 00:00:00 2001 -From: Volker Hilsheimer <volker.hilsheimer@qt.io> -Date: Fri, 10 Feb 2023 14:49:51 +0100 -Subject: [PATCH] QAbstractItemView: don't access invalid indexes on copy-key - -When pressing the copy key the view tried to access the model's data for -the currentIndex() without checking whether the index is valid. This -resulted in debug output to the console, and might break models that -didn't check incoming indexes for validity (or asserted validity). - -Fix this by checking whether the currentIndex() is valid before reading -the model's data for that index. - -Fixes: QTBUG-106569 -Pick-to: 6.5 6.4 6.2 5.15 -Change-Id: Ide75fbdfdbd1451ab6d48f07b22136553c5b2468 -Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> -(cherry picked from commit 3a0c33da3d913431391c5b7f4f0e93ea9d2221dc) ---- - src/widgets/itemviews/qabstractitemview.cpp | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp -index 5e65c59796..774b78dc4f 100644 ---- a/src/widgets/itemviews/qabstractitemview.cpp -+++ b/src/widgets/itemviews/qabstractitemview.cpp -@@ -2338,11 +2338,12 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) - - #if !defined(QT_NO_CLIPBOARD) && !defined(QT_NO_SHORTCUT) - if (event == QKeySequence::Copy) { -- QVariant variant; -- if (d->model) -- variant = d->model->data(currentIndex(), Qt::DisplayRole); -- if (variant.canConvert<QString>()) -- QGuiApplication::clipboard()->setText(variant.toString()); -+ const QModelIndex index = currentIndex(); -+ if (index.isValid() && d->model) { -+ const QVariant variant = d->model->data(index, Qt::DisplayRole); -+ if (variant.canConvert<QString>()) -+ QGuiApplication::clipboard()->setText(variant.toString()); -+ } - event->accept(); - } - #endif --- -GitLab - diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild deleted file mode 100644 index 41e6e38727ff..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild +++ /dev/null @@ -1,63 +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 qt5-build - -DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" - -# keep IUSE defaults in sync with qtgui -IUSE="dbus gles2-only gtk +png +X" -REQUIRED_USE="gtk? ( dbus )" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?] - dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) - gtk? ( - dev-libs/glib:2 - =dev-qt/qtgui-${QT5_PV}*:5=[dbus] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/tools/uic - src/widgets - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - dbus:xdgdesktopportal: - gtk:gtk3: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -src_configure() { - local myconf=( - -opengl $(usex gles2-only es2 desktop) - $(usev dbus -dbus-linked) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use X xcb) - $(usev X '-xcb-xlib -xkbcommon') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild deleted file mode 100644 index 02594c03b53f..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild +++ /dev/null @@ -1,65 +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 qt5-build - -DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" - -# keep IUSE defaults in sync with qtgui -IUSE="dbus gles2-only gtk +png +X" -REQUIRED_USE="gtk? ( dbus )" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?] - dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) - gtk? ( - dev-libs/glib:2 - =dev-qt/qtgui-${QT5_PV}*:5=[dbus] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/tools/uic - src/widgets - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - dbus:xdgdesktopportal: - gtk:gtk3: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -PATCHES=( "${FILESDIR}/${P}-QTBUG-106569.patch" ) - -src_configure() { - local myconf=( - -opengl $(usex gles2-only es2 desktop) - $(usev dbus -dbus-linked) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use X xcb) - $(usev X '-xcb-xlib -xkbcommon') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild index a445122d69a2..55f414e2c25f 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-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" |