[gnome-build-meta/mcatanzaro/webkitgtk-2-29-1] Upgrade to WebKitGTK 2.29.1



commit f14c6f567058e29d57d433e6ea22e07153b420aa
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon May 18 09:22:24 2020 -0500

    Upgrade to WebKitGTK 2.29.1
    
    Drop the Cortex A53 workaround:
    https://trac.webkit.org/changeset/260680/webkit
    
    Add libsystemd dependency:
    https://trac.webkit.org/changeset/258547/webkit
    
    Fix ARM build where we use ENABLE_GLES2:
    https://bugs.webkit.org/show_bug.cgi?id=212043

 elements/sdk/WebKitGTK.bst              |  8 ++++----
 files/webkitgtk/webkit-bug-212043.patch | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/elements/sdk/WebKitGTK.bst b/elements/sdk/WebKitGTK.bst
index 1f8923de..cfd29082 100644
--- a/elements/sdk/WebKitGTK.bst
+++ b/elements/sdk/WebKitGTK.bst
@@ -1,7 +1,9 @@
 kind: cmake
 sources:
 - kind: tar
-  url: webkitgtk_org:webkitgtk-2.28.2.tar.xz
+  url: webkitgtk_org:webkitgtk-2.29.1.tar.xz
+- kind: patch
+  path: files/webkitgtk/webkit-bug-212043.patch
 - kind: patch
   path: files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
 - kind: local
@@ -37,6 +39,7 @@ depends:
 - freedesktop-sdk.bst:components/libwebp.bst
 - freedesktop-sdk.bst:components/libxslt.bst
 - freedesktop-sdk.bst:components/openjpeg.bst
+- freedesktop-sdk.bst:components/systemd-libs.bst
 - freedesktop-sdk.bst:components/wayland.bst
 - freedesktop-sdk.bst:components/xorg-lib-xt.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
@@ -49,9 +52,6 @@ variables:
   - arch == "arm":
       webkitgtk_arch_options: >-
         -DENABLE_GLES2=ON
-  - arch == "aarch64":
-      webkitgtk_arch_options: >-
-        -DWTF_CPU_ARM64_CORTEXA53:BOOL=OFF
   cmake-local: >-
     -DPORT=GTK
     -DENABLE_BUBBLEWRAP_SANDBOX=OFF
diff --git a/files/webkitgtk/webkit-bug-212043.patch b/files/webkitgtk/webkit-bug-212043.patch
new file mode 100644
index 00000000..c058fa71
--- /dev/null
+++ b/files/webkitgtk/webkit-bug-212043.patch
@@ -0,0 +1,10 @@
+--- a/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp  
++++ a/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp  
+@@ -66,7 +66,7 @@ static GstGLDisplay* createGstGLDisplay(const PlatformDisplay& sharedDisplay)
+         return 
GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
+ #elif USE(EGL)
+     if (is<PlatformDisplayX11>(sharedDisplay))
+-        return 
GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatfomDisplayX11>(sharedDisplay).eglDisplay()));
++        return 
GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).eglDisplay()));
+ #endif
+ #endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]