[mingw-webkitgtk: 25/36] Update to 1.7.5
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 21:11:33 UTC 2012
commit 4107e17de6258e44d211603ca92d962aeeda15e8
Author: Kalev Lember <kalevlember at gmail.com>
Date: Tue Feb 7 12:34:31 2012 +0200
Update to 1.7.5
- Drop upstreamed patches
- Add a patch to link with gmodule
- Switch to .xz tarballs
.gitignore | 1 +
mingw32-webkitgtk.spec | 26 +++--
sources | 2 +-
webkit-1.6.1-mingw-fixes.patch | 152 ------------------------------
webkit-dont-build-dump-render-tree.patch | 20 ++--
webkit-glib231-compatibility.patch | 11 --
webkitgtk-1.7.5-gmodule.patch | 20 ++++
7 files changed, 48 insertions(+), 184 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60fc614..034ef17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/webkit-1.4.2.tar.gz
/webkit-1.5.2.tar.gz
/webkit-1.6.1.tar.gz
+/webkit-1.7.5.tar.xz
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index dc78748..bcaafae 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -44,8 +44,8 @@
%bcond_with wml
Name: mingw32-webkitgtk
-Version: 1.6.1
-Release: 3%{?dist}
+Version: 1.7.5
+Release: 1%{?dist}
Summary: MinGW Windows web content engine library
Group: Development/Libraries
@@ -53,7 +53,7 @@ License: LGPLv2+ and BSD
URL: http://webkit.org/
#Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
-Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
+Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz
# Several changes required to get webkitgtk cross-compiled
# Originally created by Mikkel Kruse Johnsen
@@ -65,11 +65,8 @@ Patch1: webkit-1.6.1-mingw-fixes.patch
# the .dll so it's safe to skip building this tool
Patch2: webkit-dont-build-dump-render-tree.patch
-# Fix FTBFS against glib 2.31.2 or higher
-# This is actually upstream bug #69840, but upstream
-# decided to break Win32 support with the applied patch
-# so we use a more simple patch here
-Patch3: webkit-glib231-compatibility.patch
+# Upstream patch, link with gmodule-2.0
+Patch3: webkitgtk-1.7.5-gmodule.patch
BuildArch: noarch
@@ -125,7 +122,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
%patch1 -p1 -b .mingw
%patch2 -p0 -b .dumprendertree
-%patch3 -p0 -b .glib231
+%patch3 -p1 -b .gmodule
%build
@@ -156,6 +153,9 @@ install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
+# Remove docs which duplicate those in Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+
%find_lang webkit-2.0
@@ -189,7 +189,7 @@ fi
%{_mingw32_bindir}/GtkLauncher.exe
%{_mingw32_bindir}/libjavascriptcoregtk-1.0-0.dll
%{_mingw32_bindir}/libwebkitgtk-1.0-0.dll
-%{_mingw32_includedir}/webkit-1.0/
+%{_mingw32_includedir}/webkitgtk-1.0/
%{_mingw32_libdir}/libjavascriptcoregtk-1.0.dll.a
%{_mingw32_libdir}/libwebkitgtk-1.0.dll.a
%{_mingw32_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
@@ -203,6 +203,12 @@ fi
%changelog
+* Tue Feb 07 2012 Kalev Lember <kalevlember at gmail.com> - 1.7.5-1
+- Update to 1.7.5
+- Drop upstreamed patches
+- Add a patch to link with gmodule
+- Switch to .xz tarballs
+
* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.6.1-3
- Fix compilation against glib 2.31.2 or higher
- Rebuild against libpng 1.5
diff --git a/sources b/sources
index 5a6b3bd..ffa9495 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c11743694b1b71dad287b2e7a9e73b05 webkit-1.6.1.tar.gz
+074c72e937669cada70faaf6802a86e1 webkit-1.7.5.tar.xz
diff --git a/webkit-1.6.1-mingw-fixes.patch b/webkit-1.6.1-mingw-fixes.patch
index b9cdcdc..bcf0b23 100644
--- a/webkit-1.6.1-mingw-fixes.patch
+++ b/webkit-1.6.1-mingw-fixes.patch
@@ -1,16 +1,3 @@
---- 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 @@
@@ -105,142 +92,3 @@
m_previousKeyEventTimestamp = event->time;
m_previousKeyEventCharacter = unicodeCharacter;
---- 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;
-
-- result = SHGetValue(key, name, TEXT("Path"), &type, (LPBYTE)pathStr, &pathStrSize);
-+ result = SHGetValueW(key, name, L"Path", &type, (LPBYTE)pathStr, &pathStrSize);
- if (result != ERROR_SUCCESS || type != REG_SZ)
- continue;
-
-@@ -210,7 +210,7 @@
- HKEY key;
- LONG result;
-
-- result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Mozilla"), 0, KEY_READ, &key);
-+ result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Mozilla", 0, KEY_READ, &key);
- if (result == ERROR_SUCCESS) {
- WCHAR name[128];
- FILETIME lastModified;
-@@ -227,7 +227,7 @@
- HKEY extensionsKey;
-
- // Try opening the key
-- result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
-+ result = RegOpenKeyExW(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
-
- if (result == ERROR_SUCCESS) {
- // Now get the plugins directory
-@@ -235,7 +235,7 @@
- DWORD pluginsDirectorySize = sizeof(pluginsDirectoryStr);
- DWORD type;
-
-- result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
-+ result = RegQueryValueExW(extensionsKey, L"Plugins", 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
-
- if (result == ERROR_SUCCESS && type == REG_SZ)
- directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
-@@ -253,7 +253,7 @@
- #if !OS(WINCE)
- // The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
- WCHAR pluginDirectoryStr[_MAX_PATH + 1];
-- DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, WTF_ARRAY_LENGTH(pluginDirectoryStr));
-+ DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(L"%SYSTEMDRIVE%\\PFiles\\Plugins", pluginDirectoryStr, WTF_ARRAY_LENGTH(pluginDirectoryStr));
-
- if (pluginDirectorySize > 0 && pluginDirectorySize <= WTF_ARRAY_LENGTH(pluginDirectoryStr))
- directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
-@@ -263,7 +263,7 @@
- WCHAR installationDirectoryStr[_MAX_PATH];
- DWORD installationDirectorySize = sizeof(installationDirectoryStr);
-
-- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\MediaPlayer"), TEXT("Installation Directory"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\MediaPlayer", L"Installation Directory", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-
- if (result == ERROR_SUCCESS && type == REG_SZ)
- directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
-@@ -275,7 +275,7 @@
- WCHAR installationDirectoryStr[_MAX_PATH];
- DWORD installationDirectorySize = sizeof(installationDirectoryStr);
-
-- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Apple Computer, Inc.\\QuickTime"), TEXT("InstallDir"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Apple Computer, Inc.\\QuickTime", L"InstallDir", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-
- if (result == ERROR_SUCCESS && type == REG_SZ) {
- String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
-@@ -286,7 +286,7 @@
- static inline void addAdobeAcrobatPluginDirectory(Vector<String>& directories)
- {
- HKEY key;
-- HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Adobe\\Acrobat Reader"), 0, KEY_READ, &key);
-+ HRESULT result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Adobe\\Acrobat Reader", 0, KEY_READ, &key);
- if (result != ERROR_SUCCESS)
- return;
-
-@@ -317,7 +317,7 @@
- DWORD acrobatInstallPathSize = sizeof(acrobatInstallPathStr);
-
- String acrobatPluginKeyPath = "Software\\Adobe\\Acrobat Reader\\" + latestAcrobatVersionString + "\\InstallPath";
-- result = SHGetValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
-+ result = SHGetValueW(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
-
- if (result == ERROR_SUCCESS) {
- String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
-@@ -331,7 +331,7 @@
- static inline void addJavaPluginDirectory(Vector<String>& directories)
- {
- HKEY key;
-- HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\JavaSoft\\Java Plug-in"), 0, KEY_READ, &key);
-+ HRESULT result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\JavaSoft\\Java Plug-in", 0, KEY_READ, &key);
- if (result != ERROR_SUCCESS)
- return;
-
-@@ -364,10 +364,10 @@
- DWORD useNewPluginSize;
-
- String javaPluginKeyPath = "Software\\JavaSoft\\Java Plug-in\\" + latestJavaVersionString;
-- result = SHGetValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination(), TEXT("UseNewJavaPlugin"), &type, (LPVOID)&useNewPluginValue, &useNewPluginSize);
-+ result = SHGetValueW(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination(), L"UseNewJavaPlugin", &type, (LPVOID)&useNewPluginValue, &useNewPluginSize);
-
- if (result == ERROR_SUCCESS && useNewPluginValue == 1) {
-- result = SHGetValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination(), TEXT("JavaHome"), &type, (LPBYTE)javaInstallPathStr, &javaInstallPathSize);
-+ result = SHGetValueW(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination(), L"JavaHome", &type, (LPBYTE)javaInstallPathStr, &javaInstallPathSize);
- if (result == ERROR_SUCCESS) {
- String javaPluginDirectory = String(javaInstallPathStr, javaInstallPathSize / sizeof(WCHAR) - 1) + "\\bin\\new_plugin";
- directories.append(javaPluginDirectory);
-@@ -387,12 +387,12 @@
- if (!cachedPluginDirectory) {
- cachedPluginDirectory = true;
-
-- int moduleFileNameLen = GetModuleFileName(0, moduleFileNameStr, _MAX_PATH);
-+ int moduleFileNameLen = GetModuleFileNameW(0, moduleFileNameStr, _MAX_PATH);
-
- if (!moduleFileNameLen || moduleFileNameLen == _MAX_PATH)
- goto exit;
-
-- if (!PathRemoveFileSpec(moduleFileNameStr))
-+ if (!PathRemoveFileSpecW(moduleFileNameStr))
- goto exit;
-
- pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
-@@ -406,15 +406,15 @@
- #if !OS(WINCE)
- WCHAR systemDirectoryStr[MAX_PATH];
-
-- if (!GetSystemDirectory(systemDirectoryStr, WTF_ARRAY_LENGTH(systemDirectoryStr)))
-+ if (!GetSystemDirectoryW(systemDirectoryStr, WTF_ARRAY_LENGTH(systemDirectoryStr)))
- return;
-
- WCHAR macromediaDirectoryStr[MAX_PATH];
-
-- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
-+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Flash");
- directories.append(macromediaDirectoryStr);
-
-- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
-+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Shockwave 10");
- directories.append(macromediaDirectoryStr);
- #endif
- }
diff --git a/webkit-dont-build-dump-render-tree.patch b/webkit-dont-build-dump-render-tree.patch
index 3e79ae2..3de8d9b 100644
--- a/webkit-dont-build-dump-render-tree.patch
+++ b/webkit-dont-build-dump-render-tree.patch
@@ -1,11 +1,11 @@
---- 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)
+--- GNUmakefile.in.dumprendertree 2012-02-06 12:27:02.000000000 +0200
++++ GNUmakefile.in 2012-02-06 21:17:19.244111742 +0200
+@@ -78,7 +78,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
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)
+- $(am__EXEEXT_5) Programs/DumpRenderTree$(EXEEXT) \
++ $(am__EXEEXT_5) \
+ Programs/GtkLauncher$(EXEEXT) Programs/ImageDiff$(EXEEXT) \
+ $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
+ libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
diff --git a/webkitgtk-1.7.5-gmodule.patch b/webkitgtk-1.7.5-gmodule.patch
new file mode 100644
index 0000000..9cc2323
--- /dev/null
+++ b/webkitgtk-1.7.5-gmodule.patch
@@ -0,0 +1,20 @@
+2012-02-01 Martin Robinson <mrobinson at igalia.com>
+
+ Manually pull in the gthread library, as it seems that
+ with gold it doesn't happen automatically.
+
+ Reviewed by Xan Lopez.
+
+ * Source/autotools/webkit.m4:
+
+Index: webkit-1.6/Source/autotools/webkit.m4
+===================================================================
+--- webkit-1.6/Source/autotools/webkit.m4 (revision 91078)
++++ webkit-1.6/Source/autotools/webkit.m4 (revision 106485)
+@@ -110,5 +110,5 @@
+ # Version requirements
+ GLIB_REQUIRED_VERSION=2.27.90
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION)
++AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, :, gmodule gobject gthread gio)
+ if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then
+ AC_MSG_ERROR([You need the GLib dev tools in your path])
More information about the scm-commits
mailing list