diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-12-15 03:15:17 +1100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-12-15 03:20:43 +1100 |
commit | 71a6d03fa26e655ebbe9f6919de70901431c4793 (patch) | |
tree | 20809e323f42e248c400be4855b8f2e4be7901bc /dev-qt/qtwebengine | |
parent | dev-qt: version bump 5.7.1 (diff) | |
download | gentoo-71a6d03fa26e655ebbe9f6919de70901431c4793.tar.gz gentoo-71a6d03fa26e655ebbe9f6919de70901431c4793.tar.bz2 gentoo-71a6d03fa26e655ebbe9f6919de70901431c4793.zip |
dev-qt: remove 5.7.0
Package-Manager: portage-2.3.3
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch | 106 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild | 113 |
3 files changed, 0 insertions, 220 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 0e12960216fb..42170deeb258 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,4 +1,3 @@ DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256 c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512 4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f WHIRLPOOL dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667 DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e -DIST qtwebengine-opensource-src-5.7.0.tar.xz 165709640 SHA256 985762fff5cd8a1a0d2a644a4a51238676898685f9ff1a78c3f2800025d6dc5d SHA512 8f010ea8d7047880c0bc941749a4172deae0f363ff25e00412291ad2bb243ac4c51031403eae0bba11b4f42c3e3d414858d29e3a3fb0459703dcaaff9b7133cd WHIRLPOOL 112f80f8cc279d743641095f47512a95d43286c1fe32c678a5ada810a7da12b1ef6e4483401e1a08c32d7e0d6e23369c65fbaeeee5f9a4bc34e330f59359e648 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch deleted file mode 100644 index 2cc53e61f5c0..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch +++ /dev/null @@ -1,106 +0,0 @@ -From cffcf22082879939bbcfa89e88057beda829a0a7 Mon Sep 17 00:00:00 2001 -From: David Faure <david.faure@kdab.com> -Date: Sat, 3 Sep 2016 18:01:40 +0200 -Subject: gcc6: set -fno-delete-null-pointer-checks for all files - -Not just v8, as v8_no_delete_null_pointer_checks does. -This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer -which also compares this with null. - -I'll remove v8_no_delete_null_pointer_checks in a later commit -to avoid a temporary breakage until qtwebengine is updated. - -Change-Id: I8782fadc8fab125b5394bd60857e70c6ae75f9b0 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> -(cherry picked from commit c42f53ec3ca90bfd98577988462ed51464feebe3) ---- - chromium/build/common.gypi | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi -index b6a0284..d768ab3 100644 ---- a/src/3rdparty/chromium/build/common.gypi -+++ b/src/3rdparty/chromium/build/common.gypi -@@ -4702,6 +4706,9 @@ - '-Wl,--disable-new-dtags', - ], - }], -+ [ 'no_delete_null_pointer_checks==1', { -+ 'cflags_cc': [ '-fno-delete-null-pointer-checks' ], -+ }], - ['clang==0', { - 'target_conditions': [ - ['_toolset=="target"', { --- -cgit v1.0-4-g1e03 - -From ae73e50e7d8c1371ed293c10150646a2719f4598 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Wed, 14 Sep 2016 17:40:50 +0200 -Subject: FIXUP: gcc6: set -fno-delete-null-pointer-checks for all files - -Set a default and pull in the value from configuration, and -remove the old v8 only version. - -Change-Id: Ica9f971baa28c717178eb2acd074607424792e1d -Reviewed-by: David Faure <david.faure@kdab.com> ---- - chromium/build/common.gypi | 4 ++++ - chromium/v8/build/toolchain.gypi | 7 ------- - 2 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi -index d768ab3..8a1df22 100644 ---- a/src/3rdparty/chromium/build/common.gypi -+++ b/src/3rdparty/chromium/build/common.gypi -@@ -727,6 +727,9 @@ - # By default include non-appstore-compliant code. - 'appstore_compliant_code%': 0, - -+ # Enable this to turn off the delete-null-pointer-checks optimization in GCC 6+ -+ 'no_delete_null_pointer_checks%': 0, -+ - 'conditions': [ - # A flag for POSIX platforms - ['OS=="win"', { -@@ -1271,6 +1274,7 @@ - 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)', - 'proprietary_codecs%': '<(proprietary_codecs)', - 'appstore_compliant_code%': '<(appstore_compliant_code)', -+ 'no_delete_null_pointer_checks%': '<(no_delete_null_pointer_checks)', - 'use_goma%': '<(use_goma)', - 'gomadir%': '<(gomadir)', - 'use_lto%': '<(use_lto)', --- -cgit v1.0-4-g1e03 - -From d6c8a2cf8fa374e6d1c0a578391b57112c047fa4 Mon Sep 17 00:00:00 2001 -From: David Faure <david.faure@kdab.com> -Date: Mon, 5 Sep 2016 15:25:02 +0200 -Subject: Enable -fno_delete_null_pointer_checks for g++ 6 on all of chromium - -This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer -which also compares this with null. - -Change-Id: I85d69432a0d7eeb0d8df8f395821880e36180dcc -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - src/core/config/linux.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 9264932..a318e17 100644 ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -29,6 +29,8 @@ use?(nss) { - use_openssl_certs=1 - } - -+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += no_delete_null_pointer_checks=1 -+ - contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1 - contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 - contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 --- -cgit v1.0-4-g1e03 - diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild deleted file mode 100644 index 6f3b624d16c6..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit pax-utils 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 ~x86" -fi - -IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" - -RDEPEND=" - app-arch/snappy - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtwebchannel-${PV}[qml] - dev-libs/expat - dev-libs/jsoncpp:= - dev-libs/libevent:= - dev-libs/libxml2 - dev-libs/libxslt - media-libs/alsa-lib - media-libs/flac - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/libpng:0= - >=media-libs/libvpx-1.4:= - media-libs/libwebp:= - media-libs/mesa - media-libs/opus - media-libs/speex - net-libs/libsrtp:0= - sys-apps/dbus - sys-apps/pciutils - sys-libs/libcap - sys-libs/zlib[minizip] - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - geolocation? ( ~dev-qt/qtpositioning-${PV} ) - system-ffmpeg? ( media-video/ffmpeg:0= ) - system-icu? ( dev-libs/icu:= ) - widgets? ( ~dev-qt/qtwidgets-${PV} ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gperf - dev-util/ninja - dev-util/re2c - sys-devel/bison - pax_kernel? ( sys-apps/elfix ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch" - "${FILESDIR}/${PN}-5.7.0-gcc6.patch" - "${FILESDIR}/${PN}-5.7.0-icu58.patch" - "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch" -) - -src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) - - if use system-icu; then - # ensuire build against system headers - bug #601264 - rm -r src/3rdparty/chromium/third_party/icu/source || die - fi - - 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 - - qt5-build_src_prepare -} - -src_configure() { - export NINJA_PATH=/usr/bin/ninja - - 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' '') - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess -} |