diff --git a/webkit2gtk3-boo1088932-a11y-state-set.patch b/webkit2gtk3-boo1088932-a11y-state-set.patch index 7afb909..0505787 100644 --- a/webkit2gtk3-boo1088932-a11y-state-set.patch +++ b/webkit2gtk3-boo1088932-a11y-state-set.patch @@ -1,61 +1,13 @@ -Index: webkitgtk-2.21.5/Source/WebCore/accessibility/AccessibilityObject.cpp -=================================================================== ---- webkitgtk-2.21.5.orig/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-07-03 11:11:27.000000000 +0200 -+++ webkitgtk-2.21.5/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-07-24 11:54:06.402075029 +0200 -@@ -1783,7 +1783,7 @@ void AccessibilityObject::updateBackingS +diff -urp webkitgtk-2.22.6.orig/Source/WebCore/accessibility/AccessibilityObject.cpp webkitgtk-2.22.6/Source/WebCore/accessibility/AccessibilityObject.cpp +--- webkitgtk-2.22.6.orig/Source/WebCore/accessibility/AccessibilityObject.cpp 2019-02-12 16:58:51.735109641 -0600 ++++ webkitgtk-2.22.6/Source/WebCore/accessibility/AccessibilityObject.cpp 2019-02-12 17:00:53.987806344 -0600 +@@ -1780,6 +1780,9 @@ void AccessibilityObject::updateBackingS + if (!axObjectCache()) + return; + ++ if (WidgetHierarchyUpdatesSuspensionScope::isSuspended()) ++ return; ++ // Updating the layout may delete this object. RefPtr protectedThis(this); if (auto* document = this->document()) { -- if (!document->view()->layoutContext().isInRenderTreeLayout() && !document->inRenderTreeUpdate() && !document->inStyleRecalc()) -+ if (!document->view()->layoutContext().isInRenderTreeLayout() && !document->inRenderTreeUpdate() && document->isSafeToUpdateStyleOrLayout()) - document->updateLayoutIgnorePendingStylesheets(); - } - updateChildrenIfNecessary(); -Index: webkitgtk-2.21.5/Source/WebCore/dom/Document.cpp -=================================================================== ---- webkitgtk-2.21.5.orig/Source/WebCore/dom/Document.cpp 2018-07-20 08:09:06.000000000 +0200 -+++ webkitgtk-2.21.5/Source/WebCore/dom/Document.cpp 2018-07-24 11:54:06.434075417 +0200 -@@ -1936,11 +1936,10 @@ bool Document::needsStyleRecalc() const - return false; - } - --static bool isSafeToUpdateStyleOrLayout(const Document& document) -+bool Document::isSafeToUpdateStyleOrLayout() const - { - bool isSafeToExecuteScript = ScriptDisallowedScope::InMainThread::isScriptAllowed(); -- auto* frameView = document.view(); -- bool isInFrameFlattening = frameView && frameView->isInChildFrameWithFrameFlattening(); -+ bool isInFrameFlattening = view() && view()->isInChildFrameWithFrameFlattening(); - bool isAssertionDisabled = ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable(); - return isSafeToExecuteScript || isInFrameFlattening || !isInWebProcess() || isAssertionDisabled; - } -@@ -1963,7 +1962,7 @@ bool Document::updateStyleIfNeeded() - } - - // The early exit above for !needsStyleRecalc() is needed when updateWidgetPositions() is called in runOrScheduleAsynchronousTasks(). -- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this)); -+ RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout()); - - resolveStyle(); - return true; -@@ -1979,7 +1978,7 @@ void Document::updateLayout() - ASSERT_NOT_REACHED(); - return; - } -- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this)); -+ RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout()); - - RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView()); - -Index: webkitgtk-2.21.5/Source/WebCore/dom/Document.h -=================================================================== ---- webkitgtk-2.21.5.orig/Source/WebCore/dom/Document.h 2018-07-20 08:09:06.000000000 +0200 -+++ webkitgtk-2.21.5/Source/WebCore/dom/Document.h 2018-07-24 11:54:06.434075417 +0200 -@@ -1293,6 +1293,7 @@ public: - - bool inStyleRecalc() const { return m_inStyleRecalc; } - bool inRenderTreeUpdate() const { return m_inRenderTreeUpdate; } -+ WEBCORE_EXPORT bool isSafeToUpdateStyleOrLayout() const; - - void updateTextRenderer(Text&, unsigned offsetOfReplacedText, unsigned lengthOfReplacedText); - diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index df54ed0..4c213d1 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Feb 13 17:16:52 UTC 2019 - mgorse@suse.com + +- Replace webkit2gtk3-boo1088932-a11y-state-set.patch with a patch + proposed for webkit#188599. The original patch didn't always + prevent crashes. + +------------------------------------------------------------------- +Sat Feb 9 15:44:38 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 2.22.6 (boo#1124937): + + Make kinetic scrolling slow down smoothly when reaching the + ends of pages, instead of abruptly, to better match the GTK+ + behaviour. + + Fix Web inspector magnifier under Wayland. + + Fix garbled rendering of some websites (e.g. YouTube) while + scrolling under X11. + + Fix several crashes, race conditions, and rendering issues. +- CVE identifiers fixed: CVE-2019-6212, CVE-2019-6215, + CVE-2019-6216, CVE-2019-6217, CVE-2019-6226, CVE-2019-6227, + CVE-2019-6229, CVE-2019-6233, CVE-2019-6234. + ------------------------------------------------------------------- Wed Dec 26 19:21:01 UTC 2018 - bjorn.lie@gmail.com diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index ff17ecf..524cb9b 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,7 +1,7 @@ # # spec file for package webkit2gtk3 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,7 @@ %bcond_with python3 %endif Name: webkit2gtk3 -Version: 2.22.5 +Version: 2.22.6 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0-or-later AND BSD-3-Clause @@ -141,8 +141,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} diff --git a/webkitgtk-2.22.5.tar.xz b/webkitgtk-2.22.5.tar.xz deleted file mode 100644 index 7dd1c18..0000000 --- a/webkitgtk-2.22.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99d3863f418a7c3a3e37e5062950dbf2d91fb106ec1633459b0ef6f2d5f6cb13 -size 16774560 diff --git a/webkitgtk-2.22.5.tar.xz.asc b/webkitgtk-2.22.5.tar.xz.asc deleted file mode 100644 index 09f1fa2..0000000 --- a/webkitgtk-2.22.5.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCXBJw+AAKCRCRxVnb5MkS -O/WqAJwPYp+vWiAjkVDriYwwrSC2Fm65BgCfVNos7C0/Aadlmhz1cQFC40nBxSU= -=uux4 ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.22.6.tar.xz b/webkitgtk-2.22.6.tar.xz new file mode 100644 index 0000000..437d50c --- /dev/null +++ b/webkitgtk-2.22.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df90db9c0db0a2072b945fa3e1d45865922bd686c4659cce6cb5897ce357c85b +size 16773696 diff --git a/webkitgtk-2.22.6.tar.xz.asc b/webkitgtk-2.22.6.tar.xz.asc new file mode 100644 index 0000000..e30221d --- /dev/null +++ b/webkitgtk-2.22.6.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCXF4JYQAKCRCRxVnb5MkS +O9fHAJ4xZgDEcTRUs/HzDghjQ7cyVzj4bQCePjVj9Xq4LRHe/SbFxle1pCpj7zc= +=/gCH +-----END PGP SIGNATURE-----