[mingw-webkitgtk: 21/36] Update to 1.6.1
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 21:11:13 UTC 2012
commit 93ee9d5ccc09d495e185ae466f7c03addad8eb2b
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sun Oct 2 23:09:50 2011 +0300
Update to 1.6.1
.gitignore | 1 +
mingw32-webkitgtk.spec | 19 ++---
sources | 2 +-
...w-fixes.patch => webkit-1.6.1-mingw-fixes.patch | 89 +++++++++++--------
4 files changed, 61 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b9ffdfe..60fc614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/webkit-1.4.1.tar.gz
/webkit-1.4.2.tar.gz
/webkit-1.5.2.tar.gz
+/webkit-1.6.1.tar.gz
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index a7e4cc9..741d9d1 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -44,7 +44,7 @@
%bcond_with wml
Name: mingw32-webkitgtk
-Version: 1.5.2
+Version: 1.6.1
Release: 1%{?dist}
Summary: MinGW Windows web content engine library
@@ -58,19 +58,13 @@ 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.5.2-mingw-fixes.patch
+Patch1: webkit-1.6.1-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
-# https://bugs.webkit.org/show_bug.cgi?id=66140
-Patch3: webkit-1.5.2-WebCoreHeaderDetection.patch
-
-# https://bugs.webkit.org/show_bug.cgi?id=66151
-Patch4: webkit-1.5.2-DateMath.patch
-
BuildArch: noarch
BuildRequires: bison
@@ -123,15 +117,14 @@ Static version of the MinGW Windows WebKitGTK+ library.
%prep
%setup -qn "webkit-%{version}"
-%patch1 -p0 -b .mingw
+%patch1 -p1 -b .mingw
%patch2 -p0 -b .dumprendertree
-%patch3 -p1 -b .WebCoreHeaderDetection
-%patch4 -p1 -b .DateMath
%build
%{_mingw32_configure} \
--with-target=win32 \
+ --with-gtk=2.0 \
--with-font-backend=pango \
--with-unicode-backend=glib \
--disable-video \
@@ -202,6 +195,10 @@ fi
%changelog
+* Sun Oct 02 2011 Kalev Lember <kalevlember at gmail.com> - 1.6.1-1
+- Update to 1.6.1
+- Dropped upstreamed patches
+
* 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
diff --git a/sources b/sources
index d82cfb7..5a6b3bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92e512b8222d107b71beccf88a045e09 webkit-1.5.2.tar.gz
+c11743694b1b71dad287b2e7a9e73b05 webkit-1.6.1.tar.gz
diff --git a/webkit-1.5.2-mingw-fixes.patch b/webkit-1.6.1-mingw-fixes.patch
similarity index 84%
rename from webkit-1.5.2-mingw-fixes.patch
rename to webkit-1.6.1-mingw-fixes.patch
index a79f9ab..b9cdcdc 100644
--- a/webkit-1.5.2-mingw-fixes.patch
+++ b/webkit-1.6.1-mingw-fixes.patch
@@ -1,5 +1,18 @@
---- 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
+--- webkit-1.6.1/Source/JavaScriptCore/wtf/CurrentTime.cpp.mingw 2011-09-28 15:10:11.771424545 +0300
++++ webkit-1.6.1/Source/JavaScriptCore/wtf/CurrentTime.cpp 2011-09-28 15:14:53.068221764 +0300
+@@ -55,8 +55,9 @@
+ #include <sys/types.h>
+ #endif
+ #endif
++#endif
+
+-#elif PLATFORM(GTK)
++#if PLATFORM(GTK)
+ #include <glib.h>
+ #elif PLATFORM(WX)
+ #include <wx/datetime.h>
+--- webkit-1.6.1/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h.mingw 2011-09-26 23:54:57.000000000 +0300
++++ webkit-1.6.1/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2011-09-28 14:56:19.405756446 +0300
@@ -35,7 +35,11 @@
#include <stdlib.h>
#include <string.h>
@@ -12,9 +25,22 @@
typedef int32_t UChar32;
namespace WTF {
---- 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 @@
+--- webkit-1.6.1/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp.mingw 2011-09-26 23:54:57.000000000 +0300
++++ webkit-1.6.1/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2011-09-28 14:56:19.405756446 +0300
+@@ -166,8 +166,8 @@
+ GOwnPtr<char> utf8a;
+ GOwnPtr<char> utf8b;
+
+- utf8a.set(g_utf16_to_utf8(a, len, 0, 0, 0));
+- utf8b.set(g_utf16_to_utf8(b, len, 0, 0, 0));
++ utf8a.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(a), len, 0, 0, 0));
++ utf8b.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(b), len, 0, 0, 0));
+
+ GOwnPtr<char> foldedA;
+ GOwnPtr<char> foldedB;
+--- webkit-1.6.1/Source/WebCore/platform/graphics/pango/FontPango.cpp.mingw 2011-09-26 23:55:00.000000000 +0300
++++ webkit-1.6.1/Source/WebCore/platform/graphics/pango/FontPango.cpp 2011-09-28 14:56:19.413756270 +0300
+@@ -136,7 +136,7 @@
gchar* utf8Text;
glong itemsWritten;
@@ -23,9 +49,9 @@
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 @@
+--- webkit-1.6.1/Source/WebCore/platform/KURL.cpp.mingw 2011-09-26 23:54:59.000000000 +0300
++++ webkit-1.6.1/Source/WebCore/platform/KURL.cpp 2011-09-28 14:56:19.413756270 +0300
+@@ -1511,7 +1511,7 @@
#elif USE(GLIB_UNICODE)
GOwnPtr<gchar> utf8Hostname;
GOwnPtr<GError> utf8Err;
@@ -34,8 +60,8 @@
if (utf8Err)
return;
---- 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
+--- webkit-1.6.1/Source/WebCore/platform/text/TextEncoding.cpp.mingw 2011-09-26 23:55:00.000000000 +0300
++++ webkit-1.6.1/Source/WebCore/platform/text/TextEncoding.cpp 2011-09-28 14:56:19.414756248 +0300
@@ -111,7 +111,7 @@
return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
#elif USE(GLIB_UNICODE)
@@ -54,8 +80,19 @@
return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
#elif OS(WINCE)
---- 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
+--- webkit-1.6.1/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp.mingw 2011-09-26 23:55:00.000000000 +0300
++++ webkit-1.6.1/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2011-09-28 14:56:19.414756248 +0300
+@@ -75,7 +75,7 @@
+ bool CharacterIterator::setText(const UChar* string, int length)
+ {
+ long utf8Size = 0;
+- m_utf8.set(g_utf16_to_utf8(string, length, 0, &utf8Size, 0));
++ m_utf8.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(string), length, 0, &utf8Size, 0));
+ if (!utf8Size)
+ return false;
+
+--- webkit-1.6.1/Source/WebCore/platform/gtk/GtkPopupMenu.cpp.mingw 2011-09-26 23:55:00.000000000 +0300
++++ webkit-1.6.1/Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2011-09-28 14:56:19.414756248 +0300
@@ -175,9 +175,9 @@
// menulists.
bool repeatingCharacter = unicodeCharacter != m_previousKeyEventCharacter;
@@ -68,19 +105,8 @@
m_previousKeyEventTimestamp = event->time;
m_previousKeyEventCharacter = unicodeCharacter;
---- 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)
- {
- long utf8Size = 0;
-- m_utf8.set(g_utf16_to_utf8(string, length, 0, &utf8Size, 0));
-+ 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.mingw 2011-02-10 14:36:59.000000000 +0200
-+++ Source/WebCore/plugins/win/PluginDatabaseWin.cpp 2011-08-13 09:28:37.410929801 +0300
+--- webkit-1.6.1/Source/WebCore/plugins/win/PluginDatabaseWin.cpp.mingw 2011-09-26 23:55:00.000000000 +0300
++++ webkit-1.6.1/Source/WebCore/plugins/win/PluginDatabaseWin.cpp 2011-09-28 14:56:19.415756226 +0300
@@ -102,7 +102,7 @@
DWORD pathStrSize = sizeof(pathStr);
DWORD type;
@@ -218,16 +244,3 @@
directories.append(macromediaDirectoryStr);
#endif
}
---- 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;
-
-- utf8a.set(g_utf16_to_utf8(a, len, 0, 0, 0));
-- utf8b.set(g_utf16_to_utf8(b, len, 0, 0, 0));
-+ utf8a.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(a), len, 0, 0, 0));
-+ utf8b.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(b), len, 0, 0, 0));
-
- GOwnPtr<char> foldedA;
- GOwnPtr<char> foldedB;
More information about the scm-commits
mailing list