[gnome-build-meta/mcatanzaro/WebKitGTK-gnome-3-30] Update to WebKitGTK 2.24.0



commit 64edf28004838da4ce4e343bfbc69439a2cd5db8
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Mar 14 10:24:25 2019 -0500

    Update to WebKitGTK 2.24.0

 elements/sdk/WebKitGTK+.bst                            | 18 +++++++-----------
 .../gtk-doc-introspection-cross-compiling.patch        | 16 ----------------
 2 files changed, 7 insertions(+), 27 deletions(-)
---
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index c551349a..7b8559ef 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -1,10 +1,8 @@
 kind: cmake
 sources:
 - kind: tar
-  url: webkitgtk_org:webkitgtk-2.22.4.tar.xz
-  ref: fab5be2883802352ae0e735dd1eff4bc18abaff7ac78689cec72eb2f611943b8
-- kind: patch
-  path: files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
+  url: webkitgtk_org:webkitgtk-2.24.0.tar.xz
+  ref: 2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407
 - kind: local
   path: files/webkitgtk/toolchain.i386
 - kind: local
@@ -40,16 +38,14 @@ depends:
 variables:
   webkitgtk_toolchain: ''
   (?):
-    - arch == "i686":
-        webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.i386
-    - arch == "arm":
-        webkitgtk_toolchain: -DCMAKE_TOOLCHAIN_FILE=toolchain.arm
-  cmake-local: -DPORT=GTK -DENABLE_PLUGIN_PROCESS_GTK2=OFF %{webkitgtk_toolchain}
+    - arch == "i686" or arch == "arm":
+        webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
+  cmake-local: -DPORT=GTK -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DUSE_OPENJPEG=OFF %{webkitgtk_toolchain}
 (?):
-- arch == "i686":
+- arch == "i686" or arch == "arm":
     environment:
       CFLAGS: '-g1'
       CXXFLAGS: '-g1'
 public:
   cpe:
-    product: webkitgtk+
\ No newline at end of file
+    product: webkitgtk+


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