From 89fc9c397e3f073cbae00269d6de04be03a013847076b50d34d02dba66dad645 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 Sep 2017 18:23:10 +0000 Subject: [PATCH] Accepting request 523346 from GNOME:Next Add back patch.. Not fixed yet OBS-URL: https://build.opensuse.org/request/show/523346 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=123 --- webkit2gtk3-no-return-in-nonvoid.patch | 13 +++++++++++++ webkit2gtk3.changes | 1 - webkit2gtk3.spec | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 webkit2gtk3-no-return-in-nonvoid.patch diff --git a/webkit2gtk3-no-return-in-nonvoid.patch b/webkit2gtk3-no-return-in-nonvoid.patch new file mode 100644 index 0000000..afafb37 --- /dev/null +++ b/webkit2gtk3-no-return-in-nonvoid.patch @@ -0,0 +1,13 @@ +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(*algorithm).dictionary(); + } ++ ++ RELEASE_ASSERT_NOT_REACHED(); + } + + auto CryptoKey::usages() const -> Vector diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 391d08b..a457eda 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -10,7 +10,6 @@ Mon Sep 11 08:07:29 UTC 2017 - zaitor@opensuse.org + 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 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 6bfc83d..f38ccb1 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -36,6 +36,8 @@ 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 @@ -235,6 +237,7 @@ more. %prep %setup -q -n webkitgtk-%{version} %patch0 -p1 +%patch1 -p1 %build # Use linker flags to reduce memory consumption