From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2BBC1395E2 for ; Tue, 6 Dec 2016 07:24:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68812E0C99; Tue, 6 Dec 2016 07:24:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C141E0C99 for ; Tue, 6 Dec 2016 07:24:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E868341063 for ; Tue, 6 Dec 2016 07:24:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F0D6495 for ; Tue, 6 Dec 2016 07:24:51 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1481009079.5ba6b2a0be445e551d764fa8ced1f0e3d9447f61.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch dev-qt/qtwebengine/metadata.xml dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 5ba6b2a0be445e551d764fa8ced1f0e3d9447f61 X-VCS-Branch: master Date: Tue, 6 Dec 2016 07:24:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2c628a5a-ef24-4e5b-a83b-3e78b0277c3f X-Archives-Hash: b24f2a29ddf5c8c528b0ce3e160eddb5 commit: 5ba6b2a0be445e551d764fa8ced1f0e3d9447f61 Author: Aric Belsito gmail com> AuthorDate: Tue Dec 6 07:23:38 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Dec 6 07:24:39 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ba6b2a0 dev-qt/qtwebengine: Fix on PaX kernels Gentoo-Bug: 579712 Gentoo-Bug: 582558 Package-Manager: portage-2.3.2 .../files/qtwebengine-paxmark-mksnapshot.patch | 46 ++++++++++++++++++++++ dev-qt/qtwebengine/metadata.xml | 1 + dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 13 +++++- dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 13 +++++- dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 13 +++++- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 13 +++++- 6 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch new file mode 100644 index 0000000..c71cedc --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch @@ -0,0 +1,46 @@ +--- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100 ++++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000 +@@ -33,6 +33,7 @@ + 'embed_script%': "", + 'v8_extra_library_files%': [], + 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'remove_v8base_debug_symbols%': 0, + }, + 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'], +@@ -1913,7 +1914,7 @@ + ] + }, + { +- 'target_name': 'mksnapshot', ++ 'target_name': 'mksnapshot_u', + 'type': 'executable', + 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'], + 'include_dirs+': [ +@@ -1936,5 +1937,26 @@ + }], + ], + }, ++ { ++ 'target_name': 'mksnapshot', ++ 'type': 'executable', ++ 'dependencies': ['mksnapshot_u'], ++ 'actions': [ ++ { ++ 'action_name': 'paxmark_m_mksnapshot', ++ 'inputs': [ ++ '<(mksnapshot_u_exec)', ++ ], ++ 'outputs': [ ++ '<(mksnapshot_exec)', ++ ], ++ 'action': [ ++ 'sh', ++ '-c', ++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)', ++ ], ++ }, ++ ], ++ }, + ], + } diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml index 881cc17..9c08bb1 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -8,6 +8,7 @@ Enable physical position determination via dev-qt/qtpositioning + 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.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild index dbd3eea..475ef9e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build +inherit pax-utils python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation +system-ffmpeg +system-icu widgets" +IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -68,9 +68,12 @@ DEPEND="${RDEPEND} dev-util/ninja dev-util/re2c sys-devel/bison + pax_kernel? ( sys-apps/elfix ) " src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) + if use system-icu; then # ensure build against system headers - bug #601264 rm -r src/3rdparty/chromium/third_party/icu/source || die @@ -95,3 +98,9 @@ src_configure() { ) qt5-build_src_configure } + +src_install() { + qt5-build_src_install + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild index dbd3eea..475ef9e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build +inherit pax-utils python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation +system-ffmpeg +system-icu widgets" +IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -68,9 +68,12 @@ DEPEND="${RDEPEND} dev-util/ninja dev-util/re2c sys-devel/bison + pax_kernel? ( sys-apps/elfix ) " src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) + if use system-icu; then # ensure build against system headers - bug #601264 rm -r src/3rdparty/chromium/third_party/icu/source || die @@ -95,3 +98,9 @@ src_configure() { ) qt5-build_src_configure } + +src_install() { + qt5-build_src_install + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild index dbd3eea..475ef9e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build +inherit pax-utils python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation +system-ffmpeg +system-icu widgets" +IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -68,9 +68,12 @@ DEPEND="${RDEPEND} dev-util/ninja dev-util/re2c sys-devel/bison + pax_kernel? ( sys-apps/elfix ) " src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) + if use system-icu; then # ensure build against system headers - bug #601264 rm -r src/3rdparty/chromium/third_party/icu/source || die @@ -95,3 +98,9 @@ src_configure() { ) qt5-build_src_configure } + +src_install() { + qt5-build_src_install + + 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 dbd3eea..475ef9e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build +inherit pax-utils python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation +system-ffmpeg +system-icu widgets" +IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -68,9 +68,12 @@ DEPEND="${RDEPEND} dev-util/ninja dev-util/re2c sys-devel/bison + pax_kernel? ( sys-apps/elfix ) " src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) + if use system-icu; then # ensure build against system headers - bug #601264 rm -r src/3rdparty/chromium/third_party/icu/source || die @@ -95,3 +98,9 @@ src_configure() { ) qt5-build_src_configure } + +src_install() { + qt5-build_src_install + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +}