* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2015-10-01 1:28 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2015-10-01 1:28 UTC (permalink / raw
To: gentoo-commits
commit: 3fcb1d13734839637cf32d9a7eaf4bfa40e4406e
Author: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Sep 19 19:30:29 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 1 01:34:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3fcb1d13
dev-qt/qtwebkit: Disable backtrace, bug #560860
dev-qt/qtwebkit/Manifest | 7 ++
.../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 +++
.../files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 ++++
.../files/qtwebkit-5.4.2-system-leveldb.patch | 25 +++++
...webkit-5.5.0-fix-backtrace-detection-musl.patch | 22 +++++
dev-qt/qtwebkit/metadata.xml | 19 ++++
dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild | 102 +++++++++++++++++++++
7 files changed, 208 insertions(+)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
new file mode 100644
index 0000000..fd74f5a
--- /dev/null
+++ b/dev-qt/qtwebkit/Manifest
@@ -0,0 +1,7 @@
+AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71
+AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274
+AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7
+AUX qtwebkit-5.5.0-fix-backtrace-detection-musl.patch 832 SHA256 2f626061cadac70a881b91f03e9b5671ecf848d6c619c38b75f0fe3fdf380463 SHA512 39ea30ae653b39b4e933f26acaa0d75e9ea4fbd3cd4843a404c887e7525183a722870e561512e7829f1d60e6f63628c2e79a19d03b47935cad6cc7f46e515e22 WHIRLPOOL ca0bf716dbc81d233af66a6aa0fb4ae96e28dffb493d5d6cf2af799fb5a7b3ee16f13e8fefc0d3fb28839cc7aaf3d696533cb76d4b8d4ef96b964757d1654039
+DIST qtwebkit-opensource-src-5.5.0.tar.xz 33483864 SHA256 17964996347d040a68b0c378a84b4b3874f1289c0d561b6868f7668402d9eeec SHA512 6255ec8d3a6fc067b25bf4f19ecbf256be339969a973768337d5452457d77030c229634d6be944d96ffbbdc3603ca00497ff8fac8bcf1b7051dad31612742d3e WHIRLPOOL 5866fa4d6cf002f083a88af19db1b2d517e6bf54e942c0d7c708bc4ef808071b1ab62d0ff85fe8baa0ac9bcc9b451e52a9911bc25d16d8d70e9a0825252293e2
+EBUILD qtwebkit-5.5.0-r99.ebuild 2989 SHA256 4911597479777dcafe6bc3230977a1949014149af0438d6ea3049297a66923f9 SHA512 6a3046b679451df67077b5ad20a259e13874a92e110ef1d780670a442bb69fd569dd808008c0ed7ba5ff6159046d1787a97478bda721a8b15a6dd98e956b55c6 WHIRLPOOL 2b59df14ef64b306a03e21eb6a5795cb2ab368f137edb5198a146147536a32d34db3b6d45f71c06035b9ee0011fc55b56585355effbb5428d68054eaa60365b0
+MISC metadata.xml 923 SHA256 f43643c520efe9e8b82c6a88223d296f0262a98eaa3dd6c87e4a8feac64c42e8 SHA512 6ac6e707a39e61540595d0522ca8e2d453e57a8c68071f8ce5b957389786b47f4b5c67b1572c5a8e36a54399e8cf4eed594280c3e6d60b02db52906b02d982f7 WHIRLPOOL 6eebe81091163c3ef908b0ebb6af86d6f5e6614e3f649e25f2dfff2a816e660ca660cb60767e3138251e22488326bdf9fa555db0b559e1bd1da033b99f2789b9
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
new file mode 100644
index 0000000..05e41a1
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000
++++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000
+@@ -99,12 +99,6 @@
+
+ # HTML5 Media Support for builds with GStreamer
+ unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
+- WEBKIT_CONFIG += video use_gstreamer
+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+- }
+- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+ }
+
+ !enable?(video):qtHaveModule(multimediawidgets) {
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
new file mode 100644
index 0000000..1c02e45
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
@@ -0,0 +1,18 @@
+--- Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100
++++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100
+@@ -96,14 +96,8 @@
+ use?(3d_graphics): WEBKIT_CONFIG += webgl
+
+ # HTML5 Media Support for builds with GStreamer
+- unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
+- WEBKIT_CONFIG += video use_gstreamer
+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+- }
++ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+ use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+- }
+
+ !enable?(video):qtHaveModule(multimediawidgets) {
+ WEBKIT_CONFIG += video use_qt_multimedia
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
new file mode 100644
index 0000000..0a476c6
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -0,0 +1,25 @@
+Correct header location so system dev-libs/leveldb can be detected.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+@@ -19,7 +19,7 @@
+
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+
+ int main(int, char**)
+ {
+
+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+@@ -38,7 +38,7 @@
+ #include <leveldb/comparator.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ #include <leveldb/slice.h>
+ #include <string>
+ #include <wtf/PassOwnPtr.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch
new file mode 100644
index 0000000..73e085f
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch
@@ -0,0 +1,22 @@
+https://github.com/meta-qt5/meta-qt5/blob/master/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+
+--- a/Source/WTF/wtf/Assertions.cpp
++++ b/Source/WTF/wtf/Assertions.cpp
+@@ -61,7 +61,7 @@
+ #include <windows.h>
+ #endif
+
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+ #include <execinfo.h>
+@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
+
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
+ *size = backtrace(stack, *size);
+ #elif OS(WINDOWS) && !OS(WINCE)
+ // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
new file mode 100644
index 0000000..0ca02a9
--- /dev/null
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <use>
+ <flag name="exceptions">Add support for exceptions - like catching them
+ inside the event loop (recommended by upstream)</flag>
+ <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
+ <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
+ <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
+ <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
+ <flag name="qml">Build QML/QtQuick bindings</flag>
+ <flag name="webp">Add support for WebP image format</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugreports.qt.io/</bugs-to>
+ <doc>http://doc.qt.io/</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild
new file mode 100644
index 0000000..e63a930
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+# TODO: qttestlib, geolocation, orientation/sensors
+
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/icu:=
+ >=dev-libs/leveldb-1.18-r1
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-qt/qtcore-${PV}:5[icu]
+ >=dev-qt/qtgui-${PV}:5
+ >=dev-qt/qtnetwork-${PV}:5
+ >=dev-qt/qtsql-${PV}:5
+ >=dev-qt/qtwidgets-${PV}:5
+ media-libs/fontconfig:1.0
+ media-libs/libpng:0=
+ >=sys-libs/zlib-1.2.5
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXrender
+ gstreamer? (
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gstreamer010? (
+ dev-libs/glib:2
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10
+ )
+ multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
+ opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ udev? ( virtual/udev )
+ webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/ruby
+ dev-util/gperf
+ sys-devel/bison
+ sys-devel/flex
+ virtual/rubygems
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+ "${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
+)
+
+src_prepare() {
+ # ensure bundled library cannot be used
+ rm -r Source/ThirdParty/leveldb || die
+
+ # bug 466216
+ sed -i -e '/CONFIG +=/s/rpath//' \
+ Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+ Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
+ || die
+
+ if use gstreamer010; then
+ epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+ elif ! use gstreamer; then
+ epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+ fi
+ use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \
+ Source/QtWebKit.pro || die
+ use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+
+ # bug 458222
+ sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+
+ qt5-build_src_prepare
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2017-04-03 1:31 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-04-03 1:31 UTC (permalink / raw
To: gentoo-commits
commit: c54fe9a289d547355b69b9309600eeb6bdbb2a3b
Author: Rasmus Thomsen <rasmus.thomsen <AT> live <DOT> de>
AuthorDate: Sun Apr 2 19:28:07 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Apr 2 19:28:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c54fe9a2
dev-qt/qtwebkit: fix disable-gstreamer patch
dev-qt/qtwebkit/Manifest | 2 +-
dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 488bab8..fe6d5bf 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,4 @@
-AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71
+AUX qtwebkit-5.2.1-disable-gstreamer.patch 770 SHA256 ece0e5c2bc46e5cb5174a6cc946838a9666a77edb4415a75226c064a90c1df5e SHA512 56a7f24dd7bbd48a5d8db2e205cdca0f635cc84b62bab2bf22cf9cf42f0503033e86b2ec96d0286ffa36ba59d1dca64701c0652b80387aa9e7bef155e49de15e WHIRLPOOL 5b4c1464ef056ce06082db48c396bb24d878d71ec8fa71c33f04e912157267d4a55482fd8c1749883bfea3879fbdd3d61e5fb0fbc0015b61b4d8f8383fc991c4
AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274
AUX qtwebkit-5.4.2-system-leveldb.patch 711 SHA256 791a952174e5b50b0fc2a0e7b12fd6829e88b3fb59b6d8ccefe469df272957e7 SHA512 d95d6e697d5e0b951465180d3f6bfa0ac16fc0f7a29504f773cf3bb28b1a7472f7bab83f379ea980851b6ed64a7d49cefcb27a503d37e5ce90110318628febcb WHIRLPOOL e979a7691faeeda737c916c183365619b875dd5fd872f1fcba16ff19549d0d6238c813cf01b0fa9cd649100422ed2de8987191d2343c062d46ee2276d7cd2407
AUX qtwebkit-5.5.0-fix-backtrace-detection-musl.patch 963 SHA256 191811606733d24b368bb25a4b0b737a504b1b78b5bb6ef88bb0450be1b6ff16 SHA512 5cfe5f73e9f9017a73034e45355a4e8772c43b6beface7e7964df54e396eb04e5ca2e39dd3e8e1e7ea2cc0893dc620d8cf65d72703e5fa94786957dbe2af3bd7 WHIRLPOOL 005fc53e8ed1e02bdd88ffa3189b28db063dc4695c3277f65f0a459b343a85a378b517e8328f6e9762e9c5b4868fb768531fe24943bed1d25949d6a0e8b01fb3
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
index 05e41a1..69550f2 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -1,5 +1,5 @@
---- Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000
-+++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000
+--- a/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000
++++ b/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000
@@ -99,12 +99,6 @@
# HTML5 Media Support for builds with GStreamer
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2017-09-05 19:11 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-09-05 19:11 UTC (permalink / raw
To: gentoo-commits
commit: a7cdab76081f690a81f972734683757a1a5b5458
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Sep 5 19:10:34 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Sep 5 19:10:34 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a7cdab76
dev-qt/qtwebkit: sync with upstream
dev-qt/qtwebkit/Manifest | 7 +-
dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 +++++++++++++++++++++++
dev-qt/qtwebkit/metadata.xml | 4 +-
dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild | 3 +-
dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 15 +++-
5 files changed, 114 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 26bc9ee..f4781f1 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -4,8 +4,9 @@ AUX qtwebkit-5.4.2-system-leveldb.patch 711 SHA256 791a952174e5b50b0fc2a0e7b12fd
AUX qtwebkit-5.5.0-fix-backtrace-detection-musl.patch 963 SHA256 191811606733d24b368bb25a4b0b737a504b1b78b5bb6ef88bb0450be1b6ff16 SHA512 5cfe5f73e9f9017a73034e45355a4e8772c43b6beface7e7964df54e396eb04e5ca2e39dd3e8e1e7ea2cc0893dc620d8cf65d72703e5fa94786957dbe2af3bd7 WHIRLPOOL 005fc53e8ed1e02bdd88ffa3189b28db063dc4695c3277f65f0a459b343a85a378b517e8328f6e9762e9c5b4868fb768531fe24943bed1d25949d6a0e8b01fb3
AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec
AUX qtwebkit-5.5.1-fix-stack-size-musl.patch 979 SHA256 bc19a89dc3fe8867b129f18f4ded4d582571989a9ea68ecee495e48468afdfe5 SHA512 f41eadec259da6bf14e709fa7e1f3ecef988a382a4952f641a7319253805a89dcabd273a23aa4523f2aa54e425ca84b76352ebd4d51b15a132ce74eef30e76ec WHIRLPOOL ae6fdda41dd661ceecf00bc7dd6c93c11115de5e3b91cb2167e4ac808a13db4056b2a4175e2fe1b36e07a5363f59a4cd917de4ce9c024f4e36bff125b944e038
+AUX qtwebkit-5.6.2-icu-59.patch 4683 SHA256 45af86da2d8b0621b213668808aee4136022c5a16b8baae11367d98acd5838b2 SHA512 189b523c8ee6ae8b62b93e8a46319a2a656280a6aca476fc2bc04d8066f497a9fd3f18029659558bedf985ba7c500eb2d541c4140158e2410cc01db29612f356 WHIRLPOOL 838c887a0af099c6a22e4516a2aa24428c5266f2d0eb99e68ccf21aa4c0ce625cac2cd1d763ec6fcf6843fd7409fb79092643c4e7b2aedad7d2313590c9e47ef
DIST qtwebkit-opensource-src-5.6.2.tar.xz 35306252 SHA256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 SHA512 d3f795463c957b4927d61280df831d08282bf6c9e624cf1db2709ab56ab218eb028192a4efaef21e0bdb28edd42de8ec08995f37fc828bde99000cf6919c33c3 WHIRLPOOL 9667f2f68bb832fdf3f5de14da641afd3b71a0c270e436257bc37ae86ed7d8d3434cdcada3b8818ab73ac6866bd4a69892ae682618d6d6a00cccccd287bda4bf
DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 SHA256 a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a WHIRLPOOL d2dce72777a6babb1c35025ff6d882b7f48895dca4425b9e29b099e45282e8538548a653f0757998d6a619d706544fad0363199d8979ccca94762ba39b6516bd
-EBUILD qtwebkit-5.6.2.ebuild 3331 SHA256 850f6d425db7f2544cbbb878b4dc7cab11b64207b4b0a706a036f3379e2dd1fc SHA512 f4c869ef19fbf63346d6a3e9c9894bce6285adcabfb40d125f3c060579123c3dfcf54ee36a5255ca9851cdc847bdbfcc3e253b7dd4ac4778b930b391d035a204 WHIRLPOOL ef6501a0e4792208207e7f15d6eed6afc7631deefb9b19af8b4300e550120b6c4616e3d2ac18bc8a9d7430c4451fbd5012da172c717e6e848af63ff20f6e51eb
-EBUILD qtwebkit-5.7.1.ebuild 3335 SHA256 8a7e340b36bb39f40e3934738983e8e6f70812b591ad72b71e9afa8553a9a433 SHA512 5728411789befd23eb385cc68cc8f0bdaeb77073a936890530e641d2d261f1c5526e8714a287cb487221b0a11ae227feee994acdb20deec9d0b23bcbfd37c415 WHIRLPOOL 0979a4da56902dfb48b349f71764e093e8f6146800973d051acceba73e03ae100d34ac863695d7d68bdbecd614020324cc6fdebc01a92468a7b61d110749816d
-MISC metadata.xml 1333 SHA256 8fefd129187060620948d41b0587b51f1e408bdecbd2a2ac04884753ea7f4e03 SHA512 1e62e92fb25869311204d842684e2cd56b888bd8ae3acb69304edd84b77c1a97eb9cfe0d572837a8ca960448f290306e23699d457b6f1a82a8cf9724b277aaff WHIRLPOOL 8d603d7bf6407edcb288ecbbd699d6f1240a24cb486657b091f97136a2ad428c749c79acd0c1160e6e76edf15eea882555d96b191499ae72c2d76a719020af0d
+EBUILD qtwebkit-5.6.2.ebuild 3377 SHA256 dc14e53d257db7b00419c05e401ae23c8a1aba786f592570e5e3835f9e0c0d78 SHA512 f48dffc5e8bd2ebc20306d13b055db0cdf1f4bf1c401ccbdc29ee285a1b5f6b2cc200c194ca582148914a7370aab0130fa6c84ac63f4cf3292bc04022871b6ad WHIRLPOOL b2262eaf8596f2ebc25c770e549fce793ba59378322a80a10f8eb42c0bfc77fa9a97fa83808527a0b8ca84e338c801f6c933e08c35d92b23d61bae3dc71c2c18
+EBUILD qtwebkit-5.7.1.ebuild 3659 SHA256 383b2b08d2d9be3af4bd46518a216ad25bb05a069ab725a834d74eeecd951933 SHA512 24e228f01ed0fd34c28fd63d6545e2848f84ea67cda2f4c3d8816f5d8456b3028f252e3f7e3e067b3594126d01e7e9e684a52fbf4d346b28f498ba90a74848d5 WHIRLPOOL 1d2083526b0f56d602e9f6d7743f26f2478eb589a302a37d5d4cfc2d8b21c59329068e34d19f55782d2fef22fd49cec01938ca5eaf7d06eb3b82dd1d9a1dae6d
+MISC metadata.xml 1466 SHA256 612a469c263c500dda7de545c7d505edf035ee1a6fa2307847e0fcb7731a5849 SHA512 6540b79626a2478da6ec737b025a17704233a7f8de93573d3cb06ba0223031a34f7f2eccbecc8e88f22b0a93173141d4b2f909e5ea9faef44b18ceefb1da79ed WHIRLPOOL 3f72a600410c7afd6923132853495059e476b9dcd096f294542f30aa829e269d6c7d9061c2796d977e740655ccd32ed5cac0ca66696613ed0ae26c78350c43b2
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
new file mode 100644
index 0000000..2a2709b
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
@@ -0,0 +1,92 @@
+From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Thu, 4 May 2017 15:12:37 +0300
+Subject: [PATCH] Fix compilation with ICU 59
+
+Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
+
+Task-number: QTBUG-60532
+Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++---
+ Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
+ Source/WTF/wtf/TypeTraits.h | 3 +++
+ Source/WebKit2/Shared/API/c/WKString.cpp | 2 +-
+ 4 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
+index 812f3d413..77a3fd0f4 100644
+--- a/Source/JavaScriptCore/API/JSStringRef.cpp
++++ b/Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+ initializeThreading();
+- return OpaqueJSString::create(chars, numChars).leakRef();
++ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
+ }
+
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
+ {
+ initializeThreading();
+- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
+ }
+
+ JSStringRef JSStringRetain(JSStringRef string)
+@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
+
+ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
+ {
+- return string->characters();
++ return reinterpret_cast<const JSChar*>(string->characters());
+ }
+
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
+index 0b57f012d..05e27338b 100644
+--- a/Source/JavaScriptCore/runtime/DateConversion.cpp
++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
+@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
+ #if OS(WINDOWS)
+ TIME_ZONE_INFORMATION timeZoneInformation;
+ GetTimeZoneInformation(&timeZoneInformation);
+- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
+ #else
+ struct tm gtm = t;
+ char timeZoneName[70];
+diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
+index 9df2c95cf..f5d6121fd 100644
+--- a/Source/WTF/wtf/TypeTraits.h
++++ b/Source/WTF/wtf/TypeTraits.h
+@@ -72,6 +72,9 @@ namespace WTF {
+ template<> struct IsInteger<unsigned long> { static const bool value = true; };
+ template<> struct IsInteger<long long> { static const bool value = true; };
+ template<> struct IsInteger<unsigned long long> { static const bool value = true; };
++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
++ template<> struct IsInteger<char16_t> { static const bool value = true; };
++#endif
+ #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
+ template<> struct IsInteger<wchar_t> { static const bool value = true; };
+ #endif
+diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
+index cbac67dd8..23400a64e 100644
+--- a/Source/WebKit2/Shared/API/c/WKString.cpp
++++ b/Source/WebKit2/Shared/API/c/WKString.cpp
+@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
+ size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
+ {
+ COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
+- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
++ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
+ }
+
+ size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
+--
+2.13.1
+
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 534bff9..cd82bd3 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -6,6 +6,8 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="exceptions">Add support for exceptions - like catching them
+ inside the event loop (recommended by upstream)</flag>
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
@@ -18,7 +20,7 @@
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://doc.qt.io/</doc>
+ <doc>https://doc.qt.io/</doc>
</upstream>
<slots>
<subslots>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
index fd6068f..97ecca8 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+ KEYWORDS="amd64 arm ppc64 x86"
fi
# TODO: qttestlib
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+ "${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
"${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
"${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
)
diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
index 7fa0dc6..202227e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 arm ~arm64 ppc64 x86"
fi
# TODO: qttestlib
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+ "${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
"${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
"${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
)
@@ -108,3 +109,13 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_install() {
+ qt5-build_src_install
+
+ # bug 572056
+ if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
+ eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
+ die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2019-01-05 0:44 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2019-01-05 0:44 UTC (permalink / raw
To: gentoo-commits
commit: 7bb577b2feb4b285cccf466447ffe6998ac431bf
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 00:44:27 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 00:44:27 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7bb577b2
dev-qt/qtwebkit: drop in favor of qtwebengine
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
dev-qt/qtwebkit/Manifest | 1 -
.../files/qtwebkit-5.4.2-system-leveldb.patch | 25 -----
...webkit-5.5.0-fix-backtrace-detection-musl.patch | 22 ----
.../files/qtwebkit-5.5.1-disable-jit.patch | 15 ---
.../files/qtwebkit-5.5.1-fix-stack-size-musl.patch | 14 ---
.../files/qtwebkit-5.8.0-disable-gstreamer.patch | 15 ---
dev-qt/qtwebkit/metadata.xml | 28 -----
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 122 ---------------------
8 files changed, 242 deletions(-)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
deleted file mode 100644
index 97b9f0e..0000000
--- a/dev-qt/qtwebkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
deleted file mode 100644
index 265d507..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Correct header location so system dev-libs/leveldb can be detected.
-
---- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
-@@ -19,7 +19,7 @@
-
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
-
- int main(int, char**)
- {
-
---- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-@@ -38,7 +38,7 @@
- #include <leveldb/comparator.h>
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- #include <leveldb/slice.h>
- #include <string>
- #include <wtf/PassOwnPtr.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch
deleted file mode 100644
index 73e085f..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/meta-qt5/meta-qt5/blob/master/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
-
---- a/Source/WTF/wtf/Assertions.cpp
-+++ b/Source/WTF/wtf/Assertions.cpp
-@@ -61,7 +61,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
deleted file mode 100644
index 40e58f0..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow disabling JIT for hardened.
-
-Author: Magnus Granberg <zorry@gentoo.org>
-Gentoo-bug: 562396
-
---- a/Tools/qmake/mkspecs/features/features.pri
-+++ b/Tools/qmake/mkspecs/features/features.pri
-@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
- ENABLE_INPUT_TYPE_WEEK=0 \
- ENABLE_INSPECTOR=1 \
- ENABLE_INSPECTOR_SERVER=1 \
-+ ENABLE_JIT=0 \
- ENABLE_JAVASCRIPT_DEBUGGER=1 \
- ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
- ENABLE_LEGACY_NOTIFICATIONS=1 \
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch
deleted file mode 100644
index 68f8f6b..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur qtwebkit-opensource-src-5.5.1.orig/Source/JavaScriptCore/runtime/VMStackBounds.h qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/runtime/VMStackBounds.h
---- qtwebkit-opensource-src-5.5.1.orig/Source/JavaScriptCore/runtime/VMStackBounds.h 2016-02-27 04:22:08.000000000 -0800
-+++ qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/runtime/VMStackBounds.h 2016-04-10 19:30:47.907626687 -0700
-@@ -53,8 +53,8 @@
- //
- // These sizes were derived from the stack usage of a number of sites when
- // layout occurs when we've already consumed most of the C stack.
-- const size_t requiredStack = 128 * KB;
-- const size_t errorModeRequiredStack = 64 * KB;
-+ const size_t requiredStack = 32 * KB;
-+ const size_t errorModeRequiredStack = 16 * KB;
-
- size_t requiredCapacity = interpreter->isInErrorHandlingMode() ? errorModeRequiredStack : requiredStack;
- RELEASE_ASSERT(m_bounds.size() >= requiredCapacity);
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
deleted file mode 100644
index 867e8dc..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -101,12 +101,6 @@ defineTest(detectFeatures) {
-
- # HTML5 Media Support for builds with GStreamer
- unix:!mac:qtConfig(pkg-config) {
-- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
-- WEBKIT_CONFIG += video use_gstreamer
-- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
-- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
-- }
-- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
- }
-
- !enable?(video):qtHaveModule(multimediawidgets) {
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
deleted file mode 100644
index 645be81..0000000
--- a/dev-qt/qtwebkit/metadata.xml
+++ /dev/null
@@ -1,28 +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="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
- <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
- <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
- <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
- <flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
- <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
- <flag name="qml">Build QML/QtQuick bindings</flag>
- <flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag>
- <flag name="webp">Add support for WebP image format</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/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
deleted file mode 100644
index 1dbdced..0000000
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1:5"
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp"
-REQUIRED_USE="?? ( gstreamer multimedia )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/icu:=
- >=dev-libs/leveldb-1.18-r1
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=dev-qt/qtcore-${QT_MIN_VER}[icu]
- >=dev-qt/qtgui-${QT_MIN_VER}
- >=dev-qt/qtnetwork-${QT_MIN_VER}
- >=dev-qt/qtsql-${QT_MIN_VER}
- >=dev-qt/qtwidgets-${QT_MIN_VER}
- media-libs/fontconfig:1.0
- media-libs/libpng:0=
- >=sys-libs/zlib-1.2.5
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXrender
- geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
- opengl? (
- >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
- >=dev-qt/qtopengl-${QT_MIN_VER}
- )
- orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
- printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
- webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/ruby
- dev-util/gperf
- sys-devel/bison
- sys-devel/flex
- virtual/rubygems
- test? ( >=dev-qt/qttest-${QT_MIN_VER} )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
- "${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
- "${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
-)
-
-src_prepare() {
- # ensure bundled library cannot be used
- rm -r Source/ThirdParty/leveldb || die
-
- # force using system library
- sed -i -e 's/qtConfig(system-jpeg)/true/' \
- -e 's/qtConfig(system-png)/true/' \
- Tools/qmake/mkspecs/features/features.prf || die
-
- # bug 466216
- sed -i -e '/CONFIG +=/s/rpath//' \
- Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
- Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
- || die
-
- qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf
-
- qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
- qt_use_disable_mod webchannel webchannel \
- Source/WebKit2/Target.pri \
- Source/WebKit2/WebKit2.pri
-
- if ! use gstreamer; then
- PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
- fi
-
- # bug 562396
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
- use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
- Tools/qmake/mkspecs/features/features.prf || die
-
- # bug 458222
- sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
- qt5-build_src_prepare
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 572056
- if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
- eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
- die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-05 0:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-05 19:11 [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2019-01-05 0:44 Anthony G. Basile
2017-04-03 1:31 Aric Belsito
2015-10-01 1:28 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox