From d6ba164883975b2b6aed04493a6d4af3537c380d132074254b3465498c68deef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 7 Sep 2017 16:43:11 +0000 Subject: [PATCH] Accepting request 522085 from GNOME:Next Sub rebased patch... OBS-URL: https://build.opensuse.org/request/show/522085 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=121 --- webkit2gtk3-no-return-in-nonvoid.patch | 29 +++++--------------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/webkit2gtk3-no-return-in-nonvoid.patch b/webkit2gtk3-no-return-in-nonvoid.patch index 833646a..afafb37 100644 --- a/webkit2gtk3-no-return-in-nonvoid.patch +++ b/webkit2gtk3-no-return-in-nonvoid.patch @@ -1,6 +1,8 @@ ---- a/Source/WebCore/crypto/CryptoKey.cpp -+++ a/Source/WebCore/crypto/CryptoKey.cpp -@@ -67,6 +67,8 @@ auto CryptoKey::algorithm() const -> AlgorithmVariant +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(); } @@ -9,24 +11,3 @@ } auto CryptoKey::usages() const -> Vector ---- 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& usages) -@@ -476,6 +478,8 @@ static std::optional toKeyData(SubtleCrypto::KeyFormat format, SubtleCr - } - ); - } -+ -+ RELEASE_ASSERT_NOT_REACHED(); - } - - static Vector copyToVector(BufferSource&& data) -