From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- dev-qt/qtwebengine/Manifest | 10 +++--- .../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ---------------------- ...qtwebengine-5.14.1-disable-fatal-warnings.patch | 12 +++++++ dev-qt/qtwebengine/metadata.xml | 1 - dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 13 +++---- dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild | 15 +++----- dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 32 ++++++++--------- 7 files changed, 42 insertions(+), 82 deletions(-) delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 67c9e3f4df8f..f67c9c17779e 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,11 +1,11 @@ -AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f AUX qtwebengine-5.12.0-nouveau-disable-gpu.patch 3740 BLAKE2B fc2745ba0e3ac264d2f59ede3628f6d4d94db8f175c4cf68444e5dabb5fd0266957c804da7e0e761d8f39ddbe2781ae023aef8db1a907907e7db116b48a8cd11 SHA512 fe407c7907e6e9dd09be6e53f4c560ab453e5081fbbac4392b29fdb32cfccd1157e6a9ed2c7839b1aeda2088309e124b7130963175472a660ea46807299e8d9a AUX qtwebengine-5.12.5-icu-65.patch 1394 BLAKE2B 223e449a1086c2f062e34752278ba83a828283aa577b92aa3ba28343fb06e18ed6b94990e46729076b099674e2a0936f08958aa72ac3b44f4cc7dd1602b13cfa SHA512 2b530a6a60e1ca71aba7c7d86f7e831799e8bec20ab6c97d79e753d337767c9f44938f19c00714706f2720bb4b0a3599a44046a69ed42372b21bac452b713b68 AUX qtwebengine-5.12.5-pulseaudio-13.patch 5034 BLAKE2B 12bce7933a58472dfad4581fa8e949d3326c32f307af73bcac054a94759cd5163d97c5ceb326ea1924d086022b9d316d45a4fbed81483eddcfe1c7ba91d708f3 SHA512 7160583ba150812d6e860550a0b7b9f53ae157679025e41aca6e1b0e5186549ecd49d70724ef84ff9d58abf65b598df44f3c54a456ffb1698d96159db2778811 +AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5 DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0 DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9 -EBUILD qtwebengine-5.12.3.ebuild 3640 BLAKE2B 475a098f209fee144ad01041e34380b731f4b53b8adef546e32ada8856faab12bb0ad1488f2142e8918ce40e692c03ab5103050069fe37b994c41501cae08e21 SHA512 991b4dd5ec9713d5b4fca2a6a7d068bc7dded5e135e6a7211e7765d81baa24987959b08bd41d1cfe11e82428a133ccb766c3fa375189e4e9e117879c3fc785d5 -EBUILD qtwebengine-5.13.2.ebuild 3280 BLAKE2B 4ecfdaec53a6cb6677b0d85a08f076d1c6ac95d032602561b677722b3d7a4bc92364fe3d6185361a01b88a85edc2f91ed679ea97df6dd9b2e1b04e22341e8e20 SHA512 bd7fcdfb2869de701a7970555ad0ffc5df51ce40c52acde7922a9aee787633ee9f0c0489d516b5a5f9336f33f53076034248a812e979a9f7187aead325b9f693 -EBUILD qtwebengine-5.14.1.ebuild 3246 BLAKE2B 3c27add6e8ec42de2a73b7bce7219a9ba4823505fbb719b4e34f52ff9f756457eaa3108e704b4b11ed39d8f34b2dc5bb2f4a4191fc91ff7f47e8236d4b5aec45 SHA512 d08064aa4e706c264117e26775a3de06edb832f7b80e029e51ebcafa70eddc0faba8b3f8b7abea44828605a4de436dccc57d630782f4fe56795d6f57580c2574 -MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707 +EBUILD qtwebengine-5.12.3.ebuild 3440 BLAKE2B dd0b8549dbc036929320cdec79dc2e1ef71385eda722153668ea44e28f35bc6333a85763e318bf3d749257207b99a659a1d36a8420a11927a638d2ac4c23ef28 SHA512 4559734707f5eb1ea14b6696b4ec5df188d060198a872093db8a096736876df8cc35fc479082e812746a5260a4816deae7180034c7906a467fd35a939fbad96e +EBUILD qtwebengine-5.13.2.ebuild 3085 BLAKE2B bebfe0b97a8c40a0b863403d6330f654ecd755b00ff916e255ba2b250bf2b2685515ea3e29717323c35eefb0d00e845545113c8f5e090e8546143191a3dad9c1 SHA512 c2f5dbc70cadbf1992ccf94aa1c60e96fb9a4924b2864e53cddc5a01e766cac81a90306a51ddd369859ff3141ff4e18391a7c51ea28b54d50976f3b5bb808300 +EBUILD qtwebengine-5.14.1.ebuild 3323 BLAKE2B 52bb7f548a8a01f631f56898ffdf6c5049f212154fb9afd4a60bf7fee92a2a716c61c5b5aaadb10530b32dadf3c3af5e1f08e52e603c4029df447f15af2c2df9 SHA512 cb3023c439cfe26ba965af490b6a7e1d8ab7f2c4671ab0bd047342b4ecd548b7021671ffa080c0965bef90cedb968e9cbbcd8b95e8b366979cd6c26b36df4321 +MISC metadata.xml 1102 BLAKE2B 7ba2157c180e35ea470d8296d157d73f2fa565cbc8319f41f5ae533b02dc981a4d4352efb1ad94f1e298047a3b56cea097aef3ff09a19d33cf861cfb64ee9119 SHA512 d96e13fa5eddde448bce28c9373022909035f9b63e75584e7f320510f853e1c89dc9417f4280d307e29c9a7f75c89c75b5cc00c19c2d6cd6360812719dd0acc8 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch deleted file mode 100644 index f7a5c064fc4e..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch +++ /dev/null @@ -1,41 +0,0 @@ -Bug: https://bugs.gentoo.org/634220 - ---- a/src/3rdparty/chromium/v8/BUILD.gn -+++ b/src/3rdparty/chromium/v8/BUILD.gn -@@ -803,6 +803,7 @@ - - deps = [ - ":mksnapshot($v8_snapshot_toolchain)", -+ ":run_paxmark", - ] - - script = "tools/run.py" -@@ -854,6 +855,28 @@ - } - } - } -+action("run_paxmark") { -+ visibility = [ ":*" ] # Only targets in this file can depend on this. -+ -+ deps = [ -+ ":mksnapshot($v8_snapshot_toolchain)", -+ ] -+ -+ script = "/usr/sbin/pypaxctl" -+ -+ sources = [] -+ -+ outputs = [ -+ "$target_out_dir/mksnapshot", -+ ] -+ -+ args = [ -+ "-sm", -+ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", -+ "root_out_dir") + "/mksnapshot", -+ root_build_dir), -+ ] -+} - - action("v8_dump_build_config") { - script = "tools/testrunner/utils/dump_build_config.py" diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch new file mode 100644 index 000000000000..40f1f5d6c2a9 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +index 97d3953..dd3d222 100644 +--- a/src/buildtools/config/common.pri ++++ b/src/buildtools/config/common.pri +@@ -25,6 +25,7 @@ gn_args += \ + v8_use_external_startup_data=false \ + toolkit_views=false \ + treat_warnings_as_errors=false \ ++ fatal_linker_warnings=false \ + safe_browsing_mode=0 \ + optimize_webui=false \ + forbid_non_component_debug_builds=false diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml index acca7340ba1a..180beb2cfc87 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -11,7 +11,6 @@ Enable physical position determination via dev-qt/qtpositioning Combine source files to speed up build process. - Enable building under a PaX enabled kernel Use the system-wide media-video/ffmpeg instead of bundled. Use the system-wide dev-libs/icu diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild index fbd7648f6f0a..ec2e98d5c56a 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild @@ -2,17 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python2_7 ) -inherit multiprocessing pax-utils python-any-r1 qt5-build +inherit multiprocessing python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="arm x86" + KEYWORDS="x86" fi -IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio - +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -75,7 +75,6 @@ DEPEND="${RDEPEND} dev-util/ninja dev-util/re2c sys-devel/bison - pax_kernel? ( sys-apps/elfix ) !!=sys-devel/binutils-2.31.1-r5 !!=sys-devel/binutils-2.32-r0 " @@ -87,8 +86,6 @@ PATCHES+=( ) src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) - if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/core/config/common.pri || die @@ -137,6 +134,4 @@ src_install() { if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" fi - - pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess } diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild index 0f097f91df8a..f5c244acbfc5 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + PYTHON_COMPAT=( python2_7 ) -inherit multiprocessing pax-utils python-any-r1 qt5-build +inherit multiprocessing python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~x86" + KEYWORDS="amd64 arm arm64 ~x86" fi -IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio - +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -75,14 +75,11 @@ DEPEND="${RDEPEND} dev-util/ninja dev-util/re2c sys-devel/bison - pax_kernel? ( sys-apps/elfix ) " PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" ) src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) - if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/core/config/common.pri || die @@ -126,6 +123,4 @@ src_install() { if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" fi - - pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess } diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild index db4d9855990d..92e75c3c12e5 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + PYTHON_COMPAT=( python2_7 ) -inherit multiprocessing pax-utils python-any-r1 qt5-build +inherit multiprocessing python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" @@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio - +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtpositioning-${PV} ~dev-qt/qtprintsupport-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat @@ -60,6 +59,7 @@ RDEPEND=" x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-${PV} ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) @@ -75,12 +75,13 @@ DEPEND="${RDEPEND} dev-util/ninja dev-util/re2c sys-devel/bison - pax_kernel? ( sys-apps/elfix ) " -src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) +PATCHES=( + "${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446 +) +src_prepare() { if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/buildtools/config/common.pri || die @@ -105,14 +106,15 @@ src_configure() { local myqmakeargs=( -- - -opus -printing-and-pdf - -webp - $(usex alsa '-alsa' '') - $(usex bindist '' '-proprietary-codecs') - $(usex pulseaudio '-pulseaudio' '') - $(usex system-ffmpeg '-ffmpeg' '') - $(usex system-icu '-webengine-icu' '') + -system-opus + -system-webp + $(usex alsa '-alsa' '-no-alsa') + $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') + $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') + $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') + $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') + $(usex system-icu '-webengine-icu' '-no-webengine-icu') ) qt5-build_src_configure } @@ -124,6 +126,4 @@ src_install() { if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" fi - - pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess } -- cgit v1.2.3