aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <stephen.arnold42@gmail.com>2015-07-21 00:17:16 -0700
committerSteve Arnold <stephen.arnold42@gmail.com>2015-07-21 00:17:16 -0700
commit9e4be02f93d390b17944ed4b306e25402acfab9c (patch)
tree023437fce6821220118a4ba5f7a62c1b5630edb3 /net-libs/webkit-gtk
parentadded initial tegra-nouveau kernel source with patches and testing defconfig (diff)
downloadarm-9e4be02f93d390b17944ed4b306e25402acfab9c.tar.gz
arm-9e4be02f93d390b17944ed4b306e25402acfab9c.tar.bz2
arm-9e4be02f93d390b17944ed4b306e25402acfab9c.zip
removed crufty old patches with no parent
Diffstat (limited to 'net-libs/webkit-gtk')
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.2-3dopengles.patch11
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch63
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.2-gles2-texmap.patch74
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.4-jscore.patch43
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch20
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch23
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch63
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.4.6-gstreamer-check.patch22
8 files changed, 0 insertions, 319 deletions
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-3dopengles.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-3dopengles.patch
deleted file mode 100644
index 2eed3b8..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-3dopengles.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
-+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
-@@ -37,7 +37,7 @@
- #include <GLES2/gl2ext.h>
- #endif
-
--#if OS(QNX) || PLATFORM(QT)
-+#if OS(QNX) || PLATFORM(QT) || PLATFORM(GTK)
- // See https://bugs.webkit.org/show_bug.cgi?id=91030.
- // Newer Khorons headers do define these with a PROC suffix, but older headers don't.
- #define PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch
deleted file mode 100644
index 783c226..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -bur Source-Old/WebCore/ChangeLog Source/WebCore/ChangeLog
---- Source-Old/WebCore/ChangeLog 2013-11-11 20:57:19.000000000 +1100
-+++ Source/WebCore/ChangeLog 2014-01-19 10:57:59.164325097 +1100
-@@ -1,3 +1,19 @@
-+2013-12-02 Andres Gomez <agomez@igalia.com>
-+
-+ [GTK] Fails to build with freetype 2.5.1
-+ https://bugs.webkit.org/show_bug.cgi?id=125074
-+
-+ Reviewed by Carlos Garcia Campos.
-+
-+ FreeType specifies a canonical way of including their own
-+ headers. Now, we are following this recommendation so the
-+ compilation won't be broken again due to an upgrade in FeeType's
-+ including paths.
-+
-+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
-+ * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
-+ * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
-+
- 2013-09-24 Lorenzo Tilve <ltilve@igalia.com>
-
- [GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE
-diff -bur Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
---- Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-01-03 17:02:12.965019204 -0500
-+++ Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-01-03 17:07:05.353299934 -0500
-@@ -29,6 +29,8 @@
- #include <cairo-ft.h>
- #include <cairo.h>
- #include <fontconfig/fcfreetype.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
- #include <wtf/text/WTFString.h>
-
- #if !PLATFORM(EFL)
-diff -bur Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
---- Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2014-01-03 17:02:12.965019204 -0500
-+++ Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2014-01-03 17:06:34.064841946 -0500
-@@ -43,6 +43,9 @@
- #include <cairo-ft.h>
- #include <cairo.h>
- #include <fontconfig/fcfreetype.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_TRUETYPE_TAGS_H
- #include <unicode/normlzr.h>
- #include <wtf/MathExtras.h>
- #include <wtf/unicode/Unicode.h>
-diff -bur Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
---- Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2014-01-03 17:02:12.963019175 -0500
-+++ Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2014-01-03 17:10:17.954121668 -0500
-@@ -39,8 +39,9 @@
- #include "TextEncoding.h"
- #include <cairo-ft.h>
- #include <cairo.h>
--#include <freetype/freetype.h>
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_TRUETYPE_TABLES_H
- #include <hb.h>
- #include <wtf/text/CString.h>
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-gles2-texmap.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-gles2-texmap.patch
deleted file mode 100644
index 4f4a8d4..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-gles2-texmap.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Subversion Revision: 114502
-diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
-index 6d8ccc501cc12dc73e9b15ddbfc17aaf6fc818f6..1dba94ad456eb4df2caf255b7f1616117b814b24 100644
---- a/Source/WebCore/ChangeLog
-+++ b/Source/WebCore/ChangeLog
-@@ -1,3 +1,19 @@
-+2012-04-19 No'am Rosenthal <noam.rosenthal@nokia.com>
-+
-+ [Qt][Texmap] Error of cross-compiling webkit with Qt 4.8.1
-+ https://bugs.webkit.org/show_bug.cgi?id=84321
-+
-+ Speculative build-fix for Qt 4.8.
-+ Use QGLContext for Qt 4.x instead of the platform-specific context.
-+
-+ Reviewed by NOBODY (OOPS!).
-+
-+ No new tests, build fix.
-+
-+ * platform/graphics/texmap/TextureMapperGL.cpp:
-+ (SharedGLData):
-+ (WebCore::TextureMapperGLData::SharedGLData::getCurrentGLContext):
-+
- 2012-04-18 No'am Rosenthal <noam.rosenthal@nokia.com>
-
- [Qt] Fix Qt-Mac build after libxml patch
-diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
-index 894ebbf5649eb257598dfd76cefaeeeb78d0e70e..191c4984f585c5422bb79d3fcf2aad66d01714c7 100644
---- a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
-+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
-@@ -30,12 +30,14 @@
- #include <wtf/PassRefPtr.h>
- #include <wtf/RefCounted.h>
-
--#if PLATFORM(QT) && QT_VERSION >= 0x050000
-+#if PLATFORM(QT)
-+#if QT_VERSION >= 0x050000
- #include <QOpenGLContext>
- #include <QPlatformPixmap>
--#endif
--
--#if OS(WINDOWS)
-+#else
-+#include <QGLContext>
-+#endif // QT_VERSION
-+#elif OS(WINDOWS)
- #include <windows.h>
- #elif OS(MAC_OS_X)
- #include <AGL/agl.h>
-@@ -51,16 +53,23 @@
- #endif
-
- #define GL_CMD(...) do { __VA_ARGS__; ASSERT_ARG(__VA_ARGS__, !glGetError()); } while (0)
--
- namespace WebCore {
- struct TextureMapperGLData {
- struct SharedGLData : public RefCounted<SharedGLData> {
--#if PLATFORM(QT) && QT_VERSION >= 0x050000
-+#if PLATFORM(QT)
-+#if QT_VERSION >= 0x050000
- typedef QOpenGLContext* GLContext;
- static GLContext getCurrentGLContext()
- {
- return QOpenGLContext::currentContext();
- }
-+#else
-+ typedef const QGLContext* GLContext;
-+ static GLContext getCurrentGLContext()
-+ {
-+ return QGLContext::currentContext();
-+ }
-+#endif
- #elif OS(WINDOWS)
- typedef HGLRC GLContext;
- static GLContext getCurrentGLContext()
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-jscore.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-jscore.patch
deleted file mode 100644
index 0d13ac6..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-jscore.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Source/JavaScriptCore/dfg/DFGCSEPhase.cpp.orig 2014-02-11 19:21:31.000000000 -0800
-+++ Source/JavaScriptCore/dfg/DFGCSEPhase.cpp 2014-02-11 19:23:02.000000000 -0800
-@@ -31,6 +31,7 @@
- #include "DFGEdgeUsesStructure.h"
- #include "DFGGraph.h"
- #include "DFGPhase.h"
-+#include "JSCJSValueInlines.h"
- #include "JSCellInlines.h"
- #include <wtf/FastBitVector.h>
-
---- Source/JavaScriptCore/dfg/DFGNode.h.orig 2014-02-11 19:21:41.000000000 -0800
-+++ Source/JavaScriptCore/dfg/DFGNode.h 2014-02-11 19:23:41.000000000 -0800
-@@ -40,7 +40,7 @@
- #include "DFGNodeFlags.h"
- #include "DFGNodeType.h"
- #include "DFGVariableAccessData.h"
--#include "JSCJSValue.h"
-+#include "JSCJSValueInlines.h"
- #include "Operands.h"
- #include "SpeculatedType.h"
- #include "StructureSet.h"
---- Source/JavaScriptCore/heap/CopyVisitor.cpp.orig 2014-02-11 19:21:45.000000000 -0800
-+++ Source/JavaScriptCore/heap/CopyVisitor.cpp 2014-02-11 19:24:16.000000000 -0800
-@@ -30,7 +30,7 @@
- #include "CopyVisitorInlines.h"
- #include "CopyWorkList.h"
- #include "GCThreadSharedData.h"
--#include "JSCell.h"
-+#include "JSCellInlines.h"
- #include "JSObject.h"
- #include "Operations.h"
- #include <wtf/Threading.h>
---- Source/JavaScriptCore/runtime/SymbolTable.h.orig 2014-02-11 19:21:56.000000000 -0800
-+++ Source/JavaScriptCore/runtime/SymbolTable.h 2014-02-11 19:24:45.000000000 -0800
-@@ -29,6 +29,8 @@
- #ifndef SymbolTable_h
- #define SymbolTable_h
-
-+#include "JSCellInlines.h"
-+#include "JSDestructibleObject.h"
- #include "ConcurrentJITLock.h"
- #include "JSObject.h"
- #include "Watchpoint.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
deleted file mode 100644
index 5f0542c..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix wide pointer issues on ia64 (closes: #642750).
-Author: Stephan Schreiber <info@fs-driver.org>
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -705,6 +705,13 @@
- #define ENABLE_JIT 1
- #endif
-
-+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
-+ some memory barriers are missing in the thread-unsafe code around the
-+ pagemap_cache_ object. */
-+#if CPU(IA64) || CPU(IA64_32)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
- #if !defined(ENABLE_JIT) \
- && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
deleted file mode 100644
index 691b528..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Source_WTF_wtf_Atomics_h,v 1.3 2013/10/20 09:07:57 landry Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=86835
-Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems based on __sync_fetch_and_add builtin
-
---- Source/WTF/wtf/Atomics.h.orig Sat Aug 3 18:10:38 2013
-+++ Source/WTF/wtf/Atomics.h Sun Oct 20 11:06:14 2013
-@@ -112,6 +112,15 @@ inline int atomicDecrement(int volatile* addend) { ret
- inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
- inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
-
-+#elif COMPILER(GCC) && CPU(SPARC64)
-+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-+
-+inline int atomicIncrement(int volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int atomicDecrement(int volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
-+inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
- #endif
-
- #if OS(WINDOWS)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch
deleted file mode 100644
index ce1c687..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-fix-linking-issue.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 09088da56f3de17ab1cc537627cda6bf808eaf4c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 27 Feb 2014 14:17:29 +0100
-Subject: [PATCH 3/3] Fix linking issue
-
-* inline function is sometimes not included soon enough
-
- Partialy taken from:
- https://bugs.webkit.org/show_bug.cgi?id=124152
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- Source/JavaScriptCore/llint/LLIntEntrypoint.cpp | 3 +++
- Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp | 3 +++
- Source/JavaScriptCore/runtime/SymbolTable.cpp | 4 ++++
- 3 files changed, 10 insertions(+)
-
-diff --git a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
-index 5d91be6..73cba31 100644
---- a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
-+++ b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
-@@ -31,6 +31,9 @@
- #include "CodeBlock.h"
- #include "JITCode.h"
- #include "JSObject.h"
-+#include "JSCellInlines.h"
-+#include "JSDestructibleObject.h"
-+#include "SlotVisitorInlines.h"
- #include "LLIntThunks.h"
- #include "LowLevelInterpreter.h"
- #include "MaxFrameExtentForSlowPathCall.h"
-diff --git a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
-index d0583fc..4be5ec3 100644
---- a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
-+++ b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
-@@ -25,6 +25,9 @@
-
- #include "config.h"
- #include "FunctionExecutableDump.h"
-+#include "JSCellInlines.h"
-+#include "JSDestructibleObject.h"
-+#include "SlotVisitorInlines.h"
-
- #include "CodeBlock.h"
-
-diff --git a/Source/JavaScriptCore/runtime/SymbolTable.cpp b/Source/JavaScriptCore/runtime/SymbolTable.cpp
-index 6eb0239..21450df 100644
---- a/Source/JavaScriptCore/runtime/SymbolTable.cpp
-+++ b/Source/JavaScriptCore/runtime/SymbolTable.cpp
-@@ -33,6 +33,10 @@
- #include "JSCInlines.h"
- #include "SlotVisitorInlines.h"
-
-+#include "JSCellInlines.h"
-+#include "JSDestructibleObject.h"
-+#include "SlotVisitorInlines.h"
-+
- namespace JSC {
-
- const ClassInfo SymbolTable::s_info = { "SymbolTable", 0, 0, 0, CREATE_METHOD_TABLE(SymbolTable) };
---
-1.9.0
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.6-gstreamer-check.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.6-gstreamer-check.patch
deleted file mode 100644
index b78d04a..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.6-gstreamer-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- webkitgtk-2.4.6/Source/autotools/SetupWebKitFeatures.m4
-+++ webkitgtk-2.4.6/Source/autotools/SetupWebKitFeatures.m4
-@@ -24,9 +24,9 @@
- fi
-
- if test "$enable_video" = "yes"; then
-- CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1"
-+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1 ENABLE_VIDEO_TRACK=1"
- else
-- CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0"
-+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0"
- fi
-
- if test "$enable_css_filters" = "yes"; then
-@@ -171,7 +171,6 @@
- ENABLE_TOUCH_ICON_LOADING=0 \
- ENABLE_USER_TIMING=0 \
- ENABLE_VIBRATION=0 \
-- ENABLE_VIDEO_TRACK=1 \
- ENABLE_VIEW_MODE_CSS_MEDIA=1 \
- ENABLE_WEB_SOCKETS=1 \
- ENABLE_WEB_TIMING=1 \