| 1 |
commit: 7bb577b2feb4b285cccf466447ffe6998ac431bf |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 5 00:44:27 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 5 00:44:27 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7bb577b2 |
| 7 |
|
| 8 |
dev-qt/qtwebkit: drop in favor of qtwebengine |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-qt/qtwebkit/Manifest | 1 - |
| 13 |
.../files/qtwebkit-5.4.2-system-leveldb.patch | 25 ----- |
| 14 |
...webkit-5.5.0-fix-backtrace-detection-musl.patch | 22 ---- |
| 15 |
.../files/qtwebkit-5.5.1-disable-jit.patch | 15 --- |
| 16 |
.../files/qtwebkit-5.5.1-fix-stack-size-musl.patch | 14 --- |
| 17 |
.../files/qtwebkit-5.8.0-disable-gstreamer.patch | 15 --- |
| 18 |
dev-qt/qtwebkit/metadata.xml | 28 ----- |
| 19 |
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 122 --------------------- |
| 20 |
8 files changed, 242 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest |
| 23 |
deleted file mode 100644 |
| 24 |
index 97b9f0e..0000000 |
| 25 |
--- a/dev-qt/qtwebkit/Manifest |
| 26 |
+++ /dev/null |
| 27 |
@@ -1 +0,0 @@ |
| 28 |
-DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5 |
| 29 |
|
| 30 |
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 |
| 31 |
deleted file mode 100644 |
| 32 |
index 265d507..0000000 |
| 33 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,25 +0,0 @@ |
| 36 |
-Correct header location so system dev-libs/leveldb can be detected. |
| 37 |
- |
| 38 |
---- a/Tools/qmake/config.tests/leveldb/leveldb.cpp |
| 39 |
-+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp |
| 40 |
-@@ -19,7 +19,7 @@ |
| 41 |
- |
| 42 |
- #include <leveldb/db.h> |
| 43 |
- #include <leveldb/env.h> |
| 44 |
--#include <helpers/memenv/memenv.h> |
| 45 |
-+#include <leveldb/helpers/memenv.h> |
| 46 |
- |
| 47 |
- int main(int, char**) |
| 48 |
- { |
| 49 |
- |
| 50 |
---- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp |
| 51 |
-+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp |
| 52 |
-@@ -38,7 +38,7 @@ |
| 53 |
- #include <leveldb/comparator.h> |
| 54 |
- #include <leveldb/db.h> |
| 55 |
- #include <leveldb/env.h> |
| 56 |
--#include <helpers/memenv/memenv.h> |
| 57 |
-+#include <leveldb/helpers/memenv.h> |
| 58 |
- #include <leveldb/slice.h> |
| 59 |
- #include <string> |
| 60 |
- #include <wtf/PassOwnPtr.h> |
| 61 |
|
| 62 |
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 |
| 63 |
deleted file mode 100644 |
| 64 |
index 73e085f..0000000 |
| 65 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,22 +0,0 @@ |
| 68 |
-https://github.com/meta-qt5/meta-qt5/blob/master/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch |
| 69 |
- |
| 70 |
---- a/Source/WTF/wtf/Assertions.cpp |
| 71 |
-+++ b/Source/WTF/wtf/Assertions.cpp |
| 72 |
-@@ -61,7 +61,7 @@ |
| 73 |
- #include <windows.h> |
| 74 |
- #endif |
| 75 |
- |
| 76 |
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| 77 |
-+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| 78 |
- #include <cxxabi.h> |
| 79 |
- #include <dlfcn.h> |
| 80 |
- #include <execinfo.h> |
| 81 |
-@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f |
| 82 |
- |
| 83 |
- void WTFGetBacktrace(void** stack, int* size) |
| 84 |
- { |
| 85 |
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| 86 |
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| 87 |
- *size = backtrace(stack, *size); |
| 88 |
- #elif OS(WINDOWS) && !OS(WINCE) |
| 89 |
- // The CaptureStackBackTrace function is available in XP, but it is not defined |
| 90 |
|
| 91 |
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 |
| 92 |
deleted file mode 100644 |
| 93 |
index 40e58f0..0000000 |
| 94 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch |
| 95 |
+++ /dev/null |
| 96 |
@@ -1,15 +0,0 @@ |
| 97 |
-Allow disabling JIT for hardened. |
| 98 |
- |
| 99 |
-Author: Magnus Granberg <zorry@g.o> |
| 100 |
-Gentoo-bug: 562396 |
| 101 |
- |
| 102 |
---- a/Tools/qmake/mkspecs/features/features.pri |
| 103 |
-+++ b/Tools/qmake/mkspecs/features/features.pri |
| 104 |
-@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \ |
| 105 |
- ENABLE_INPUT_TYPE_WEEK=0 \ |
| 106 |
- ENABLE_INSPECTOR=1 \ |
| 107 |
- ENABLE_INSPECTOR_SERVER=1 \ |
| 108 |
-+ ENABLE_JIT=0 \ |
| 109 |
- ENABLE_JAVASCRIPT_DEBUGGER=1 \ |
| 110 |
- ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \ |
| 111 |
- ENABLE_LEGACY_NOTIFICATIONS=1 \ |
| 112 |
|
| 113 |
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 |
| 114 |
deleted file mode 100644 |
| 115 |
index 68f8f6b..0000000 |
| 116 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-fix-stack-size-musl.patch |
| 117 |
+++ /dev/null |
| 118 |
@@ -1,14 +0,0 @@ |
| 119 |
-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 |
| 120 |
---- qtwebkit-opensource-src-5.5.1.orig/Source/JavaScriptCore/runtime/VMStackBounds.h 2016-02-27 04:22:08.000000000 -0800 |
| 121 |
-+++ qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/runtime/VMStackBounds.h 2016-04-10 19:30:47.907626687 -0700 |
| 122 |
-@@ -53,8 +53,8 @@ |
| 123 |
- // |
| 124 |
- // These sizes were derived from the stack usage of a number of sites when |
| 125 |
- // layout occurs when we've already consumed most of the C stack. |
| 126 |
-- const size_t requiredStack = 128 * KB; |
| 127 |
-- const size_t errorModeRequiredStack = 64 * KB; |
| 128 |
-+ const size_t requiredStack = 32 * KB; |
| 129 |
-+ const size_t errorModeRequiredStack = 16 * KB; |
| 130 |
- |
| 131 |
- size_t requiredCapacity = interpreter->isInErrorHandlingMode() ? errorModeRequiredStack : requiredStack; |
| 132 |
- RELEASE_ASSERT(m_bounds.size() >= requiredCapacity); |
| 133 |
|
| 134 |
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 |
| 135 |
deleted file mode 100644 |
| 136 |
index 867e8dc..0000000 |
| 137 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch |
| 138 |
+++ /dev/null |
| 139 |
@@ -1,15 +0,0 @@ |
| 140 |
---- a/Tools/qmake/mkspecs/features/features.prf |
| 141 |
-+++ b/Tools/qmake/mkspecs/features/features.prf |
| 142 |
-@@ -101,12 +101,6 @@ defineTest(detectFeatures) { |
| 143 |
- |
| 144 |
- # HTML5 Media Support for builds with GStreamer |
| 145 |
- unix:!mac:qtConfig(pkg-config) { |
| 146 |
-- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { |
| 147 |
-- WEBKIT_CONFIG += video use_gstreamer |
| 148 |
-- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { |
| 149 |
-- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 |
| 150 |
-- } |
| 151 |
-- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video |
| 152 |
- } |
| 153 |
- |
| 154 |
- !enable?(video):qtHaveModule(multimediawidgets) { |
| 155 |
|
| 156 |
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml |
| 157 |
deleted file mode 100644 |
| 158 |
index 645be81..0000000 |
| 159 |
--- a/dev-qt/qtwebkit/metadata.xml |
| 160 |
+++ /dev/null |
| 161 |
@@ -1,28 +0,0 @@ |
| 162 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 163 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 164 |
-<pkgmetadata> |
| 165 |
- <maintainer type="project"> |
| 166 |
- <email>qt@g.o</email> |
| 167 |
- <name>Gentoo Qt Project</name> |
| 168 |
- </maintainer> |
| 169 |
- <use> |
| 170 |
- <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag> |
| 171 |
- <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> |
| 172 |
- <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag> |
| 173 |
- <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag> |
| 174 |
- <flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag> |
| 175 |
- <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag> |
| 176 |
- <flag name="qml">Build QML/QtQuick bindings</flag> |
| 177 |
- <flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag> |
| 178 |
- <flag name="webp">Add support for WebP image format</flag> |
| 179 |
- </use> |
| 180 |
- <upstream> |
| 181 |
- <bugs-to>https://bugreports.qt.io/</bugs-to> |
| 182 |
- <doc>https://doc.qt.io/</doc> |
| 183 |
- </upstream> |
| 184 |
- <slots> |
| 185 |
- <subslots> |
| 186 |
- Must only be used by packages that are known to use private parts of the Qt API. |
| 187 |
- </subslots> |
| 188 |
- </slots> |
| 189 |
-</pkgmetadata> |
| 190 |
|
| 191 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild |
| 192 |
deleted file mode 100644 |
| 193 |
index 1dbdced..0000000 |
| 194 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild |
| 195 |
+++ /dev/null |
| 196 |
@@ -1,122 +0,0 @@ |
| 197 |
-# Copyright 1999-2018 Gentoo Foundation |
| 198 |
-# Distributed under the terms of the GNU General Public License v2 |
| 199 |
- |
| 200 |
-EAPI=6 |
| 201 |
-PYTHON_COMPAT=( python2_7 ) |
| 202 |
-QT_MIN_VER="5.9.1:5" |
| 203 |
-inherit python-any-r1 qt5-build |
| 204 |
- |
| 205 |
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" |
| 206 |
- |
| 207 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 208 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
| 209 |
-fi |
| 210 |
- |
| 211 |
-# TODO: qttestlib |
| 212 |
- |
| 213 |
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp" |
| 214 |
-REQUIRED_USE="?? ( gstreamer multimedia )" |
| 215 |
- |
| 216 |
-RDEPEND=" |
| 217 |
- dev-db/sqlite:3 |
| 218 |
- dev-libs/icu:= |
| 219 |
- >=dev-libs/leveldb-1.18-r1 |
| 220 |
- dev-libs/libxml2:2 |
| 221 |
- dev-libs/libxslt |
| 222 |
- >=dev-qt/qtcore-${QT_MIN_VER}[icu] |
| 223 |
- >=dev-qt/qtgui-${QT_MIN_VER} |
| 224 |
- >=dev-qt/qtnetwork-${QT_MIN_VER} |
| 225 |
- >=dev-qt/qtsql-${QT_MIN_VER} |
| 226 |
- >=dev-qt/qtwidgets-${QT_MIN_VER} |
| 227 |
- media-libs/fontconfig:1.0 |
| 228 |
- media-libs/libpng:0= |
| 229 |
- >=sys-libs/zlib-1.2.5 |
| 230 |
- virtual/jpeg:0 |
| 231 |
- virtual/opengl |
| 232 |
- x11-libs/libX11 |
| 233 |
- x11-libs/libXcomposite |
| 234 |
- x11-libs/libXrender |
| 235 |
- geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} ) |
| 236 |
- gstreamer? ( |
| 237 |
- dev-libs/glib:2 |
| 238 |
- media-libs/gstreamer:1.0 |
| 239 |
- media-libs/gst-plugins-base:1.0 |
| 240 |
- ) |
| 241 |
- multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) |
| 242 |
- opengl? ( |
| 243 |
- >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] |
| 244 |
- >=dev-qt/qtopengl-${QT_MIN_VER} |
| 245 |
- ) |
| 246 |
- orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) |
| 247 |
- printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) |
| 248 |
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} ) |
| 249 |
- webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} ) |
| 250 |
- webp? ( media-libs/libwebp:0= ) |
| 251 |
-" |
| 252 |
-DEPEND="${RDEPEND} |
| 253 |
- ${PYTHON_DEPS} |
| 254 |
- dev-lang/ruby |
| 255 |
- dev-util/gperf |
| 256 |
- sys-devel/bison |
| 257 |
- sys-devel/flex |
| 258 |
- virtual/rubygems |
| 259 |
- test? ( >=dev-qt/qttest-${QT_MIN_VER} ) |
| 260 |
-" |
| 261 |
- |
| 262 |
-PATCHES=( |
| 263 |
- "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" |
| 264 |
- "${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch" |
| 265 |
- "${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch" |
| 266 |
-) |
| 267 |
- |
| 268 |
-src_prepare() { |
| 269 |
- # ensure bundled library cannot be used |
| 270 |
- rm -r Source/ThirdParty/leveldb || die |
| 271 |
- |
| 272 |
- # force using system library |
| 273 |
- sed -i -e 's/qtConfig(system-jpeg)/true/' \ |
| 274 |
- -e 's/qtConfig(system-png)/true/' \ |
| 275 |
- Tools/qmake/mkspecs/features/features.prf || die |
| 276 |
- |
| 277 |
- # bug 466216 |
| 278 |
- sed -i -e '/CONFIG +=/s/rpath//' \ |
| 279 |
- Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ |
| 280 |
- Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ |
| 281 |
- || die |
| 282 |
- |
| 283 |
- qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf |
| 284 |
- |
| 285 |
- qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf |
| 286 |
- qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf |
| 287 |
- qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf |
| 288 |
- qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf |
| 289 |
- qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf |
| 290 |
- qt_use_disable_mod webchannel webchannel \ |
| 291 |
- Source/WebKit2/Target.pri \ |
| 292 |
- Source/WebKit2/WebKit2.pri |
| 293 |
- |
| 294 |
- if ! use gstreamer; then |
| 295 |
- PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") |
| 296 |
- fi |
| 297 |
- |
| 298 |
- # bug 562396 |
| 299 |
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") |
| 300 |
- |
| 301 |
- use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 302 |
- Tools/qmake/mkspecs/features/features.prf || die |
| 303 |
- |
| 304 |
- # bug 458222 |
| 305 |
- sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die |
| 306 |
- |
| 307 |
- qt5-build_src_prepare |
| 308 |
-} |
| 309 |
- |
| 310 |
-src_install() { |
| 311 |
- qt5-build_src_install |
| 312 |
- |
| 313 |
- # bug 572056 |
| 314 |
- if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then |
| 315 |
- eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." |
| 316 |
- die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' |
| 317 |
- fi |
| 318 |
-} |
Archives