packages/webkit2gtk3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!52 Update to 2.36.3

Browse Source 
From: @kerongw 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2022-06-28 08:19:13 +00:00 committed by Gitee
commit 26c59a9342
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 35 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
backport-CVE-2022-30293-CVE-2022-30294.patch
View File

@ -1,87 +0,0 @@
From: Miguel Gomez <magomez@igalia.com>
Date: 2022-03-22
Subject: [PATCH] backport-CVE-2022-30293-CVE-2022-30294.patch
Ensure that proxies are invalidated before destroying them.
https://bugs.webkit.org/show_bug.cgi?id=237187
Reference:https://bugs.webkit.org/attachment.cgi?id=455361&action=prettypatch
---
.../CoordinatedGraphicsScene.cpp | 26 ++++++++++++++++---
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp b/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
index cb276223..372021a6 100644
--- a/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
+++ b/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
@@ -230,10 +230,11 @@ void CoordinatedGraphicsScene::updateSceneState()
};
Vector<ImageBacking> imageBacking;
} layersByBacking;
+ HashSet<Ref<WebCore::TextureMapperPlatformLayerProxy>> replacedProxiesToInvalidate;
// Access the scene state and perform state update for each layer.
m_nicosia.scene->accessState(
- [this, &layersByBacking](Nicosia::Scene::State& state)
+ [this, &layersByBacking, &replacedProxiesToInvalidate](Nicosia::Scene::State& state)
{
// FIXME: try to minimize the amount of work in case the Scene::State object
// didn't change (i.e. no layer flush was done), but don't forget to properly
@@ -250,12 +251,24 @@ void CoordinatedGraphicsScene::updateSceneState()
}
}
- // Gather all the to-be-removed layers so that composition-side state
- // can be properly purged after the current state's set of layers is adopted.
HashSet<RefPtr<Nicosia::CompositionLayer>> removedLayers;
for (auto& layer : m_nicosia.state.layers) {
+ // Gather all the to-be-removed layers so that composition-side state
+ // can be properly purged after the current state's set of layers is adopted.
if (!state.layers.contains(layer))
removedLayers.add(layer);
+ else {
+ // Store references to all the proxies that are being used by the layers that are kept in the tree.
+ // When adopting the new state, the existent proxies may be replaced or detached from their layers, causing the
+ // reference to be lost without having a chance to invalidate them. After the call to commitState, we will
+ // invalidate all the proxies that are not being used anymore.
+ layer->accessCommitted(
+ [&replacedProxiesToInvalidate](const Nicosia::CompositionLayer::LayerState& committed)
+ {
+ if (committed.contentLayer)
+ replacedProxiesToInvalidate.add(Ref { contentLayerImpl(*committed.contentLayer).proxy() });
+ });
+ }
}
m_nicosia.state = state;
@@ -270,7 +283,7 @@ void CoordinatedGraphicsScene::updateSceneState()
for (auto& compositionLayer : m_nicosia.state.layers) {
auto& layer = texmapLayer(*compositionLayer);
compositionLayer->commitState(
- [&layer, &layersByBacking]
+ [&layer, &layersByBacking, &replacedProxiesToInvalidate]
(const Nicosia::CompositionLayer::LayerState& layerState)
{
if (layerState.delta.positionChanged)
@@ -346,6 +359,7 @@ void CoordinatedGraphicsScene::updateSceneState()
auto& impl = contentLayerImpl(*layerState.contentLayer);
layersByBacking.contentLayer.append(
{ std::ref(layer), std::ref(impl.proxy()), layerState.delta.contentLayerChanged });
+ replacedProxiesToInvalidate.remove(Ref { impl.proxy() });
} else if (layerState.imageBacking) {
auto& impl = imageBackingImpl(*layerState.imageBacking);
layersByBacking.imageBacking.append(
@@ -407,6 +421,10 @@ void CoordinatedGraphicsScene::updateSceneState()
for (auto& proxy : proxiesForSwapping)
proxy->swapBuffer();
+
+ for (auto& proxy : replacedProxiesToInvalidate)
+ proxy->invalidate();
+ replacedProxiesToInvalidate = { };
}
void CoordinatedGraphicsScene::ensureRootLayer()
--
2.33.0

37
webkit2gtk3.spec
View File

@ -6,18 +6,20 @@
%bcond_without docs
%endif
#Basic Information
Name: webkit2gtk3
Version: 2.32.1
Release: 3
Version: 2.36.3
Release: 1
Summary: GTK+ Web content engine library
License: LGPLv2
URL: http://www.webkitgtk.org/
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
URL: https://www.webkitgtk.org/
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
Patch6000: backport-CVE-2022-30293-CVE-2022-30294.patch
#Patch0: aarch64-page-size.patch
#Patch6000: backport-CVE-2021-42762.patch
#Patch6001: backport-CVE-2022-30293-CVE-2022-30294.patch
#Dependency
BuildRequires: at-spi2-core-devel bison cairo-devel cmake enchant2-devel
@ -30,14 +32,16 @@ BuildRequires: gtk3-devel gtk-doc geoclue2-devel libjpeg-turbo-devel
BuildRequires: harfbuzz-devel hyphen-devel bubblewrap xdg-dbus-proxy
BuildRequires: libatomic libicu-devel libjpeg-devel libnotify-devel
BuildRequires: libpng-devel libsecret-devel libsoup-devel libwebp-devel
BuildRequires: libxslt-devel libXt-devel libwayland-client-devel
BuildRequires: libxslt-devel libXt-devel libwayland-client-devel wayland-protocols-devel
BuildRequires: libwayland-egl-devel libwayland-server-devel openjpeg2-devel
BuildRequires: mesa-libEGL-devel mesa-libGL-devel libglvnd-devel
BuildRequires: pcre-devel perl-File-Copy-Recursive perl-JSON-PP perl-Switch
BuildRequires: python3 ruby rubygems sqlite-devel upower-devel woff2-devel pkgconfig(libsystemd)
BuildRequires: perl lcms2-devel libgcrypt-devel libtasn1-devel wayland-devel
#BuildRequires: pkgconfig(manette-0.2)
Requires: geoclue2 bubblewrap xdg-dbus-proxy
Requires: webkit2gtk3-jsc = %{version}-%{release}
Recommends: xdg-desktop-portal-gtk
Recommends: xdg-desktop-portal-gtk gstreamer1-plugins-bad-free gstreamer1-plugins-good
Provides: bundled(angle)
Provides: bundled(xdgmime)
@ -121,6 +125,7 @@ pushd %{_target_platform}
-DENABLE_GTKDOC=ON \
%endif
-DENABLE_MINIBROWSER=ON \
-DUSE_SOUP2=ON \
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-DENABLE_GAMEPAD=OFF \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
@ -187,6 +192,7 @@ done
%files jsc-devel
%{_libexecdir}/webkit2gtk-4.0/jsc
%dir %{_includedir}/webkitgtk-4.0
%{_includedir}/webkitgtk-4.0/jsc/
%{_includedir}/webkitgtk-4.0/JavaScriptCore/
%{_libdir}/libjavascriptcoregtk-4.0.so
%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
@ -203,9 +209,21 @@ done
%endif
%changelog
* Mon Jun 06 2022 zhanzhimin<zhanzhimin@h-partners.com> - 2.32.1-3
* Mon Jun 13 2022 lin zhang <lin.zhang@turbolinux.com.cn> 2.36.3-1
- Update to 2.36.3
* Fri Jun 10 2022 zhujunhao<zhujunhao11@huawei.com> - 2.32.4-4
- add wayland-porotocols-devel buildrequires
* Tue Jun 07 2022 houjinchang<houjinchang@huawei.com> - 2.32.4-3
- fix CVE-2022-30293 and CVE-2022-30294
* Thu Nov 04 2021 liuyumeng<liuyumeng5@huawei.com> - 2.32.4-2
- fix CVE-2021-42762
* Fri Oct 22 2021 zhanzhimin<zhanzhimin@huawei.com> - 2.32.4-1
- upgrade to 2.32.4
* Thu Jul 29 2021 wangkerong<wangkerong@huawei.com> - 2.32.1-2
- change xdg-desktop-protal-gts dependences
@ -250,4 +268,3 @@ done
* Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.22.2-1
- Package init

2
webkit2gtk3.yaml
View File

@ -1,5 +1,5 @@
version_control: NA
src_repo:
tag_prefix:
seperator:
separator:
url: https://www.webkitgtk.org/releases/

BIN
webkitgtk-2.32.1.tar.xz.asc
View File

Binary file not shown.

BIN
webkitgtk-2.32.1.tar.xz → webkitgtk-2.36.3.tar.xz
View File

Binary file not shown.

6
webkitgtk-2.36.3.tar.xz.asc Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYpHpvAAKCRCRxVnb5MkS
O27PAJ9ptAQKzmWX16VWJ1yyn/CaHwKJ8QCfV5gesH/nXmV7IsZn5vv+jDixo58=
=AWMS
-----END PGP SIGNATURE-----