aboutsummaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-04-02 12:02:24 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-04-02 12:02:24 -0700
commitd1e213c456c582febfc4fb677604615c0d314dbe (patch)
treece518748925db94e8fb63d0d7a7f0cb34e7b3e5e /dev-qt
parentmedia-libs/mesa: Version bump 20.0.3 (diff)
downloadmusl-d1e213c456c582febfc4fb677604615c0d314dbe.tar.gz
musl-d1e213c456c582febfc4fb677604615c0d314dbe.tar.bz2
musl-d1e213c456c582febfc4fb677604615c0d314dbe.zip
dev-qt/qtwebengine: drop from overlay
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtwebengine/Manifest2
-rw-r--r--dev-qt/qtwebengine/files/musl/resolv_compat.h29
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch33
-rw-r--r--dev-qt/qtwebengine/metadata.xml27
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild135
5 files changed, 0 insertions, 226 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
deleted file mode 100644
index 570ba81f..00000000
--- a/dev-qt/qtwebengine/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST qtwebengine-5.13.2-patches.tar.xz 61136 BLAKE2B f7aac1213a6368ba7e6ca87a20fb92d031e64b1ac472ca123e10760426e02d1652e2b78ec61c3c9d8ac8a98c36241c0b36602af2d0644e538d63508e49292b25 SHA512 61e834d4df6fec48007c2d8331e0b1c375683f3c5837a86dacd49be14da1d5aebc7f53a0d27523ed2c4a14e7ac1ed4b52bc8812443754ab6f721f1d2962d68d9
-DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
diff --git a/dev-qt/qtwebengine/files/musl/resolv_compat.h b/dev-qt/qtwebengine/files/musl/resolv_compat.h
deleted file mode 100644
index 4f0e852a..00000000
--- a/dev-qt/qtwebengine/files/musl/resolv_compat.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#if !defined(__GLIBC__)
-/***************************************************************************
- * resolv_compat.h
- *
- * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
- * Note: res_init() is actually deprecated according to
- * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
- **************************************************************************/
-#include <string.h>
-
-static inline int res_ninit(res_state statp)
-{
- int rc = res_init();
- if (statp != &_res) {
- memcpy(statp, &_res, sizeof(*statp));
- }
- return rc;
-}
-
-static inline int res_nclose(res_state statp)
-{
- if (!statp)
- return -1;
- if (statp != &_res) {
- memset(statp, 0, sizeof(*statp));
- }
- return 0;
-}
-#endif
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
deleted file mode 100644
index d7fdaebd..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev@qt.io>
-Date: Fri, 23 Aug 2019 15:09:25 +0200
-Subject: Fix compilation with system ICU
-
-ICU upstream now requires that ICU4C API macros are used with a
-trailing semicolon.
-
-- https://unicode-org.atlassian.net/browse/ICU-20601
-- https://github.com/unicode-org/icu/pull/759
-
-Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
-Fixes: QTBUG-78911
-Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- .../blink/renderer/core/dom/document.cc | 2 +-
- chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++-------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
-index 920dab7c48d..43fd422393c 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
-
- for (unsigned i = 0; i < length;) {
- UChar32 c;
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (c == ':') {
- if (saw_colon)
- return ParseQualifiedNameResult(kQNMultipleColons);
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
deleted file mode 100644
index 380559ac..00000000
--- a/dev-qt/qtwebengine/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <use>
- <flag name="designer">Install the QWebEngineView plugin used to add widgets in
- <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
- <flag name="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
- instead of bundled.</flag>
- <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
- instead of bundled.</flag>
- <flag name="widgets">Enable QtWidgets support</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>https://doc.qt.io/</doc>
- </upstream>
- <slots>
- <subslots>
- Must only be used by packages that are known to use private parts of the Qt API.
- </subslots>
- </slots>
-</pkgmetadata>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
deleted file mode 100644
index 9357fd56..00000000
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-SRC_URI+=" https://dev.gentoo.org/~anarchy/dist/${PN}-5.13.2-patches.tar.xz "
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~ppc64 ~x86"
-fi
-
-IUSE="alsa bindist designer jumbo-build 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/qtpositioning-${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/re2:=
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
- media-libs/libwebp:=
- media-libs/mesa[egl,X(+)]
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- 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} )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-60.2:= )
- 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
-"
-
-PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" )
-
-src_prepare() {
- if ! use jumbo-build; then
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/core/config/common.pri || die
- fi
-
- if use elibc_musl; then
- eapply "${WORKDIR}/${PN}-5.13.2-patches"
- sed -i -e "s;\(use_allocator_shim\) = .*;\1 = false;" src/3rdparty/chromium/build/config/allocator.gni || die
- # Compatibility functions res_ninit() and res_nclose() for musl libc
- cp -v "${FILESDIR}"/musl/resolv_compat.h "${S}"/src/3rdparty/chromium/net/dns || die
- fi
-
- # 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 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
-}