Accepting request 522983 from GNOME:Next

New stable rel, please wait for this to build before ack

OBS-URL: https://build.opensuse.org/request/show/522983
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=122

webkit2gtk3-no-return-in-nonvoid.patch

@@ -1,13 +0,0 @@
-Index: webkitgtk-2.17.92/Source/WebCore/crypto/CryptoKey.cpp
-===================================================================
---- webkitgtk-2.17.92.orig/Source/WebCore/crypto/CryptoKey.cpp
-+++ webkitgtk-2.17.92/Source/WebCore/crypto/CryptoKey.cpp
-@@ -67,6 +67,8 @@ auto CryptoKey::algorithm() const -> Alg
-     case KeyAlgorithmClass::Raw:
-         return downcast<RawKeyAlgorithm>(*algorithm).dictionary();
-     }
-+
-+    RELEASE_ASSERT_NOT_REACHED();
- }
- 
- auto CryptoKey::usages() const -> Vector<CryptoKeyUsage>

webkit2gtk3.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Sep 11 08:07:29 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 2.18.0:
+  + Initial WebDriver support.
+  + New remote inspector infrastructure.
+  + WebCrypto API support is now enabled by default.
+  + GStreamerGL is enabled by default when building with GStreamer
+    >= 1.10.
+  + Kinetic scrolling support.
+  + New API to create a WebKitContextMenuItem from a GAction.
+  + New API to allow overriding the popup menu of select elements.
+- Drop webkit2gtk3-no-return-in-nonvoid.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Thu Sep  7 10:17:51 UTC 2017 - dimstar@opensuse.org
 

webkit2gtk3.spec

@@ -26,7 +26,7 @@
 %define _pkgconfig_suffix gtk-3.0
 %define _name webkitgtk
 Name:           webkit2gtk3
-Version:        2.17.92
+Version:        2.18.0
 Release:        0
 Summary:        Library for rendering web content, GTK+ Port
 License:        LGPL-2.0+ AND BSD-3-Clause
@@ -36,8 +36,6 @@ Source:         http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE webkitgtk-typelib-sharelib-link.patch dimstar@opensuse.org -- Fixup the .gir file to contain the full library name for libjavascriptcore.
 Patch0:         webkitgtk-typelib-sharelib-link.patch
-# PATCH-FIX-UPSTREAM webkit2gtk3-no-return-in-nonvoid.patch webkit£318374 dimstar@opensuse.org -- Fix "control reaches end of non-void function"
-Patch1:         webkit2gtk3-no-return-in-nonvoid.patch
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  Mesa-libGLESv1_CM-devel
@@ -104,8 +102,8 @@ more.
 
 %package -n libwebkit2gtk%{_wk2sover}
 Summary:        Library for rendering web content, GTK+ Port
-Group:          System/Libraries
 # Require the injected bundles. The bundles are dlopen()ed
+Group:          System/Libraries
 Requires:       webkit2gtk-4_0-injected-bundles
 Recommends:     %{_pkgname_no_slpp}-lang
 Provides:       %{_pkgname_no_slpp} = %{version}
@@ -237,7 +235,6 @@ more.
 %prep
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 # Use linker flags to reduce memory consumption

webkitgtk-2.17.92.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e22478a1631fdbd2b9ca1622bcd51ec296e04cbe7c5f480b482450f91cabff34
-size 14705696

webkitgtk-2.18.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d
+size 14758272