Accepting request 521971 from GNOME:Next

- Add webkit2gtk3-no-return-in-nonvoid.patch: Fix brp error based

Note: the patch is BASED on the one from bugzilla, but the one there does not apply cleanly... so this is a derivate

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

webkit2gtk3-no-return-in-nonvoid.patch

@@ -0,0 +1,32 @@
+--- a/Source/WebCore/crypto/CryptoKey.cpp	
++++ a/Source/WebCore/crypto/CryptoKey.cpp	
+@@ -67,6 +67,8 @@ auto CryptoKey::algorithm() const -> AlgorithmVariant
+     case KeyAlgorithmClass::Raw:
+         return downcast<RawKeyAlgorithm>(*algorithm).dictionary();
+     }
++
++    RELEASE_ASSERT_NOT_REACHED();
+ }
+ 
+ auto CryptoKey::usages() const -> Vector<CryptoKeyUsage>
+--- a/Source/WebCore/crypto/SubtleCrypto.cpp	
++++ a/Source/WebCore/crypto/SubtleCrypto.cpp	
+@@ -394,6 +394,8 @@ static CryptoKeyUsageBitmap toCryptoKeyUsageBitmap(CryptoKeyUsage usage)
+     case CryptoKeyUsage::UnwrapKey:
+         return CryptoKeyUsageUnwrapKey;
+     }
++
++    RELEASE_ASSERT_NOT_REACHED();
+ }
+ 
+ static CryptoKeyUsageBitmap toCryptoKeyUsageBitmap(const Vector<CryptoKeyUsage>& usages)
+@@ -476,6 +478,8 @@ static std::optional<KeyData> toKeyData(SubtleCrypto::KeyFormat format, SubtleCr
+             }
+         );
+     }
++
++    RELEASE_ASSERT_NOT_REACHED();
+ }
+ 
+ static Vector<uint8_t> copyToVector(BufferSource&& data)
+

webkit2gtk3.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Sep  7 10:17:51 UTC 2017 - dimstar@opensuse.org
+
+- Add webkit2gtk3-no-return-in-nonvoid.patch: Fix brp error based
+  on "warning: control reaches end of non-void function".
+
+-------------------------------------------------------------------
+Mon Sep  4 15:25:11 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 2.17.92:
+  + Improve CPU usage when rendering under Wayland in accelerated
+    compositing mode.
+  + Improve the memory consumption of the UI process under Wayland.
+  + Fix rendering issues in some web sites with accelerated
+    compositing enabled.
+  + Fix a web process crash when closing the WebView.
+  + Initialize libgcrypt in the network process too.
+  + Show controls if a video element isn’t allowed to play inline.
+  + Add support for cookies and screenshots commands in WebDriver.
+  + Fix several crashes and rendering issues.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Sun Aug 20 20:50:58 UTC 2017 - zaitor@opensuse.org
 

webkit2gtk3.spec

@@ -26,38 +26,32 @@
 %define _pkgconfig_suffix gtk-3.0
 %define _name webkitgtk
 Name:           webkit2gtk3
-Version:        2.17.91
+Version:        2.17.92
 Release:        0
 Summary:        Library for rendering web content, GTK+ Port
-License:        LGPL-2.0+ and BSD-3-Clause
+License:        LGPL-2.0+ AND BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Url:            http://webkitgtk.org/
 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
-%ifnarch s390 s390x
+# PATCH-FIX-UPSTREAM webkit2gtk3-no-return-in-nonvoid.patch webkit£318374 dimstar@opensuse.org -- Fix "control reaches end of non-void function"
-BuildRequires:  binutils-gold
+Patch1:         webkit2gtk3-no-return-in-nonvoid.patch
-%endif
-BuildRequires:  bison >= 2.3
-BuildRequires:  cmake
-%if 0%{?suse_version} == 1315
-BuildRequires:  gcc6-c++
-#!BuildIgnore:  libgcc_s1
-%else
-BuildRequires:  gcc-c++ >= 4.9
-%endif
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  Mesa-libGLESv1_CM-devel
 BuildRequires:  Mesa-libGLESv2-devel
 BuildRequires:  Mesa-libGLESv3-devel
+BuildRequires:  bison >= 2.3
+BuildRequires:  cmake
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gperf >= 3.0.1
 BuildRequires:  hyphen-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  perl >= 5.10.0
+BuildRequires:  pkgconfig
 BuildRequires:  python >= 2.6.0
 BuildRequires:  ruby >= 1.8.7
 BuildRequires:  pkgconfig(atk)
@@ -72,10 +66,6 @@ BuildRequires:  pkgconfig(gnutls) >= 3.0.0
 BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.0.3
 BuildRequires:  pkgconfig(gstreamer-gl-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
-%if 0%{?is_opensuse}
-# We require gtk2 for the Gtk2 plugin wrapper
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
-%endif
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.12.0
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(harfbuzz) >= 0.9.2
@@ -89,7 +79,19 @@ BuildRequires:  pkgconfig(libxslt) >= 1.1.7
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%ifnarch s390 s390x
+BuildRequires:  binutils-gold
+%endif
+%if 0%{?suse_version} == 1315
+BuildRequires:  gcc6-c++
+#!BuildIgnore:  libgcc_s1
+%else
+BuildRequires:  gcc-c++ >= 4.9
+%endif
+%if 0%{?is_opensuse}
+# We require gtk2 for the Gtk2 plugin wrapper
+BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
+%endif
 
 %description
 WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -103,10 +105,10 @@ more.
 %package -n libwebkit2gtk%{_wk2sover}
 Summary:        Library for rendering web content, GTK+ Port
 Group:          System/Libraries
-Provides:       %{_pkgname_no_slpp} = %{version}
-Recommends:     %{_pkgname_no_slpp}-lang
 # Require the injected bundles. The bundles are dlopen()ed
 Requires:       webkit2gtk-4_0-injected-bundles
+Recommends:     %{_pkgname_no_slpp}-lang
+Provides:       %{_pkgname_no_slpp} = %{version}
 
 %description -n libwebkit2gtk%{_wk2sover}
 WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -235,6 +237,7 @@ more.
 %prep
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Use linker flags to reduce memory consumption

webkitgtk-2.17.91.tar.xz

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

webkitgtk-2.17.92.tar.xz

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