From 12bbed75c42932674004c24c08b2585f3cf72387 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 24 Feb 2018 01:54:47 +0300 Subject: =?UTF-8?q?=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20?= =?UTF-8?q?=20=20=20=20=20dev-qt/qtcore/qtcore-5.10.9999-r1.ebuild=20=09?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20?= =?UTF-8?q?=20=20dev-qt/qtgui/qtgui-5.10.9999-r1.ebuild=20=09=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20dev-qt/q?= =?UTF-8?q?tnetwork/qtnetwork-5.10.9999-r1.ebuild=20=09=D1=83=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20=20dev-qt/qtwebengin?= =?UTF-8?q?e/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch=20=09=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20de?= =?UTF-8?q?v-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qtwebengine-5.9.0-paxmark-mksnapshot.patch | 46 ---------------------- dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild | 33 ++++++++++++---- 2 files changed, 25 insertions(+), 54 deletions(-) delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch deleted file mode 100644 index 5eb8ce1..0000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/src/3rdparty/chromium/v8/src/v8.gyp -+++ b/src/3rdparty/chromium/v8/src/v8.gyp -@@ -36,6 +36,7 @@ - 'v8_experimental_extra_library_files%': [], - 'v8_enable_inspector%': 0, - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - }, -@@ -2432,7 +2433,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': [ - 'v8_base', -@@ -2485,5 +2486,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/qtwebengine-5.10.9999-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild index d515498..81e88ac 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild @@ -26,9 +26,10 @@ RDEPEND=" ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat dev-libs/libevent:= - dev-libs/libxml2 + dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= + dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= @@ -61,10 +62,14 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) - widgets? ( ~dev-qt/qtwidgets-${PV} ) + widgets? ( + ~dev-qt/qtdeclarative-${PV}[widgets] + ~dev-qt/qtwidgets-${PV} + ) " DEPEND="${RDEPEND} ${PYTHON_DEPS} + >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c @@ -72,18 +77,24 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " +PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" ) + src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) PATCHES+=( "${FILESDIR}/build_fix.patch" "${FILESDIR}/build_fix2.patch" ) + use system-icu && has_version ">=dev-libs/icu-59" && \ + PATCHES+=( + "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch" + ) # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die - qt_use_disable_config alsa alsa src/core/config/linux.pri - qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri + qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri qt_use_disable_mod geolocation positioning \ mkspecs/features/configure.prf \ @@ -100,9 +111,15 @@ src_configure() { export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" local myqmakeargs=( - $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') - $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') - $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') + -- + -opus + -printing-and-pdf + -webp + $(usex alsa '-alsa' '') + $(usex bindist '' '-proprietary-codecs') + $(usex pulseaudio '-pulseaudio' '') + $(usex system-ffmpeg '-ffmpeg' '') + $(usex system-icu '-webengine-icu' '') ) qt5-build_src_configure } -- cgit v1.2.3