summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-06-26 15:13:43 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-06-27 21:00:20 +0200
commite73cc3362d40d5fbd7d8362c4d9f49fe6933c61b (patch)
tree709775bbfe4300f91f49c6aa2b2ce2616577df61 /dev-qt/qtwebengine
parentdev-qt: Add Qt 5.11.1 (masked) (diff)
downloadgentoo-e73cc3362d40d5fbd7d8362c4d9f49fe6933c61b.tar.gz
gentoo-e73cc3362d40d5fbd7d8362c4d9f49fe6933c61b.tar.bz2
gentoo-e73cc3362d40d5fbd7d8362c4d9f49fe6933c61b.zip
dev-qt: Drop Qt 5.11.0_rc2
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r--dev-qt/qtwebengine/Manifest1
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch56
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild132
3 files changed, 0 insertions, 189 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3ae9c0f4abe5..f9de79570682 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
-DIST qtwebengine-everywhere-src-5.11.0-rc2.tar.xz 233745356 BLAKE2B 12fd78886532b5422122fbccb5a3b1f61ee12d72e4868ba2340cd525320de017bfe13520d7ad405db396b40a2ad40152a9d12a97f900302b21a2ece100f72afa SHA512 b46733628b162cfdf47311597d09bed97048dfdddff7e6970c6e29a3b91f3f2a9641e680fdc77979ce5da6cf978a6495d245f57692c3f081caa8e896e89b0228
DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
deleted file mode 100644
index 2c5012ee34b4..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 383ee1aa19b7b72c686d70f34bc9c377a51aaf5e Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Wed, 9 May 2018 13:23:17 +0200
-Subject: [PATCH] Fix build without qtlocation
-
-Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a
----
- src/core/content_browser_client_qt.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
-index 30ec43ca0..3878bd1bf 100644
---- a/src/core/content_browser_client_qt.cpp
-+++ b/src/core/content_browser_client_qt.cpp
-@@ -68,6 +68,7 @@
- #include "content/public/common/main_function_params.h"
- #include "content/public/common/service_names.mojom.h"
- #include "content/public/common/url_constants.h"
-+#include "device/geolocation/public/cpp/location_provider.h"
- #include "mojo/public/cpp/bindings/binding.h"
- #include "mojo/public/cpp/bindings/binding_set.h"
- #include "printing/features/features.h"
-@@ -93,7 +94,6 @@
- #include "certificate_error_controller_p.h"
- #include "desktop_screen_qt.h"
- #include "devtools_manager_delegate_qt.h"
--#include "location_provider_qt.h"
- #include "media_capture_devices_dispatcher.h"
- #include "net/network_delegate_qt.h"
- #include "net/qrc_protocol_handler_qt.h"
-@@ -123,6 +123,10 @@
- #include "renderer_host/pepper/pepper_host_factory_qt.h"
- #endif
-
-+#if defined(QT_USE_POSITIONING)
-+#include "location_provider_qt.h"
-+#endif
-+
- #include <QGuiApplication>
- #include <QLocale>
- #ifndef QT_NO_OPENGL
-@@ -737,7 +741,11 @@ bool ContentBrowserClientQt::CanCreateWindow(
-
- std::unique_ptr<device::LocationProvider> ContentBrowserClientQt::OverrideSystemLocationProvider()
- {
-+#if defined(QT_USE_POSITIONING)
- return base::WrapUnique(new LocationProviderQt());
-+#else
-+ return nullptr;
-+#endif
- }
-
- scoped_refptr<net::URLRequestContextGetter> GetSystemRequestContextOnUIThread()
---
-2.16.3
-
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
deleted file mode 100644
index 152fe1ffb781..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing 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 ~arm ~arm64 ~x86"
-fi
-
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( 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/qtprintsupport-${PV}
- ~dev-qt/qtwebchannel-${PV}[qml]
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/protobuf:=
- dev-libs/re2:=
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
- media-libs/libwebp:=
- media-libs/mesa
- media-libs/opus
- net-libs/libsrtp:0=
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/libcap
- sys-libs/zlib[minizip]
- virtual/libudev
- 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
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${PV} )
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
- 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
- sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" )
-
-src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.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 webengine-alsa src/core/config/linux.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod geolocation positioning \
- mkspecs/features/configure.prf \
- src/core/core_chromium.pri \
- src/core/core_common.pri
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -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
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 601472
- 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
-}