Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7226 from Rmys/master

Browse Source 
qt5-5.13.2:ver.bump
This commit is contained in:
Rmys
2019-11-03 18:14:42 +03:00
committed by GitHub
parent 849cee3721 b8deb1dc15
commit a31f571257
4 changed files with 124 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-quickcontrols2/pspec.xml
+18 -11
View File
@@ -11,14 +11,14 @@
<Summary>Next generation user interface controls based on Qt Quick</Summary>
<Description>Next generation user interface controls based on Qt Quick</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="f12b842112846218b237c4cfb1e206e8ca31e1ee" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtquickcontrols2-everywhere-src-5.13.1.tar.xz</Archive>
<Archive sha1sum="b23d9504429c713b8aee80a4ed9f01e6ce95721a" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtquickcontrols2-everywhere-src-5.13.2.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-graphicaleffects</Dependency>
<Dependency versionFrom="5.13.1">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-graphicaleffects</Dependency>
<Dependency versionFrom="5.13.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sql-sqlite</Dependency>
</BuildDependencies>
</Source>
@@ -26,8 +26,8 @@
<Name>qt5-quickcontrols2</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.13.1">qt5-base</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -40,7 +40,7 @@
<Name>qt5-quickcontrols2-devel</Name>
<RuntimeDependencies>
<Dependency release="current">qt5-quickcontrols2</Dependency>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
@@ -51,7 +51,7 @@
<Package>
<Name>qt5-quickcontrols2-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.13.1">qt5-base</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
@@ -59,6 +59,13 @@
</Package>
<History>
<Update release="18">
<Date>2019-11-02</Date>
<Version>5.13.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="17">
<Date>2019-09-05</Date>
<Version>5.13.1</Version>
desktop/toolkit/qt5/qt5-webengine/files/CVE-2019-13720.patch
+55
View File
@@ -0,0 +1,55 @@
From d6e5fc10e417efdf8665d9fba57c269f0534072f Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 1 Nov 2019 11:10:31 +0100
Subject: [Backport] Fix for CVE-2019-13720
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Obtain graph/process lock when nullifying the buffer in Reverb
When the buffer is set to `null` while there is an active buffer
within a reverb object, SetBuffer() function can prematurely
nullify the `reverb_` and `shared_buffer_` while it is still
being accessed by the rendering thread.
This CL adds two locks (graph lock and process lock) when the
buffer gets nullified to ensure the synchronization between
two threads.
(cherry picked from commit 6a2e670a243b815cf043f8da4d26ecb9a64d307b)
Change-Id: I8f501b6a16b3c7e16db767e0b279a1a53d6eb290
Bug: 1019226
Reviewed-on:
https://chromium-review.googlesource.com/c/chromium/src/+/1888103
Commit-Queue: Hongchan Choi <hongchan@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#710627}
Reviewed-on:
https://chromium-review.googlesource.com/c/chromium/src/+/1889510
Reviewed-by: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/branch-heads/3953@{#8}
Cr-Branched-From:
b5ceb94d4b9a2f629c84df1be72f9e3d0a79fd2d-refs/heads/master@{#710313}
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc b/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc
index a0c05beab71..066ed521d09 100644
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc
@@ -95,6 +95,8 @@ void ConvolverHandler::SetBuffer(AudioBuffer* buffer,
DCHECK(IsMainThread());
if (!buffer) {
+ BaseAudioContext::GraphAutoLocker context_locker(Context());
+ MutexLocker locker(process_lock_);
reverb_.reset();
buffer_ = buffer;
return;
--
cgit v1.2.1
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+25 -18
View File
@@ -11,15 +11,15 @@
<Summary>Provides support for web applications using the Chromium browser project</Summary>
<Description>Provides support for web applications using the Chromium browser project</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="163f9927d5f0357a5e551f4eb929568cd6d3de32" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtwebengine-everywhere-src-5.13.1.tar.xz</Archive>
<Archive sha1sum="490436314065f2f93510b3f00ecd9f162fa5cd67" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebengine-everywhere-src-5.13.2.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-designer-devel</Dependency>
<Dependency>bison</Dependency>
<Dependency>re2-devel</Dependency>
<Dependency>re2c</Dependency>
@@ -75,7 +75,7 @@
<Dependency>poppler-cpp-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">qtbug-77037-workaround.patch</Patch>
<Patch level="1">CVE-2019-13720.patch</Patch>
<!-- <Patch level="1">qtbug-69605.patch</Patch> -->
</Patches>
</Source>
@@ -115,7 +115,7 @@
<Dependency>libopus</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libvpx</Dependency>
<Dependency versionFrom="5.13.1">qt5-base</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>libevent</Dependency>
@@ -125,11 +125,11 @@
<Dependency>libXScrnSaver</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="5.13.1">qt5-location</Dependency>
<Dependency versionFrom="5.13.2">qt5-location</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency versionFrom="5.13.1">qt5-webchannel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.13.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative</Dependency>
<Dependency>zlib</Dependency>
<Dependency>minizip</Dependency>
<Dependency>protobuf</Dependency>
@@ -146,17 +146,17 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt5-webengine</Dependency>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-webchannel-devel</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>qt5-webengine-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.13.1">qt5-base</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
@@ -164,6 +164,13 @@
</Package>
<History>
<Update release="15">
<Date>2019-11-02</Date>
<Version>5.13.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2019-09-26</Date>
<Version>5.13.1</Version>
desktop/toolkit/qt5/qt5-webkit/pspec.xml
+26 -19
View File
@@ -13,17 +13,17 @@
<License>LGPLv2.1-linking-exception</License>
<Archive type="tarxz" sha1sum="dd17b3884ccc20c9fce0f151738f923ec8cd147b">https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha3/qtwebkit-5.212.0-alpha3.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-linguist</Dependency>
<Dependency versionFrom="5.13.1">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.13.1">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-linguist</Dependency>
<Dependency versionFrom="5.13.2">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.13.2">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency>cmake</Dependency>
<Dependency>libXtst-devel</Dependency>
@@ -79,7 +79,7 @@
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<RuntimeDependencies>
<Dependency versionFrom="5.13.1">qt5-base</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency>mesa</Dependency>
<Dependency>webp</Dependency>
<Dependency>zlib</Dependency>
@@ -92,16 +92,16 @@
<Dependency>libxml2</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="5.13.1">qt5-sensors</Dependency>
<Dependency versionFrom="5.13.1">qt5-webchannel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sensors</Dependency>
<Dependency versionFrom="5.13.2">qt5-webchannel</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency versionFrom="5.13.1">qt5-location</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.13.2">qt5-location</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -113,7 +113,7 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt5-webkit</Dependency>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>zlib-devel</Dependency>
@@ -125,16 +125,23 @@
<Dependency>libxml2-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sensors-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="18">
<Date>2019-11-02</Date>
<Version>5.212.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="17">
<Date>2019-09-05</Date>
<Version>5.212.0</Version>