diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2018-01-06 14:40:26 +0300 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2018-01-06 14:40:59 +0300 |
| commit | 893b23bb814213d1c0465d97d14c9cbf74f48fce (patch) | |
| tree | 3fecb27b2168190b6d0389bc0f888381dbb86a50 /dev-qt/qtwebkit/files | |
| parent | dev-vcs/git: Added es to PLOCALES. (diff) | |
| download | gentoo-893b23bb814213d1c0465d97d14c9cbf74f48fce.tar.gz gentoo-893b23bb814213d1c0465d97d14c9cbf74f48fce.tar.bz2 gentoo-893b23bb814213d1c0465d97d14c9cbf74f48fce.zip | |
dev-qt/qtwebkit: Drop obsolete qtwebkit:4 packages
Bug: https://bugs.gentoo.org/620684
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'dev-qt/qtwebkit/files')
| -rw-r--r-- | dev-qt/qtwebkit/files/4.10.4-gcc5.patch | 35 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch | 40 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch | 11 |
3 files changed, 0 insertions, 86 deletions
diff --git a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch deleted file mode 100644 index 3a6b2a39c0e8..000000000000 --- a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Fri, 6 Mar 2015 10:20:13 +0000 (+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 <andras.becsi@theqtcompany.com> ---- - -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<Int32Shape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(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/files/4.10.4-use-correct-icu-typedef.patch b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch deleted file mode 100644 index 3e4816255fed..000000000000 --- a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@flaska.net> -Date: Tue, 3 Sep 2013 16:59:35 +0200 -Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002 - -This fixes the build failure of qtwebkit23 on my Gentoo machine. ---- - Source/WTF/wtf/unicode/qt4/UnicodeQt4.h | 2 +- - Source/WTF/wtf/unicode/wchar/UnicodeWchar.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -index a2d1ad4..392d2db 100644 ---- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -+++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -@@ -69,7 +69,7 @@ typedef uint16_t UChar; - #endif - - #if !USE(ICU_UNICODE) --typedef uint32_t UChar32; -+typedef int32_t UChar32; - #endif - - namespace WTF { -diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -index 10c2026..db8944e 100644 ---- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -+++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -@@ -31,7 +31,7 @@ - #include <wtf/unicode/UnicodeMacrosFromICU.h> - - typedef wchar_t UChar; --typedef uint32_t UChar32; -+typedef int32_t UChar32; - - namespace WTF { - namespace Unicode { --- -1.7.1 - diff --git a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch deleted file mode 100644 index 16f52d9cb07e..000000000000 --- a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2012-07-17 15:06:26.692276108 +0000 -+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2012-07-17 15:06:54.480928701 +0000 -@@ -993,7 +993,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ -+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \ - || (CPU(IA64) && !CPU(IA64_32)) \ - || CPU(ALPHA) \ - || CPU(SPARC64) \ |