[mingw-webkitgtk: 20/36] Update to 1.5.2
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 21:11:08 UTC 2012
commit e3e39d7bc139f8ece7a893096661457a76d4995c
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat Aug 13 11:11:08 2011 +0300
Update to 1.5.2
Rebased the mingw-fixes patch; dropped upstreamed patches and added two
additional build fixes.
.gitignore | 1 +
changeset_r82701.diff | 10 --
changeset_r84071.diff | 86 -------------
javascriptcore-winver.patch | 54 --------
mingw32-webkitgtk.spec | 35 +++---
sources | 2 +-
webkit-1.5.2-DateMath.patch | 13 ++
webkit-1.5.2-WebCoreHeaderDetection.patch | 11 ++
...w-fixes.patch => webkit-1.5.2-mingw-fixes.patch | 128 +++++--------------
webkit-dont-build-dump-render-tree.patch | 21 ++--
10 files changed, 91 insertions(+), 270 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db1f763..b9ffdfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/webkit-1.4.0.tar.gz
/webkit-1.4.1.tar.gz
/webkit-1.4.2.tar.gz
+/webkit-1.5.2.tar.gz
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index f4d3ca6..a7e4cc9 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -44,8 +44,8 @@
%bcond_with wml
Name: mingw32-webkitgtk
-Version: 1.4.2
-Release: 2%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
Summary: MinGW Windows web content engine library
Group: Development/Libraries
@@ -58,22 +58,18 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
# Several changes required to get webkitgtk cross-compiled
# Originally created by Mikkel Kruse Johnsen
# https://bugs.webkit.org/show_bug.cgi?id=23872
-Patch1: webkit-1.3.13-mingw-fixes.patch
+Patch1: webkit-1.5.2-mingw-fixes.patch
# The DumpRenderTree tool fails to compile for version 1.3.13
# as it depends on internal symbols which aren't exported in
# the .dll so it's safe to skip building this tool
Patch2: webkit-dont-build-dump-render-tree.patch
-# Fix build break when font backend is Pango
-Patch6: changeset_r82701.diff
+# https://bugs.webkit.org/show_bug.cgi?id=66140
+Patch3: webkit-1.5.2-WebCoreHeaderDetection.patch
-# Add missing _WIN32_WINNT and WINVER definitions
-# https://bugs.webkit.org/show_bug.cgi?id=59702
-Patch7: javascriptcore-winver.patch
-
-# Fix compilation of the plugins part of WebKit
-Patch8: changeset_r84071.diff
+# https://bugs.webkit.org/show_bug.cgi?id=66151
+Patch4: webkit-1.5.2-DateMath.patch
BuildArch: noarch
@@ -129,9 +125,8 @@ Static version of the MinGW Windows WebKitGTK+ library.
%patch1 -p0 -b .mingw
%patch2 -p0 -b .dumprendertree
-%patch6 -p0 -b .pango
-%patch7 -p1 -b .winver
-%patch8 -p0 -b .plugins
+%patch3 -p1 -b .WebCoreHeaderDetection
+%patch4 -p1 -b .DateMath
%build
@@ -140,6 +135,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
--with-font-backend=pango \
--with-unicode-backend=glib \
--disable-video \
+ --disable-fullscreen-api \
--enable-static --enable-shared \
--disable-spellcheck \
%{?with_3dtransforms: --enable-3D-transforms } \
@@ -188,20 +184,29 @@ fi
%{_docdir}/%{name}-%{version}/
%{_mingw32_bindir}/jsc-1.exe
%{_mingw32_bindir}/GtkLauncher.exe
+%{_mingw32_bindir}/libjavascriptcoregtk-1.0-0.dll
%{_mingw32_bindir}/libwebkitgtk-1.0-0.dll
%{_mingw32_includedir}/webkit-1.0/
+%{_mingw32_libdir}/libjavascriptcoregtk-1.0.dll.a
+%{_mingw32_libdir}/libjavascriptcoregtk-1.0.la
%{_mingw32_libdir}/libwebkitgtk-1.0.dll.a
%{_mingw32_libdir}/libwebkitgtk-1.0.la
+%{_mingw32_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
%{_mingw32_libdir}/pkgconfig/webkit-1.0.pc
%{_mingw32_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
-%{_mingw32_datadir}/webkit-1.0/
%{_mingw32_datadir}/webkitgtk-1.0/
%files static
+%{_mingw32_libdir}/libjavascriptcoregtk-1.0.a
%{_mingw32_libdir}/libwebkitgtk-1.0.a
%changelog
+* Sat Aug 13 2011 Kalev Lember <kalevlember at gmail.com> - 1.5.2-1
+- Update to 1.5.2
+- Rebased the mingw-fixes patch; dropped upstreamed patches and added two
+ additional build fixes.
+
* Sat Jul 30 2011 Kalev Lember <kalevlember at gmail.com> - 1.4.2-2
- Added rpm scriplets for running glib-compile-schemas
diff --git a/sources b/sources
index 02f5238..d82cfb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-361f8420e93d12101d650758fec09fa0 webkit-1.4.2.tar.gz
+92e512b8222d107b71beccf88a045e09 webkit-1.5.2.tar.gz
diff --git a/webkit-1.5.2-DateMath.patch b/webkit-1.5.2-DateMath.patch
new file mode 100644
index 0000000..1d25908
--- /dev/null
+++ b/webkit-1.5.2-DateMath.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp b/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
+index 75023a8..afa1f07 100644
+--- a/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
++++ b/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
+@@ -33,7 +33,7 @@
+ #if !USE(PTHREADS)
+
+ #include "CurrentTime.h"
+-#include "DateMap.h"
++#include "DateMath.h"
+ #include "dtoa.h"
+ #include "HashMap.h"
+ #include "MainThread.h"
diff --git a/webkit-1.5.2-WebCoreHeaderDetection.patch b/webkit-1.5.2-WebCoreHeaderDetection.patch
new file mode 100644
index 0000000..f2a4ade
--- /dev/null
+++ b/webkit-1.5.2-WebCoreHeaderDetection.patch
@@ -0,0 +1,11 @@
+--- webkit-1.5.2/Source/WebCore/config.h.WebCoreHeaderDetection 2011-08-12 18:58:08.627675320 +0300
++++ webkit-1.5.2/Source/WebCore/config.h 2011-08-12 18:58:43.327004430 +0300
+@@ -29,7 +29,7 @@
+
+ #include <wtf/Platform.h>
+
+-#if OS(WINDOWS) && !OS(WINCE) && !PLATFORM(QT) && !PLATFORM(CHROMIUM)
++#if OS(WINDOWS) && !OS(WINCE) && !PLATFORM(QT) && !PLATFORM(CHROMIUM) && !PLATFORM(GTK)
+ #include <WebCore/WebCoreHeaderDetection.h>
+ #endif
+
diff --git a/webkit-1.3.13-mingw-fixes.patch b/webkit-1.5.2-mingw-fixes.patch
similarity index 73%
rename from webkit-1.3.13-mingw-fixes.patch
rename to webkit-1.5.2-mingw-fixes.patch
index d2f3064..a79f9ab 100644
--- a/webkit-1.3.13-mingw-fixes.patch
+++ b/webkit-1.5.2-mingw-fixes.patch
@@ -1,77 +1,6 @@
---- Source/WebCore/platform/FileSystem.h.orig 2010-11-14 01:32:43.897746786 +0100
-+++ Source/WebCore/platform/FileSystem.h 2010-11-14 01:33:35.471696924 +0100
-@@ -72,7 +72,7 @@
- namespace WebCore {
-
- // PlatformModule
--#if OS(WINDOWS)
-+#if OS(WINDOWS) && !PLATFORM(GTK)
- typedef HMODULE PlatformModule;
- #elif PLATFORM(QT)
- #if defined(Q_WS_MAC)
-@@ -117,7 +117,7 @@
- #if PLATFORM(QT)
- typedef QFile* PlatformFileHandle;
- const PlatformFileHandle invalidPlatformFileHandle = 0;
--#elif OS(WINDOWS)
-+#elif OS(WINDOWS) && !PLATFORM(GTK)
- typedef HANDLE PlatformFileHandle;
- // FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to
- // avoid using Windows headers in headers. We'd rather move this into the .cpp.
-@@ -203,7 +203,7 @@
- CString applicationDirectoryPath();
- #endif
-
--#if PLATFORM(WIN) && !OS(WINCE)
-+#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(GTK)
- String localUserSpecificStorageDirectory();
- String roamingUserSpecificStorageDirectory();
- bool safeCreateFile(const String&, CFDataRef);
---- Source/WebCore/dom/XMLDocumentParserLibxml2.cpp.orig 2010-11-14 01:16:29.252186309 +0100
-+++ Source/WebCore/dom/XMLDocumentParserLibxml2.cpp 2010-11-14 01:17:05.364811184 +0100
-@@ -940,7 +940,7 @@
- if (isStopped())
- return;
-
--#if COMPILER(MSVC) || COMPILER(RVCT)
-+#if COMPILER(MSVC) || COMPILER(RVCT) || COMPILER(MINGW)
- char m[1024];
- vsnprintf(m, sizeof(m) - 1, message, args);
- #else
-@@ -954,7 +954,7 @@
- else
- handleError(type, m, lineNumber(), columnNumber());
-
--#if !COMPILER(MSVC) && !COMPILER(RVCT)
-+#if !COMPILER(MSVC) && !COMPILER(RVCT) && !COMPILER(MINGW)
- free(m);
- #endif
- }
---- Source/WebKit/gtk/webkit/webkitwebsettings.cpp.orig 2011-04-21 00:25:52.740516641 +0200
-+++ Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2011-04-21 00:26:00.067653521 +0200
-@@ -40,7 +40,7 @@
- #if OS(UNIX)
- #include <sys/utsname.h>
- #elif OS(WINDOWS)
--#include "SystemInfo.h"
-+#include "win/SystemInfo.h"
- #endif
-
- /**
---- Source/WebCore/platform/graphics/WOFFFileFormat.cpp.orig 2011-04-21 00:37:18.437364878 +0200
-+++ Source/WebCore/platform/graphics/WOFFFileFormat.cpp 2011-04-23 15:06:02.763002927 +0200
-@@ -43,7 +43,7 @@
- #define ntohs(x) std_ntohs(x)
- #endif
-
--#if PLATFORM(WIN)
-+#ifdef WIN32
- #if CPU(BIG_ENDIAN)
- #define ntohs(x) ((uint16_t)(x))
- #define htons(x) ((uint16_t)(x))
---- Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h.orig 2011-04-24 10:14:16.151292163 +0200
-+++ Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2011-04-24 10:14:59.632105921 +0200
-@@ -34,7 +34,11 @@
+--- Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h.mingw 2011-07-05 01:49:43.000000000 +0300
++++ Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2011-08-13 09:28:37.379930396 +0300
+@@ -35,7 +35,11 @@
#include <stdlib.h>
#include <string.h>
@@ -83,9 +12,20 @@
typedef int32_t UChar32;
namespace WTF {
---- Source/WebCore/platform/KURL.cpp.orig 2010-11-14 01:23:55.869590450 +0100
-+++ Source/WebCore/platform/KURL.cpp 2010-11-14 01:25:04.996595383 +0100
-@@ -1454,7 +1454,7 @@
+--- Source/WebCore/platform/graphics/gtk/FontGtk.cpp.mingw 2011-08-02 15:58:35.000000000 +0300
++++ Source/WebCore/platform/graphics/gtk/FontGtk.cpp 2011-08-13 09:28:37.412929762 +0300
+@@ -130,7 +130,7 @@
+
+ gchar* utf8Text;
+ glong itemsWritten;
+- utf8Text = g_utf16_to_utf8(static_cast<const gunichar2*>(aText), aLength, 0, &itemsWritten, 0);
++ utf8Text = g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(aText), aLength, 0, &itemsWritten, 0);
+ length = itemsWritten;
+
+ return utf8Text;
+--- Source/WebCore/platform/KURL.cpp.mingw 2011-07-05 01:49:43.000000000 +0300
++++ Source/WebCore/platform/KURL.cpp 2011-08-13 09:28:37.382930339 +0300
+@@ -1562,7 +1562,7 @@
#elif USE(GLIB_UNICODE)
GOwnPtr<gchar> utf8Hostname;
GOwnPtr<GError> utf8Err;
@@ -94,9 +34,9 @@
if (utf8Err)
return;
---- Source/WebCore/platform/text/TextEncoding.cpp.orig 2010-11-14 01:26:26.023458630 +0100
-+++ Source/WebCore/platform/text/TextEncoding.cpp 2010-11-14 01:27:31.208555988 +0100
-@@ -119,7 +119,7 @@
+--- Source/WebCore/platform/text/TextEncoding.cpp.mingw 2011-02-10 14:36:59.000000000 +0200
++++ Source/WebCore/platform/text/TextEncoding.cpp 2011-08-13 09:28:37.399930012 +0300
+@@ -111,7 +111,7 @@
return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
#elif USE(GLIB_UNICODE)
GOwnPtr<char> UTF8Source;
@@ -105,18 +45,18 @@
if (!UTF8Source) {
// If conversion to UTF-8 failed, try with the string without normalization
return newTextCodec(*this)->encode(characters, length, handling);
-@@ -130,7 +130,7 @@
-
+@@ -122,7 +122,7 @@
+
long UTF16Length;
GOwnPtr<UChar> UTF16Normalized;
- UTF16Normalized.set(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0));
+ UTF16Normalized.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0)));
-
+
return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
#elif OS(WINCE)
---- Source/WebCore/platform/gtk/PopupMenuGtk.cpp.orig 2011-04-24 12:19:13.327884741 +0200
-+++ Source/WebCore/platform/gtk/PopupMenuGtk.cpp 2011-04-24 12:39:13.653313780 +0200
-@@ -171,9 +171,9 @@
+--- Source/WebCore/platform/gtk/GtkPopupMenu.cpp.mingw 2011-06-03 21:48:44.000000000 +0300
++++ Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2011-08-13 09:28:37.408929839 +0300
+@@ -175,9 +175,9 @@
// menulists.
bool repeatingCharacter = unicodeCharacter != m_previousKeyEventCharacter;
if (event->time - m_previousKeyEventTimestamp > gSearchTimeoutMs)
@@ -128,8 +68,8 @@
m_previousKeyEventTimestamp = event->time;
m_previousKeyEventCharacter = unicodeCharacter;
---- Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp.orig 2010-11-14 02:00:18.844672945 +0100
-+++ Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2010-11-14 02:00:37.786081187 +0100
+--- Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp.mingw 2011-07-05 01:49:43.000000000 +0300
++++ Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2011-08-13 09:28:37.409929820 +0300
@@ -75,7 +75,7 @@
bool CharacterIterator::setText(const UChar* string, int length)
{
@@ -138,9 +78,9 @@
+ m_utf8.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(string), length, 0, &utf8Size, 0));
if (!utf8Size)
return false;
-
---- Source/WebCore/plugins/win/PluginDatabaseWin.cpp.orig 2010-11-14 01:45:58.543238260 +0100
-+++ Source/WebCore/plugins/win/PluginDatabaseWin.cpp 2010-11-14 01:51:18.815019467 +0100
+
+--- Source/WebCore/plugins/win/PluginDatabaseWin.cpp.mingw 2011-02-10 14:36:59.000000000 +0200
++++ Source/WebCore/plugins/win/PluginDatabaseWin.cpp 2011-08-13 09:28:37.410929801 +0300
@@ -102,7 +102,7 @@
DWORD pathStrSize = sizeof(pathStr);
DWORD type;
@@ -278,9 +218,9 @@
directories.append(macromediaDirectoryStr);
#endif
}
---- Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp.orig 2010-11-14 02:39:27.495446094 +0100
-+++ Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2010-11-14 02:41:35.176717358 +0100
-@@ -189,8 +189,8 @@
+--- Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp.mingw 2011-02-10 14:36:34.000000000 +0200
++++ Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2011-08-13 09:28:37.411929782 +0300
+@@ -166,8 +166,8 @@
GOwnPtr<char> utf8a;
GOwnPtr<char> utf8b;
diff --git a/webkit-dont-build-dump-render-tree.patch b/webkit-dont-build-dump-render-tree.patch
index 82916b2..3e79ae2 100644
--- a/webkit-dont-build-dump-render-tree.patch
+++ b/webkit-dont-build-dump-render-tree.patch
@@ -1,10 +1,11 @@
---- GNUmakefile.in.orig 2011-04-24 17:43:57.633569073 +0200
-+++ GNUmakefile.in 2011-04-24 17:44:55.081645514 +0200
-@@ -14650,7 +14650,6 @@
- @ENABLE_WEBKIT2_FALSE@ Programs/unittests/testcopyandpaste$(EXEEXT)
- am__EXEEXT_3 = $(am__EXEEXT_2)
- @ENABLE_WEBKIT2_FALSE at am__EXEEXT_4 = $(am__EXEEXT_3) \
-- at ENABLE_WEBKIT2_FALSE@ Programs/DumpRenderTree$(EXEEXT) \
- @ENABLE_WEBKIT2_FALSE@ Programs/GtkLauncher$(EXEEXT) \
- @ENABLE_WEBKIT2_FALSE@ Programs/ImageDiff$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+--- GNUmakefile.in.orig 2011-08-13 07:47:30.864000205 +0300
++++ GNUmakefile.in 2011-08-13 07:47:44.689533559 +0300
+@@ -80,7 +80,7 @@
+ bin_PROGRAMS = Programs/jsc- at WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) \
+ $(am__EXEEXT_1)
+ noinst_PROGRAMS = Programs/jsc$(EXEEXT) Programs/minidom$(EXEEXT) \
+- $(am__EXEEXT_4) Programs/DumpRenderTree$(EXEEXT) \
++ $(am__EXEEXT_4) \
+ Programs/GtkLauncher$(EXEEXT) $(am__EXEEXT_5) \
+ Programs/ImageDiff$(EXEEXT) $(am__EXEEXT_6)
+ libexec_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
More information about the scm-commits
mailing list