[gnome-build-meta/mcatanzaro/webkit-2-24-2: 2/2] sdk: Update to WebKitGTK 2.24.2



commit 97a89f524c4921c184cb191cd97321a79c090ffa
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Fri May 17 15:39:23 2019 -0500

    sdk: Update to WebKitGTK 2.24.2
    
    We need to propagate SSE flags in from project.conf to make this work.

 elements/sdk/WebKitGTK.bst                         |  14 +-
 files/webkitgtk/webkitgtk-2-24-1-revert-sse2.patch | 159 ---------------------
 2 files changed, 8 insertions(+), 165 deletions(-)
---
diff --git a/elements/sdk/WebKitGTK.bst b/elements/sdk/WebKitGTK.bst
index c92aabb5..f3f9bffa 100644
--- a/elements/sdk/WebKitGTK.bst
+++ b/elements/sdk/WebKitGTK.bst
@@ -1,9 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: webkitgtk_org:webkitgtk-2.24.1.tar.xz
-- kind: patch
-  path: files/webkitgtk/webkitgtk-2-24-1-revert-sse2.patch
+  url: webkitgtk_org:webkitgtk-2.24.2.tar.xz
 - kind: patch
   path: files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
 - kind: local
@@ -61,10 +59,14 @@ variables:
     -DENABLE_BUBBLEWRAP_SANDBOX=OFF
     %{webkitgtk_toolchain}
 (?):
-- arch == "i686" or arch == "arm":
+- arch == "i686":
+    environment:
+      CFLAGS: '%{flags_i686} -g1'
+      CXXFLAGS: '%{flags_i686} -g1'
+- arch == "arm":
     environment:
-      CFLAGS: '-g1'
-      CXXFLAGS: '-g1'
+      CFLAGS: '%{flags_arm} -g1'
+      CXXFLAGS: '%{flags_arm} -g1'
 public:
   cpe:
     product: webkitgtk+


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