[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2020-11-06 Thread Andreas Sturmlechner 
commit: 335f29d266c5b169ff1e781f9851a3a203f3198c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  6 08:22:15 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  6 08:48:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335f29d2

dev-qt/qtwebkit: Fix build with ICU-68

Thanks-to: Lars Wendler  gentoo.org>
Closes: https://bugs.gentoo.org/753260
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebkit-5.212.0_pre20200309-icu-68.patch  | 120 +
 .../qtwebkit-5.212.0_pre20200309-r1.ebuild |   5 +-
 2 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
new file mode 100644
index 000..7de72ea61af
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
@@ -0,0 +1,120 @@
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h
 b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@
+ // Ensure chunk offset is well formed if computed offset exceeds 
int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() 
? static_cast(offset) : 0;
+-isAccessible = TRUE;
++isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == 
nativeLength) {
+ text->chunkOffset = text->chunkLength;
+-isAccessible = FALSE;
++isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -94,12 +94,12 @@
+ // Ensure chunk offset is well formed if computed offset exceeds 
int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() 
? static_cast(offset) : 0;
+-isAccessible = TRUE;
++isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+-isAccessible = FALSE;
++isAccessible = false;
+ return true;
+ }
+ }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
 b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@
+ if (index < uText->chunkNativeLimit && index >= 
uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - 
uText->chunkNativeStart);
+-return TRUE;
++return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast(index - 
uText->chunkNativeStart);
+-return FALSE;
++return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > 
uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - 
uText->chunkNativeStart);
+-return TRUE;
++return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+-return FALSE;
++return false;
+ }
+ }
+ 
+@@ -144,7 +144,7 @@
+ 
+ uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-return TRUE;
++return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, 
UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, 
UBool forward)
+ {
+ if (!text->context)
+-return FALSE;
++return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, 
forward, isAccessible))
+@@ -356,7 +356,7 @@
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, 
nativeLength, forward);
+ }
+-return TRUE;
++return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, 
UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
 b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, 
