From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D8D1413824A for ; Sun, 8 May 2016 01:28:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24BD521C01D; Sun, 8 May 2016 01:28:33 +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 9239D21C01D for ; Sun, 8 May 2016 01:28:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 52E0733BF54 for ; Sun, 8 May 2016 01:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 810BC856 for ; Sun, 8 May 2016 01:28:28 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1462670903.841314d1b7527983d04195a33ca469bec11249ee.pesa@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-5.6.0-icu.patch dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 841314d1b7527983d04195a33ca469bec11249ee X-VCS-Branch: master Date: Sun, 8 May 2016 01:28:28 +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: a5ffab33-85c6-470a-a42d-498e7c899bf2 X-Archives-Hash: 6cad7dd4020bc33042aadb3846e11347 commit: 841314d1b7527983d04195a33ca469bec11249ee Author: Davide Pesavento gentoo org> AuthorDate: Sun May 8 01:28:23 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun May 8 01:28:23 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=841314d1 dev-qt/qtwebengine: sync Package-Manager: portage-2.2.28 .../qtwebengine/files/qtwebengine-5.6.0-icu.patch | 15 -------------- dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 22 +++++++++++--------- dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild | 24 ++++++++++++---------- dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 24 ++++++++++++---------- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 24 +++++++++++----------- 5 files changed, 50 insertions(+), 59 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch deleted file mode 100644 index 0b367c7..0000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch +++ /dev/null @@ -1,15 +0,0 @@ -Solves issue with trying to locate icudtl.dat in /usr/share/qt5/ when built -with system-icu. - -Patch from Fedora. - ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -40,6 +40,6 @@ - use?(system_snappy): GYP_CONFIG += use_system_snappy=1 - use?(system_speex): GYP_CONFIG += use_system_speex=1 - use?(system_vpx): GYP_CONFIG += use_system_libvpx=1 --use?(system_icu): GYP_CONFIG += use_system_icu=1 -+use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0 - use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1 - diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild index 3d54717..1e51797 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild @@ -25,8 +25,8 @@ RDEPEND=" ~dev-qt/qtnetwork-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat - dev-libs/jsoncpp - dev-libs/libevent + dev-libs/jsoncpp:= + dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt media-libs/alsa-lib @@ -35,15 +35,17 @@ RDEPEND=" media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= - >=media-libs/libvpx-1.4 - media-libs/libwebp + >=media-libs/libvpx-1.4:= + media-libs/libwebp:= + media-libs/mesa media-libs/opus media-libs/speex - net-libs/libsrtp + net-libs/libsrtp:= sys-apps/dbus sys-apps/pciutils sys-libs/libcap - sys-libs/zlib + sys-libs/zlib[minizip] + x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor @@ -72,15 +74,15 @@ src_prepare() { qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro - qt_use_disable_mod widgets widgets \ - src/src.pro \ - tests/quicktestbrowser/quicktestbrowser.pro + + qt_use_disable_mod widgets widgets src/src.pro qt5-build_src_prepare } src_configure() { - export NINJA_PATH="/usr/bin/ninja" + export NINJA_PATH=/usr/bin/ninja + local myqmakeargs=( $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild index d1fa59f..1e51797 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild @@ -25,8 +25,8 @@ RDEPEND=" ~dev-qt/qtnetwork-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat - dev-libs/jsoncpp - dev-libs/libevent + dev-libs/jsoncpp:= + dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt media-libs/alsa-lib @@ -35,15 +35,17 @@ RDEPEND=" media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= - >=media-libs/libvpx-1.4 - media-libs/libwebp + >=media-libs/libvpx-1.4:= + media-libs/libwebp:= + media-libs/mesa media-libs/opus media-libs/speex - net-libs/libsrtp + net-libs/libsrtp:= sys-apps/dbus sys-apps/pciutils sys-libs/libcap - sys-libs/zlib + sys-libs/zlib[minizip] + x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor @@ -56,7 +58,7 @@ RDEPEND=" x11-libs/libXScrnSaver x11-libs/libXtst geolocation? ( ~dev-qt/qtpositioning-${PV} ) - system-ffmpeg? ( media-video/ffmpeg:= ) + system-ffmpeg? ( =media-video/ffmpeg-2*:= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtwidgets-${PV} ) " @@ -72,15 +74,15 @@ src_prepare() { qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro - qt_use_disable_mod widgets widgets \ - src/src.pro \ - tests/quicktestbrowser/quicktestbrowser.pro + + qt_use_disable_mod widgets widgets src/src.pro qt5-build_src_prepare } src_configure() { - export NINJA_PATH="/usr/bin/ninja" + export NINJA_PATH=/usr/bin/ninja + local myqmakeargs=( $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild index d1fa59f..1e51797 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild @@ -25,8 +25,8 @@ RDEPEND=" ~dev-qt/qtnetwork-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat - dev-libs/jsoncpp - dev-libs/libevent + dev-libs/jsoncpp:= + dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt media-libs/alsa-lib @@ -35,15 +35,17 @@ RDEPEND=" media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= - >=media-libs/libvpx-1.4 - media-libs/libwebp + >=media-libs/libvpx-1.4:= + media-libs/libwebp:= + media-libs/mesa media-libs/opus media-libs/speex - net-libs/libsrtp + net-libs/libsrtp:= sys-apps/dbus sys-apps/pciutils sys-libs/libcap - sys-libs/zlib + sys-libs/zlib[minizip] + x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor @@ -56,7 +58,7 @@ RDEPEND=" x11-libs/libXScrnSaver x11-libs/libXtst geolocation? ( ~dev-qt/qtpositioning-${PV} ) - system-ffmpeg? ( media-video/ffmpeg:= ) + system-ffmpeg? ( =media-video/ffmpeg-2*:= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtwidgets-${PV} ) " @@ -72,15 +74,15 @@ src_prepare() { qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro - qt_use_disable_mod widgets widgets \ - src/src.pro \ - tests/quicktestbrowser/quicktestbrowser.pro + + qt_use_disable_mod widgets widgets src/src.pro qt5-build_src_prepare } src_configure() { - export NINJA_PATH="/usr/bin/ninja" + export NINJA_PATH=/usr/bin/ninja + local myqmakeargs=( $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 344dc64..78ea518 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -25,8 +25,8 @@ RDEPEND=" ~dev-qt/qtnetwork-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat - dev-libs/jsoncpp - dev-libs/libevent + dev-libs/jsoncpp:= + dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt media-libs/alsa-lib @@ -35,15 +35,17 @@ RDEPEND=" media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= - >=media-libs/libvpx-1.4 - media-libs/libwebp + >=media-libs/libvpx-1.4:= + media-libs/libwebp:= + media-libs/mesa media-libs/opus media-libs/speex - net-libs/libsrtp + net-libs/libsrtp:= sys-apps/dbus sys-apps/pciutils sys-libs/libcap - sys-libs/zlib + sys-libs/zlib[minizip] + x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor @@ -68,21 +70,19 @@ DEPEND="${RDEPEND} sys-devel/bison " -PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" ) - src_prepare() { qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro - qt_use_disable_mod widgets widgets \ - src/src.pro \ - tests/quicktestbrowser/quicktestbrowser.pro + + qt_use_disable_mod widgets widgets src/src.pro qt5-build_src_prepare } src_configure() { - export NINJA_PATH="/usr/bin/ninja" + export NINJA_PATH=/usr/bin/ninja + local myqmakeargs=( $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')