[mingw-webkitgtk3] Update to 2.0.0
Kalev Lember
kalev at fedoraproject.org
Sun May 12 18:02:25 UTC 2013
commit bc8f41ab2c666ae2580784a81f8b1e794d7fb12a
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sun Apr 7 22:52:23 2013 +0200
Update to 2.0.0
- Switch to gstreamer1
- Add libwebp as a build dep
- Backport a number of patches to fix the Windows build
- Re-enable JIT
.gitignore | 1 +
mingw-webkitgtk3.spec | 52 +++++---
sources | 2 +-
webkit-1.9.6-wk2-tests.patch | 36 -----
webkit-dont-build-dump-render-tree.patch | 6 +-
webkitgtk-harfbuzz-cast.patch | 16 ++
webkitgtk-libsecret-optional.patch | 227 ++++++++++++++++++++++++++++++
webkitgtk-test-build-failure.patch | 34 +++++
webkitgtk-wk2-includes.patch | 37 +++++
9 files changed, 353 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bdc57bf..b2485ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/webkit-1.8.3.tar.xz
/webkitgtk-1.10.1.tar.xz
/webkitgtk-1.10.2.tar.xz
+/webkitgtk-2.0.0.tar.xz
diff --git a/mingw-webkitgtk3.spec b/mingw-webkitgtk3.spec
index fb8931e..98edf63 100644
--- a/mingw-webkitgtk3.spec
+++ b/mingw-webkitgtk3.spec
@@ -11,8 +11,8 @@
cp -p %1 %{buildroot}%{_docdir}/mingw64-webkitgtk3-%{version}/$(echo '%1' | sed -e 's!/!.!g')
Name: mingw-webkitgtk3
-Version: 1.10.2
-Release: 3%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
Summary: MinGW Windows GTK+ Web content engine library
Group: Development/Libraries
@@ -21,12 +21,17 @@ URL: http://webkit.org/
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Disable WebKit2 tests when building WebKit1
-# https://lists.webkit.org/pipermail/webkit-gtk/2012-August/001204.html
-Patch1: webkit-1.9.6-wk2-tests.patch
# Skip building the DumpRenderTree tool which requires internal symbols that
# aren't exported in the .dll.
Patch2: webkit-dont-build-dump-render-tree.patch
+# https://bugs.webkit.org/show_bug.cgi?id=113821
+Patch3: webkitgtk-libsecret-optional.patch
+# https://bugs.webkit.org/show_bug.cgi?id=108373
+Patch4: webkitgtk-harfbuzz-cast.patch
+# https://bugs.webkit.org/show_bug.cgi?id=114121
+Patch5: webkitgtk-test-build-failure.patch
+# https://bugs.webkit.org/show_bug.cgi?id=114096
+Patch6: webkitgtk-wk2-includes.patch
BuildArch: noarch
@@ -50,12 +55,13 @@ BuildRequires: mingw32-fontconfig
BuildRequires: mingw32-freetype
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
-BuildRequires: mingw32-gstreamer
-BuildRequires: mingw32-gstreamer-plugins-base
+BuildRequires: mingw32-gstreamer1
+BuildRequires: mingw32-gstreamer1-plugins-base
BuildRequires: mingw32-gtk3
BuildRequires: mingw32-icu
BuildRequires: mingw32-libidn
BuildRequires: mingw32-libsoup
+BuildRequires: mingw32-libwebp
BuildRequires: mingw32-libxml2
BuildRequires: mingw32-libxslt
BuildRequires: mingw32-pthreads
@@ -68,12 +74,13 @@ BuildRequires: mingw64-fontconfig
BuildRequires: mingw64-freetype
BuildRequires: mingw64-gcc
BuildRequires: mingw64-gcc-c++
-BuildRequires: mingw64-gstreamer
-BuildRequires: mingw64-gstreamer-plugins-base
+BuildRequires: mingw64-gstreamer1
+BuildRequires: mingw64-gstreamer1-plugins-base
BuildRequires: mingw64-gtk3
BuildRequires: mingw64-icu
BuildRequires: mingw64-libidn
BuildRequires: mingw64-libsoup
+BuildRequires: mingw64-libwebp
BuildRequires: mingw64-libxml2
BuildRequires: mingw64-libxslt
BuildRequires: mingw64-pthreads
@@ -116,8 +123,12 @@ This is the MinGW port of WebKitGTK+ for GTK+ 3.
%prep
%setup -qn "webkitgtk-%{version}"
-%patch1 -p1 -b .disable_wk2
%patch2 -p0 -b .dumprendertree
+%patch3 -p1 -b .libsecret-optional
+%patch4 -p1 -b .harfbuzz-cast
+%patch5 -p1 -b .test-build-failure
+%patch6 -p1 -b .wk2-includes
+
autoreconf --verbose --install -I Source/autotools
@@ -129,11 +140,9 @@ autoreconf --verbose --install -I Source/autotools
%mingw_configure \
--with-target=win32 \
--with-gtk=3.0 \
- --with-font-backend=freetype \
- --with-unicode-backend=icu \
+ --with-acceleration-backend=none \
+ --disable-credential-storage \
--disable-geolocation \
- --disable-jit \
- --disable-plugin-process \
--disable-webkit2 \
--disable-gtk-doc-html
@@ -149,11 +158,10 @@ install -m 755 build_win64/Programs/.libs/GtkLauncher.exe %{buildroot}%{mingw64_
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
-%mingw_find_lang webkitgtk-3.0
+%mingw_find_lang WebKitGTK-3.0
## Copy over and rename the various files for %%doc inclusion.
%add_to_doc_files32 Source/WebKit/LICENSE
-%add_to_doc_files32 Source/WebKit/gtk/po/README
%add_to_doc_files32 Source/WebKit/gtk/NEWS
%add_to_doc_files32 Source/WebCore/icu/LICENSE
%add_to_doc_files32 Source/WebCore/LICENSE-APPLE
@@ -166,7 +174,6 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%add_to_doc_files32 Source/JavaScriptCore/icu/LICENSE
%add_to_doc_files64 Source/WebKit/LICENSE
-%add_to_doc_files64 Source/WebKit/gtk/po/README
%add_to_doc_files64 Source/WebKit/gtk/NEWS
%add_to_doc_files64 Source/WebCore/icu/LICENSE
%add_to_doc_files64 Source/WebCore/LICENSE-APPLE
@@ -179,7 +186,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%add_to_doc_files64 Source/JavaScriptCore/icu/LICENSE
-%files -n mingw32-webkitgtk3 -f mingw32-webkitgtk-3.0.lang
+%files -n mingw32-webkitgtk3 -f mingw32-WebKitGTK-3.0.lang
%{_docdir}/mingw32-webkitgtk3-%{version}/
%{mingw32_bindir}/jsc-3.exe
%{mingw32_bindir}/GtkLauncher-3.exe
@@ -192,7 +199,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw32_libdir}/pkgconfig/webkitgtk-3.0.pc
%{mingw32_datadir}/webkitgtk-3.0/
-%files -n mingw64-webkitgtk3 -f mingw64-webkitgtk-3.0.lang
+%files -n mingw64-webkitgtk3 -f mingw64-WebKitGTK-3.0.lang
%{_docdir}/mingw64-webkitgtk3-%{version}/
%{mingw64_bindir}/jsc-3.exe
%{mingw64_bindir}/GtkLauncher-3.exe
@@ -207,6 +214,13 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Sun Apr 07 2013 Kalev Lember <kalevlember at gmail.com> - 2.0.0-1
+- Update to 2.0.0
+- Switch to gstreamer1
+- Add libwebp as a build dep
+- Backport a number of patches to fix the Windows build
+- Re-enable JIT
+
* Sun Jan 27 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.2-3
- Rebuild against mingw-gcc 4.8 (win64 uses SEH exceptions now)
diff --git a/sources b/sources
index 9c1ffda..a104b6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b1a652af1eb11bee5bf7209e9ff67e6 webkitgtk-1.10.2.tar.xz
+fa231ba8c9cd33575b9692614324be21 webkitgtk-2.0.0.tar.xz
diff --git a/webkit-dont-build-dump-render-tree.patch b/webkit-dont-build-dump-render-tree.patch
index b988404..2ba0da0 100644
--- a/webkit-dont-build-dump-render-tree.patch
+++ b/webkit-dont-build-dump-render-tree.patch
@@ -1,8 +1,10 @@
--- Tools/GNUmakefile.am
+++ Tools/GNUmakefile.am
-@@ -1,5 +1,4 @@
+@@ -3,7 +3,6 @@
+
+ if ENABLE_WEBKIT1
noinst_PROGRAMS += \
- Programs/DumpRenderTree \
Programs/GtkLauncher
+ endif
- # GtkLauncher
diff --git a/webkitgtk-harfbuzz-cast.patch b/webkitgtk-harfbuzz-cast.patch
new file mode 100644
index 0000000..2c637e3
--- /dev/null
+++ b/webkitgtk-harfbuzz-cast.patch
@@ -0,0 +1,16 @@
+diff --git a/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp b/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
+index 06d13f1..024ab0e 100644
+--- a/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
++++ b/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
+@@ -337,9 +337,9 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns(bool shouldSetDirection)
+ String upperText = String(m_normalizedBuffer.get() + currentRun->startIndex(), currentRun->numCharacters());
+ upperText.makeUpper();
+ currentFontData = m_font->glyphDataForCharacter(upperText[0], false, SmallCapsVariant).fontData;
+- hb_buffer_add_utf16(harfBuzzBuffer.get(), upperText.characters(), currentRun->numCharacters(), 0, currentRun->numCharacters());
++ hb_buffer_add_utf16(harfBuzzBuffer.get(), reinterpret_cast<const uint16_t*>(upperText.characters()), currentRun->numCharacters(), 0, currentRun->numCharacters());
+ } else
+- hb_buffer_add_utf16(harfBuzzBuffer.get(), m_normalizedBuffer.get() + currentRun->startIndex(), currentRun->numCharacters(), 0, currentRun->numCharacters());
++ hb_buffer_add_utf16(harfBuzzBuffer.get(), reinterpret_cast<const uint16_t*>(m_normalizedBuffer.get() + currentRun->startIndex()), currentRun->numCharacters(), 0, currentRun->numCharacters());
+
+ FontPlatformData* platformData = const_cast<FontPlatformData*>(¤tFontData->platformData());
+ HarfBuzzFace* face = platformData->harfBuzzFace();
diff --git a/webkitgtk-libsecret-optional.patch b/webkitgtk-libsecret-optional.patch
new file mode 100644
index 0000000..1399221
--- /dev/null
+++ b/webkitgtk-libsecret-optional.patch
@@ -0,0 +1,227 @@
+From 4744a379c6ee9ad5a5a1cf5ed252c233bedc6c74 Mon Sep 17 00:00:00 2001
+From: "mrobinson at webkit.org"
+ <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 2 Apr 2013 21:24:14 +0000
+Subject: [PATCH] [GTK] Make libsecret optional
+ https://bugs.webkit.org/show_bug.cgi?id=113821
+
+Reviewed by Gustavo Noronha Silva.
+
+.:
+
+Add a configuration option to disable credential storage and thus remove
+the libsecret dependency. This should make it possible to build WebKit 2.x
+on Windows again.
+
+* Source/autotools/FindDependencies.m4: Only look for libsecret if credential storage is active.
+* Source/autotools/PrintBuildConfiguration.m4: Print whether or not credential storage is active.
+* Source/autotools/ReadCommandLineArguments.m4: Added an option to control credential storage.
+* Source/autotools/SetupAutoconfHeader.m4: Expose credential storage setting to code.
+
+Source/WebCore:
+
+Don't try to use libsecret if credential storage is disabled.
+
+* platform/gtk/GRefPtrGtk.cpp: Protect libsecret sections.
+* platform/gtk/GRefPtrGtk.h: Ditto.
+* platform/network/gtk/CredentialBackingStore.cpp: Ditto.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147499 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+---
+ Source/WebCore/platform/gtk/GRefPtrGtk.cpp | 10 +++++++---
+ Source/WebCore/platform/gtk/GRefPtrGtk.h | 2 ++
+ .../WebCore/platform/network/gtk/CredentialBackingStore.cpp | 12 +++++++++++-
+ Source/autotools/FindDependencies.m4 | 8 +++++---
+ Source/autotools/PrintBuildConfiguration.m4 | 1 +
+ Source/autotools/ReadCommandLineArguments.m4 | 7 +++++++
+ Source/autotools/SetupAutoconfHeader.m4 | 3 +++
+ 7 files changed, 36 insertions(+), 7 deletions(-)
+
+diff --git a/Source/WebCore/platform/gtk/GRefPtrGtk.cpp b/Source/WebCore/platform/gtk/GRefPtrGtk.cpp
+index fa506df..3c28eb7 100644
+--- a/Source/WebCore/platform/gtk/GRefPtrGtk.cpp
++++ b/Source/WebCore/platform/gtk/GRefPtrGtk.cpp
+@@ -20,12 +20,14 @@
+ #include "config.h"
+ #include "GRefPtrGtk.h"
+
+-#define SECRET_WITH_UNSTABLE 1
+-#define SECRET_API_SUBJECT_TO_CHANGE 1
+-
+ #include <glib.h>
+ #include <gtk/gtk.h>
++
++#if ENABLE(CREDENTIAL_STORAGE)
++#define SECRET_WITH_UNSTABLE 1
++#define SECRET_API_SUBJECT_TO_CHANGE 1
+ #include <libsecret/secret.h>
++#endif
+
+ namespace WTF {
+
+@@ -42,6 +44,7 @@ template <> void derefGPtr(GtkTargetList* ptr)
+ gtk_target_list_unref(ptr);
+ }
+
++#if ENABLE(CREDENTIAL_STORAGE)
+ template <> SecretValue* refGPtr(SecretValue* ptr)
+ {
+ if (ptr)
+@@ -54,6 +57,7 @@ template <> void derefGPtr(SecretValue* ptr)
+ if (ptr)
+ secret_value_unref(ptr);
+ }
++#endif
+
+ #ifdef GTK_API_VERSION_2
+ template <> GdkCursor* refGPtr(GdkCursor* ptr)
+diff --git a/Source/WebCore/platform/gtk/GRefPtrGtk.h b/Source/WebCore/platform/gtk/GRefPtrGtk.h
+index 9192864..cdc7b7e 100644
+--- a/Source/WebCore/platform/gtk/GRefPtrGtk.h
++++ b/Source/WebCore/platform/gtk/GRefPtrGtk.h
+@@ -30,8 +30,10 @@ namespace WTF {
+ template <> GtkTargetList* refGPtr(GtkTargetList* ptr);
+ template <> void derefGPtr(GtkTargetList* ptr);
+
++#if ENABLE(CREDENTIAL_STORAGE)
+ template <> SecretValue* refGPtr(SecretValue* ptr);
+ template <> void derefGPtr(SecretValue* ptr);
++#endif
+
+ #ifdef GTK_API_VERSION_2
+ template <> GdkCursor* refGPtr(GdkCursor* ptr);
+diff --git a/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp b/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp
+index 3423fa5..5f1e4c5 100644
+--- a/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp
++++ b/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2012 Igalia S.L.
++ * Copyright (C) 2012, 2013 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ #include "CredentialBackingStore.h"
+
++#if ENABLE(CREDENTIAL_STORAGE)
+ #define SECRET_WITH_UNSTABLE 1
+ #define SECRET_API_SUBJECT_TO_CHANGE 1
+ #include "AuthenticationChallenge.h"
+@@ -35,6 +36,7 @@
+ #include <libsoup/soup.h>
+ #include <wtf/gobject/GOwnPtr.h>
+ #include <wtf/text/CString.h>
++#endif
+
+ namespace WebCore {
+
+@@ -44,6 +46,7 @@ CredentialBackingStore& credentialBackingStore()
+ return backingStore;
+ }
+
++#if ENABLE(CREDENTIAL_STORAGE)
+ static GRefPtr<GHashTable> createAttributeHashTableFromChallenge(const AuthenticationChallenge& challenge, const Credential& credential = Credential())
+ {
+ SoupURI* uri = soup_message_get_uri(challenge.soupMessage());
+@@ -95,9 +98,11 @@ static void credentialForChallengeAsyncReadyCallback(SecretService* service, GAs
+
+ callback(Credential(user, password, CredentialPersistencePermanent), data);
+ }
++#endif // ENABLE(CREDENTIAL_STORAGE)
+
+ void CredentialBackingStore::credentialForChallenge(const AuthenticationChallenge& challenge, CredentialForChallengeCallback callback, void* data)
+ {
++#if ENABLE(CREDENTIAL_STORAGE)
+ // The default flag only returns the most recent item, not all of them.
+ SecretSearchFlags searchFlags = static_cast<SecretSearchFlags>(SECRET_SEARCH_UNLOCK | SECRET_SEARCH_LOAD_SECRETS);
+ CredentialForChallengeAsyncReadyCallbackData* callbackData = new CredentialForChallengeAsyncReadyCallbackData;
+@@ -112,10 +117,14 @@ void CredentialBackingStore::credentialForChallenge(const AuthenticationChalleng
+ 0, // cancellable
+ reinterpret_cast<GAsyncReadyCallback>(credentialForChallengeAsyncReadyCallback),
+ callbackData);
++#else
++ callback(Credential(), data);
++#endif // ENABLE(CREDENTIAL_STORAGE)
+ }
+
+ void CredentialBackingStore::storeCredentialsForChallenge(const AuthenticationChallenge& challenge, const Credential& credential)
+ {
++#if ENABLE(CREDENTIAL_STORAGE)
+ CString utf8Password = credential.password().utf8();
+ GRefPtr<SecretValue> newSecretValue = adoptGRef(secret_value_new(utf8Password.data(), utf8Password.length(), "text/plain"));
+
+@@ -129,6 +138,7 @@ void CredentialBackingStore::storeCredentialsForChallenge(const AuthenticationCh
+ 0, // cancellable
+ 0, // callback
+ 0); // data
++#endif // ENABLE(CREDENTIAL_STORAGE)
+ }
+
+ } // namespace WebCore
+diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4
+index 517eef2..33df3a0 100644
+--- a/Source/autotools/FindDependencies.m4
++++ b/Source/autotools/FindDependencies.m4
+@@ -359,9 +359,11 @@ PKG_CHECK_MODULES([LIBSOUP], [libsoup-2.4 >= libsoup_required_version])
+ AC_SUBST([LIBSOUP_CFLAGS])
+ AC_SUBST([LIBSOUP_LIBS])
+
+-PKG_CHECK_MODULES([LIBSECRET], [libsecret-1])
+-AC_SUBST([LIBSECRET_CFLAGS])
+-AC_SUBST([LIBSECRET_LIBS])
++if test "$enable_credential_storage" = "yes"; then
++ PKG_CHECK_MODULES([LIBSECRET], [libsecret-1])
++ AC_SUBST([LIBSECRET_CFLAGS])
++ AC_SUBST([LIBSECRET_LIBS])
++fi
+
+ # Check if FreeType/FontConfig are available.
+ if test "$with_target" = "directfb"; then
+diff --git a/Source/autotools/PrintBuildConfiguration.m4 b/Source/autotools/PrintBuildConfiguration.m4
+index 0edf079..0fbfae8 100644
+--- a/Source/autotools/PrintBuildConfiguration.m4
++++ b/Source/autotools/PrintBuildConfiguration.m4
+@@ -24,6 +24,7 @@ Features:
+ SVG fonts support : $enable_svg_fonts
+ SVG support : $enable_svg
+ Spellcheck support : $enable_spellcheck
++ Credential storage support : $enable_credential_storage
+ Web Audio support : $enable_web_audio
+ WebGL : $enable_webgl
+ XSLT support : $enable_xslt
+diff --git a/Source/autotools/ReadCommandLineArguments.m4 b/Source/autotools/ReadCommandLineArguments.m4
+index 6e33483..02b7eae 100644
+--- a/Source/autotools/ReadCommandLineArguments.m4
++++ b/Source/autotools/ReadCommandLineArguments.m4
+@@ -64,6 +64,13 @@ AC_ARG_ENABLE([spellcheck],
+ [enable_spellcheck="yes"])
+ AC_MSG_RESULT([$enable_spellcheck])
+
++AC_MSG_CHECKING([whether to enable credential storage])
++AC_ARG_ENABLE([credential_storage],
++ [AS_HELP_STRING([--enable-credential-storage],[enable support for credential storage using libsecret [default=yes]])],
++ [],
++ [enable_credential_storage="yes"])
++AC_MSG_RESULT([$enable_credential_storage])
++
+ AC_ARG_ENABLE(glx,
+ AC_HELP_STRING([--enable-glx], [enable support for GLX [default=auto]]),
+ [],
+diff --git a/Source/autotools/SetupAutoconfHeader.m4 b/Source/autotools/SetupAutoconfHeader.m4
+index 8101d3c..fad82f6 100644
+--- a/Source/autotools/SetupAutoconfHeader.m4
++++ b/Source/autotools/SetupAutoconfHeader.m4
+@@ -115,4 +115,7 @@ if test "$enable_spellcheck" = "yes"; then
+ AC_DEFINE([ENABLE_SPELLCHECK], [1], [ ])
+ fi
+
++if test "$enable_credential_storage" = "yes"; then
++ AC_DEFINE([WTF_ENABLE_CREDENTIAL_STORAGE], [1], [ ])
++fi
+
+--
+1.8.2
+
diff --git a/webkitgtk-test-build-failure.patch b/webkitgtk-test-build-failure.patch
new file mode 100644
index 0000000..b1947df
--- /dev/null
+++ b/webkitgtk-test-build-failure.patch
@@ -0,0 +1,34 @@
+From 3cd3ca7c240bf56d64adf908985ffb0206a62e69 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Sun, 7 Apr 2013 18:27:47 +0200
+Subject: [PATCH] [GTK] Windows build failure after r136056
+ https://bugs.webkit.org/show_bug.cgi?id=114121
+
+* TestWebKitAPI/config.h: Make sure defines are correct for other
+ Windows ports than apple-win.
+
+diff --git a/Tools/TestWebKitAPI/config.h b/Tools/TestWebKitAPI/config.h
+index d4714cd..6fb84b3 100644
+--- a/Tools/TestWebKitAPI/config.h
++++ b/Tools/TestWebKitAPI/config.h
+@@ -47,7 +47,7 @@
+ #endif
+ #endif
+
+-#elif defined(WIN32) || defined(_WIN32)
++#elif PLATFORM(WIN)
+
+ #ifndef NOMINMAX
+ #define NOMINMAX
+@@ -66,7 +66,7 @@
+ #undef WTF_USE_CURL
+ #endif
+
+-#endif
++#endif // PLATFORM(WIN)
+
+ #include <stdint.h>
+
+--
+1.8.2
+
diff --git a/webkitgtk-wk2-includes.patch b/webkitgtk-wk2-includes.patch
new file mode 100644
index 0000000..80c826e
--- /dev/null
+++ b/webkitgtk-wk2-includes.patch
@@ -0,0 +1,37 @@
+Source/WebKit2:
+
+Remove conditional includes for the windows platform.
+
+* Shared/API/c/WKBase.h:
+* UIProcess/API/C/WKAPICast.h:
+
+diff --git a/Source/WebKit2/Shared/API/c/WKBase.h b/Source/WebKit2/Shared/API/c/WKBase.h
+index 8c243db..d7b15d0 100644
+--- a/Source/WebKit2/Shared/API/c/WKBase.h
++++ b/Source/WebKit2/Shared/API/c/WKBase.h
+@@ -29,10 +29,6 @@
+
+ #include <stdint.h>
+
+-#if (defined(WIN32) || defined(_WIN32)) && !defined(BUILDING_QT__)
+-#include <WebKit2/WKBaseWin.h>
+-#endif
+-
+ #if defined(BUILDING_GTK__)
+ #include <WebKit2/WKBaseGtk.h>
+ #endif
+diff --git a/Source/WebKit2/UIProcess/API/C/WKAPICast.h b/Source/WebKit2/UIProcess/API/C/WKAPICast.h
+index d513b96..2baa3f9 100644
+--- a/Source/WebKit2/UIProcess/API/C/WKAPICast.h
++++ b/Source/WebKit2/UIProcess/API/C/WKAPICast.h
+@@ -409,10 +409,6 @@ inline ProxyingRefPtr<WebGrammarDetail> toAPI(const WebCore::GrammarDetail& gram
+
+ } // namespace WebKit
+
+-#if (defined(WIN32) || defined(_WIN32)) && !defined(BUILDING_QT__)
+-#include "WKAPICastWin.h"
+-#endif
+-
+ #if defined(BUILDING_GTK__)
+ #include "WKAPICastGtk.h"
+ #endif
More information about the scm-commits
mailing list