UBool forward)
+ {
+ if (!text->context)
+-return FALSE;
++return false;
+ int64_t

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2019-10-23 Thread Andreas Sturmlechner 
commit: e8bfdb22e96271b014eef1e73f9cef49bc76c4ad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 22 19:46:14 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 23 23:32:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bfdb22

dev-qt/qtwebkit: Fix build against ICU-65

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebkit-5.212.0_pre20190629-icu-65.patch  | 55 ++
 .../qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild   |  2 +
 2 files changed, 57 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
new file mode 100644
index 000..1891f73d5a4
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
@@ -0,0 +1,55 @@
+From dc02ec4080010e33b737db6491d71d6bb961a77d Mon Sep 17 00:00:00 2001
+From: "commit-qu...@webkit.org"
+ 
+Date: Fri, 4 Oct 2019 21:51:37 +
+Subject: [PATCH] Fix build with icu 65.1
+ https://bugs.webkit.org/show_bug.cgi?id=202600
+
+Patch by Heiko Becker  on 2019-10-04
+Reviewed by Konstantin Tokarev.
+
+Source/WebCore:
+
+* dom/Document.cpp:
+(WebCore::isValidNameNonASCII):
+(WebCore::Document::parseQualifiedName):
+
+Source/WTF:
+
+* wtf/URLHelpers.cpp:
+(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
+
+Change-Id: I1b087322cbae43fbe155facdf933717ac8569b6c
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 
268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebCore/dom/Document.cpp |  6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 1bca2d0a66f8..19355f166019 100644
+--- a/Source/WebCore/dom/Document.cpp
 b/Source/WebCore/dom/Document.cpp
+@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* 
characters, unsigned length)
+ unsigned i = 0;
+ 
+ UChar32 c;
+-U16_NEXT(characters, i, length, c)
++U16_NEXT(characters, i, length, c);
+ if (!isValidNameStart(c))
+ return false;
+ 
+ while (i < length) {
+-U16_NEXT(characters, i, length, c)
++U16_NEXT(characters, i, length, c);
+ if (!isValidNamePart(c))
+ return false;
+ }
+@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& 
qualifiedName, String& prefix, S
+ 
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+-U16_NEXT(qualifiedName, i, length, c)
++U16_NEXT(qualifiedName, i, length, c);
+ if (c == ':') {
+ if (sawColon) {
+ ec = NAMESPACE_ERR;

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
index 025efa83545..bcf7027ae69 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
@@ -77,6 +77,8 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
+PATCHES=( "${FILESDIR}/${P}-icu-65.patch" )
+
 _check_reqs() {
if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq 
"-g*0"; then
einfo "Checking for sufficient disk space to build ${PN} with 
debugging flags"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2018-11-15 Thread Andreas Sturmlechner 
commit: f85385e4bf45d1e5af44a1b494c914a9f2020887
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 14 23:56:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 15 23:12:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85385e4

dev-qt/qtwebkit: Fix pkgconfig

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...0180120-cmake-fix-pkgconfig_deps-spelling.patch | 97 ++
 ...twebkit-5.212.0_pre20180120-fix-pkgconfig.patch | 29 +++
 .../qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild   |  6 +-
 3 files changed, 131 insertions(+), 1 deletion(-)

diff --git 
a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
new file mode 100644
index 000..a460cec609b
--- /dev/null
+++ 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
@@ -0,0 +1,97 @@
+From 326604b27878566d581ea8c1991abd280453a75b Mon Sep 17 00:00:00 2001
+From: Andrew Webster 
+Date: Tue, 20 Mar 2018 09:08:00 -0400
+Subject: [PATCH] [cmake] Make spelling for PKGCONFIG_DEPS consistent
+
+It was referenced as PKGCONGIG_DEPS and PKGCONFIG_DEPS which left
+Qt5WebKitWidgets with empty dependencies.  Correcting to
+PKGCONFIG_DEPS gives it the proper dependencies.
+
+Qt5WebKit was already working, but the spelling has also been
+corrected to avoid confusion.
+---
+ Source/WebKit/PlatformQt.cmake | 14 +++---
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
+index 28976b611cd8..de3eabab1157 100644
+--- a/Source/WebKit/PlatformQt.cmake
 b/Source/WebKit/PlatformQt.cmake
+@@ -427,7 +427,7 @@ install(
+ COMPONENT Data
+ )
+ 
+-set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network")
++set(WEBKIT_PKGCONFIG_DEPS "Qt5Core Qt5Gui Qt5Network")
+ set(WEBKIT_PRI_DEPS "core gui network")
+ set(WEBKIT_PRI_EXTRA_LIBS "")
+ set(WEBKIT_PRI_RUNTIME_DEPS "core_private gui_private")
+@@ -448,11 +448,11 @@ if (USE_MEDIA_FOUNDATION)
+ set(WEBKIT_PRI_EXTRA_LIBS "-lmfuuid -lstrmiids ${WEBKIT_PRI_EXTRA_LIBS}")
+ endif ()
+ if (USE_QT_MULTIMEDIA)
+-set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Multimedia")
++set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Multimedia")
+ set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}")
+ endif ()
+ 
+-set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets 
Qt5WebKit")
++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets 
Qt5WebKit")
+ set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit")
+ set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} 
widgets_private")
+ 
+@@ -465,12 +465,12 @@ if (ENABLE_PRINT_SUPPORT)
+ endif ()
+ 
+ if (USE_QT_MULTIMEDIA)
+-set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} 
Qt5MultimediaWidgets")
++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} 
Qt5MultimediaWidgets")
+ set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} 
multimediawidgets")
+ endif ()
+ 
+ if (QT_STATIC_BUILD)
+-set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} 
Qt5PrintSupport")
++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} 
Qt5PrintSupport")
+ set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport")
+ set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF)
+ append_lib_names_to_list(EXTRA_LIBS_NAMES ${LIBXML2_LIBRARIES} 
${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+@@ -494,7 +494,7 @@ if (QT_STATIC_BUILD)
+ endif ()
+ list(REMOVE_DUPLICATES EXTRA_LIBS_NAMES)
+ foreach (LIB_NAME ${EXTRA_LIBS_NAMES})
+-set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} 
${LIB_PREFIX}${LIB_NAME}")
++set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} 
${LIB_PREFIX}${LIB_NAME}")
+ set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} 
-l${LIB_PREFIX}${LIB_NAME}")
+ endforeach ()
+ endif ()
+@@ -504,7 +504,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+ BASE_NAME Qt5WebKit
+ DESCRIPTION "Qt WebKit module"
+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
+-DEPS "${WEBKIT_PKGCONGIG_DEPS}"
++DEPS "${WEBKIT_PKGCONFIG_DEPS}"
+ FILENAME_VAR WebKit_PKGCONFIG_FILENAME
+ )
+ set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH 
"The directory where pkgconfig will be installed to.")
+From 8c76aabf062232c3fb26839b76716006eca44eec Mon Sep 17 00:00:00 2001
+From: Andrew Webster 
+Date: Tue, 20 Mar 2018 10:33:59 -0400
+Subject: [PATCH] [cmake] Another PKGCONFIG_DEPS correction
+
+---
+ Source/WebKit/PlatformQt.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2018-09-24 Thread Andreas Sturmlechner 
commit: 3fe93d9026dccc5e37dda80ac2dd088bf06d9b52
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep 24 16:49:31 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep 24 17:09:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe93d90

dev-qt/qtwebkit: Security cleanup

Bug: https://bugs.gentoo.org/665240
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-qt/qtwebkit/Manifest   |   1 -
 .../files/qtwebkit-5.4.2-system-leveldb.patch  |  25 -
 .../files/qtwebkit-5.5.1-disable-jit.patch |  15 ---
 .../files/qtwebkit-5.8.0-disable-gstreamer.patch   |  15 ---
 dev-qt/qtwebkit/metadata.xml   |   1 -
 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild  | 120 -
 6 files changed, 177 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 36eb87329b0..2edec829aec 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,2 +1 @@
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B 
a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0
 SHA512 
