commit: fec12cb88c3d9f7124b6698fc13a6bb54e046fc0
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon May 14 16:24:30 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon May 14 16:24:30 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fec12cb8
dev-qt/qtwebkit: remove 5.7.1
dev-qt/qtwebkit/Manifest | 1 -
.../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 ---
.../files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 ---
dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 ----------------
dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 121 ---------------------
dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 4 +-
6 files changed, 2 insertions(+), 249 deletions(-)
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 373025e..97b9f0e 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,2 +1 @@
-DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B
74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581
SHA512
538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B
eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2
SHA512
79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
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
deleted file mode 100644
index 69550f2..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
- 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
deleted file mode 100644
index 1c02e45..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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.6.2-icu-59.patch
b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
deleted file mode 100644
index 2a2709b..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annu...@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.jen...@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/qtwebkit-5.7.1.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
deleted file mode 100644
index 94d0aba..0000000
--- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
-
-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 x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation
printsupport qml webchannel 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}[icu]
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
- 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-${PV} )
- 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}[widgets] )
- opengl? ( ~dev-qt/qtopengl-${PV} )
- orientation? ( ~dev-qt/qtsensors-${PV} )
- printsupport? ( ~dev-qt/qtprintsupport-${PV} )
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- webchannel? ( ~dev-qt/qtwebchannel-${PV} )
- 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.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"
-)
-
-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
-
- 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 gstreamer010; then
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
- elif ! use gstreamer; then
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
- fi
-
- # bug 562396
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
- use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG +=
use_3d_graphics/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
-}
-
-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
-}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index f9b7434..65ab114 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,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 ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
# TODO: qttestlib
