diff --git a/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.0-typedef-WebKitWebView.patch b/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.0-typedef-WebKitWebView.patch new file mode 100644 index 0000000000..fd97b350a7 --- /dev/null +++ b/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.0-typedef-WebKitWebView.patch @@ -0,0 +1,28 @@ +Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h +=================================================================== +--- Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h (revision 109222) ++++ Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h (revision 109329) +@@ -34,4 +34,6 @@ + + typedef struct _WebKitPrintOperation WebKitPrintOperation; ++typedef struct _WebKitFindController WebKitFindController; ++typedef struct _WebKitWebView WebKitWebView; + + #ifdef G_OS_WIN32 +@@ -47,6 +49,3 @@ + #endif + +-typedef struct _WebKitFindController WebKitFindController; +-typedef struct _WebKitWebView WebKitWebView; +- + #endif // WebKitDefines_h +Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h +=================================================================== +--- Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (revision 109222) ++++ Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (revision 109329) +@@ -49,5 +49,4 @@ + #define WEBKIT_WEB_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass)) + +-typedef struct _WebKitWebView WebKitWebView; + typedef struct _WebKitWebViewClass WebKitWebViewClass; + typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate; diff --git a/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch b/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch new file mode 100644 index 0000000000..ff2f5ae5d7 --- /dev/null +++ b/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch @@ -0,0 +1,20 @@ +From: Mikhail Khokhlov + +https://bugs.webkit.org/show_bug.cgi?id=84526 + +Index: Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm +=================================================================== +--- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (revision 115562) ++++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (working copy) +@@ -1444,9 +1444,10 @@ + print IMPL "namespace WebKit {\n\n"; + print IMPL @cBodyPriv; + print IMPL "} // namespace WebKit\n\n"; ++ ++ print IMPL @cBodyProperties; + print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString; + +- print IMPL @cBodyProperties; + print IMPL @cBody; + + close(IMPL); diff --git a/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-gst-required-version.patch b/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-gst-required-version.patch new file mode 100644 index 0000000000..1e6afa8266 --- /dev/null +++ b/srcpkgs/webkit-gtk3/patches/webkit-gtk-1.8.1-gst-required-version.patch @@ -0,0 +1,29 @@ +2012-05-01 Landry Breuil + + [GTK] Fix gstreamer detection during configure + https://bugs.webkit.org/show_bug.cgi?id=84325 + + Reviewed by Philippe Normand. + + * configure.ac: Fix GSTREAMER_REQUIRED_VERSION and + GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION assignments. + +Index: /trunk/configure.ac +=================================================================== +--- configure.ac (revision 115666) ++++ configure.ac (revision 115737) +@@ -343,10 +343,10 @@ + + case "$with_gstreamer" in +- 0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION +- GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION ++ 0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION ++ GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION + GST_API_VERSION=0.10 + ;; +- 0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION +- GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION ++ 0.11) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_11_REQUIRED_VERSION ++ GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION + GST_API_VERSION=0.11 + ;; diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template index ea1ca7b787..aed61a662d 100644 --- a/srcpkgs/webkit-gtk3/template +++ b/srcpkgs/webkit-gtk3/template @@ -24,12 +24,12 @@ long_desc=" This is the GTK3+ port of the engine." do_configure() { + sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am autoreconf -fi -I Source/autotools - local args="--enable-video --enable-jit --enable-dependency-tracking \ + local args="--enable-jit --enable-dependency-tracking \ --with-font-backend=freetype --enable-introspection \ --with-unicode-backend=icu --disable-schemas-compile \ - --with-accelerated-compositing=opengl --enable-web-sockets \ ${CONFIGURE_SHARED_ARGS}" for ver in 2 3; do