commit: 1063d701da0b8e04a5bb01dee749ce18bbb48c7a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Feb 8 20:23:27 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Feb 8 20:23:27 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1063d701
dev-qt/qtwebengine: pax_kernel is dead Closes: https://bugs.gentoo.org/634220 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ---------------------- dev-qt/qtwebengine/metadata.xml | 1 - dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 13 +++---- dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 11 ++---- dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 11 ++---- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 13 +++---- 6 files changed, 14 insertions(+), 76 deletions(-) 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 f7a5c064..00000000 --- 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/metadata.xml b/dev-qt/qtwebengine/metadata.xml index 75d11c0b..380559ac 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -9,7 +9,6 @@ <flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag> <flag name="jumbo-build">Combine source files to speed up build process.</flag> - <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag> <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag> <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild index cdbb48bf..1ef75cf4 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild @@ -1,9 +1,10 @@ -# 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" @@ -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 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 ) " PATCHES+=( @@ -83,8 +82,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 @@ -128,6 +125,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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild index 59cd6171..2f92716a 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.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 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,12 +75,9 @@ 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" ) - if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/buildtools/config/common.pri || die @@ -125,6 +122,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.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild index c34e9f79..0af3da8e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.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 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,12 +75,9 @@ 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" ) - if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/buildtools/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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 3ec1fb34..7c6f51fc 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -1,9 +1,10 @@ -# 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" @@ -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 jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -75,12 +75,9 @@ 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" ) - if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/core/config/common.pri || die @@ -124,6 +121,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 }