582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-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 265d5075f2f..000
--- 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 
- #include 
--#include 
-+#include 
- 
- int main(int, char**)
- {
-
 a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-@@ -38,7 +38,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
- #include 
- #include 
- #include 

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 40e58f0d0de..000
--- 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 
-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.8.0-disable-gstreamer.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
deleted file mode 100644
index 867e8dcb8ef..000
--- 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
index c7df499ff74..f76a3bfaff3 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -14,7 +14,6 @@
Enable device orientation detection 
via dev-qt/qtsensors
Enable printing via 
dev-qt/qtprintsupport
Build QML/QtQuick bindings
-   Enable integration with 
dev-qt/qtwebchannel
Add support for WebP image format



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 61024cda2c3..000
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2017-06-17 Thread Davide Pesavento 
commit: c7a13c359ac5a60881c2f45e4a2e544f8a477841
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 18 02:09:41 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jun 18 02:09:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a13c35

dev-qt/qtwebkit: fix build with ICU 59

Gentoo-Bug: 618644
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 +++
 dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild |  1 +
 dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild |  3 +-
 3 files changed, 95 insertions(+), 1 deletion(-)

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 000..2a2709b34ce
--- /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 
+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 
+---
+ 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(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(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(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();
+-const WCHAR* timeZoneName = t.isDST() ? 
timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++const WCHAR* winTimeZoneName = t.isDST() ? 
timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++String timeZoneName(reinterpret_cast(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  { static const bool value 
= true; };
+ template<> struct IsInteger  { static const bool value 
= true; };
+ template<> struct IsInteger { 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   { static const bool value 
= true; };
++#endif
+ #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
+ template<> struct IsInteger{ 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

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2016-01-19 Thread Michael Palimaka 
commit: 6ff0b5928e44e814e2d34bbc98b20cfae02784d9
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Jan 20 00:20:42 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 20 07:12:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff0b592

dev-qt/qtwebkit: Fix build with GCC-5, bug 570042

Patch taken from upstream, see also:
https://bugreports.qt.io/browse/QTBUG-44829
https://codereview.qt-project.org/#/c/107921/

Package-Manager: portage-2.2.27

 .../qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch | 35 ++
 dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch 
b/dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch
new file mode 100644
index 000..3a6b2a3
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch
@@ -0,0 +1,35 @@
+From: Allan Sandfeld Jensen 
+Date: Fri, 6 Mar 2015 10:20:13 + (+0100)
+Subject: Fix g++ 5.0 build
+X-Git-Tag: v5.4.2~12
+X-Git-Url: 
https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=650c6ee8e76bb574d3a1bea09e2494992d8f070e;hp=f9966f351678351ee6b971d7b6b25a4987407e46
+
+Fix g++ 5.0 build
+
+A non-inline template needs to be explicitly instantiated if used
+outside the object where it is declared.
+
+Patch suggested by Khem Raj.
+
+Task-number: QTBUG-44829
+Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792
+Reviewed-by: Andras Becsi 
+---
+
+diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp 
b/Source/JavaScriptCore/runtime/JSObject.cpp
+index 5637e20..bd55919 100644
+--- a/Source/JavaScriptCore/runtime/JSObject.cpp
 b/Source/JavaScriptCore/runtime/JSObject.cpp
+@@ -1909,6 +1909,11 @@ void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
+ }
+ }
+ 
++// Used in JSArray.cpp so we must instantiate explicit
++template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* 
exec, unsigned i, JSValue value);
++template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* 
exec, unsigned i, JSValue value);
++template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState*
 exec, unsigned i, JSValue value);
++
+ void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, 
unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
+ {
+ VM& vm = exec->vm();
+

diff --git a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
index ab983ae..be52f6d 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -58,6 +58,7 @@ S=${WORKDIR}
 
 PATCHES=(
"${FILESDIR}/${PV}-use-correct-icu-typedef.patch"
+   "${FILESDIR}/${P}-fix-gcc-5.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2016-01-14 Thread Michael Palimaka 
commit: 09ef50e18b133b1fa59ef57a384933d7dde4e69c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 15 07:08:44 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 15 07:08:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ef50e1

dev-qt/qtwebkit: introduce jit USE flag

Also prevent mixing of Qt versions.

Gentoo-bug: 562396

Package-Manager: portage-2.2.26

 .../files/qtwebkit-5.5.1-disable-jit.patch |  15 +++
 dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild   | 106 +
 2 files changed, 121 insertions(+)

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
new file mode 100644
index 000..40e58f0
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
@@ -0,0 +1,15 @@
+Allow disabling JIT for hardened.
+
+Author: Magnus Granberg 
+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/qtwebkit-5.5.1-r1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
new file mode 100644
index 000..7153b72
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 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
+
+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"
+)
+
+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/WebKit2.pri
+
+   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 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 +=