qt5-5.15.1
This commit is contained in:
Rmys
@@ -22,6 +22,7 @@ def setup():
|
||||
-system-ffmpeg \
|
||||
-system-opus \
|
||||
-system-webp \
|
||||
-spellchecker \
|
||||
-webengine-icu \
|
||||
-webengine-kerberos")
|
||||
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
From 4e8ca195e4a58a35b015ec55f32fb35403acb5ad Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Burtsev <kirill.burtsev@qt.io>
|
||||
Date: Fri, 12 Jun 2020 16:30:23 +0200
|
||||
Subject: Fix crash on run with blink setting DarkModeImagePolicy=kFilterSmart
|
||||
|
||||
Activating Dark Mode with with smart image filter policy
|
||||
'--blink-settings=darkModeEnabled=true,darkModeImagePolicy=2'
|
||||
lead to crash due stack-use-after-scope. Don't use use local references.
|
||||
Issue was fixed after refatoring here:
|
||||
https://chromium-review.googlesource.com/c/chromium/src/+/2169489
|
||||
Won't be needed after chromium 85.0.4166.0
|
||||
|
||||
Change-Id: I6a36a394be41602c10b4c4bca3aa197c99d3be0c
|
||||
Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org>
|
||||
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
||||
---
|
||||
.../blink/renderer/platform/graphics/dark_mode_filter.cc | 10 +++-------
|
||||
1 file changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
|
||||
index 0c2a478ca67..6f76ef45588 100644
|
||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
|
||||
@@ -49,21 +49,17 @@ bool ShouldApplyToImage(const DarkModeSettings& settings,
|
||||
Image* image) {
|
||||
switch (settings.image_policy) {
|
||||
case DarkModeImagePolicy::kFilterSmart: {
|
||||
- DarkModeImageClassifier* classifier;
|
||||
+ DarkModeClassification result = DarkModeClassification::kNotClassified;
|
||||
switch (settings.classifier_type) {
|
||||
case DarkModeClassifierType::kIcon: {
|
||||
- DarkModeIconClassifier icon_classifier;
|
||||
- classifier = &icon_classifier;
|
||||
+ result = DarkModeIconClassifier().Classify(image, src_rect, dest_rect);
|
||||
break;
|
||||
}
|
||||
case DarkModeClassifierType::kGeneric: {
|
||||
- DarkModeGenericClassifier generic_classifier;
|
||||
- classifier = &generic_classifier;
|
||||
+ result = DarkModeGenericClassifier().Classify(image, src_rect, dest_rect);
|
||||
break;
|
||||
}
|
||||
}
|
||||
- DarkModeClassification result =
|
||||
- classifier->Classify(image, src_rect, dest_rect);
|
||||
return result == DarkModeClassification::kApplyFilter;
|
||||
}
|
||||
case DarkModeImagePolicy::kFilterNone:
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -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="4de6c0d03c0482e37e69dafe3589c1bafdb79dfa" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz</Archive>
|
||||
<Archive sha1sum="6eda80094f6724490b399228ce635d4d66432a0d" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebengine-everywhere-src-5.15.1.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-declarative-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-xmlpatterns-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-location-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-sensors-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-webchannel-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-designer-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-xmlpatterns-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-sensors-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-designer-devel</Dependency>
|
||||
<Dependency>bison</Dependency>
|
||||
<Dependency>re2-devel</Dependency>
|
||||
<Dependency>re2c</Dependency>
|
||||
@@ -76,7 +76,7 @@
|
||||
<Dependency>python-Jinja2</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1">CVE-2019-13720.patch</Patch> -->
|
||||
<!-- <Patch level="1">dark-mode-crash.patch</Patch> -->
|
||||
<!-- <Patch level="1">qtbug-69605.patch</Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
@@ -85,7 +85,8 @@
|
||||
<Name>qt5-webengine</Name>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/lib/qt5/bin/</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="library">/usr/lib/libQt5Pdf*</Path>
|
||||
<Path fileType="library">/usr/lib/libQt5WebEngine*</Path>
|
||||
<Path fileType="library">/usr/lib/libQt5WebEngineWidgets*</Path>
|
||||
<Path fileType="library">/usr/lib/qt5</Path>
|
||||
@@ -116,7 +117,7 @@
|
||||
<Dependency>libopus</Dependency>
|
||||
<Dependency>libxml2</Dependency>
|
||||
<Dependency>libvpx</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-base</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
|
||||
<Dependency>alsa-lib</Dependency>
|
||||
<Dependency>harfbuzz</Dependency>
|
||||
<Dependency>libevent</Dependency>
|
||||
@@ -126,11 +127,11 @@
|
||||
<Dependency>libXScrnSaver</Dependency>
|
||||
<Dependency>libXdamage</Dependency>
|
||||
<Dependency>libXrender</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-location</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-location</Dependency>
|
||||
<Dependency>libXcomposite</Dependency>
|
||||
<Dependency>libjpeg-turbo</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-webchannel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-declarative</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-webchannel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency>
|
||||
<Dependency>zlib</Dependency>
|
||||
<Dependency>minizip</Dependency>
|
||||
<Dependency>protobuf</Dependency>
|
||||
@@ -147,17 +148,17 @@
|
||||
</Files>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">qt5-webengine</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-declarative-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-location-devel</Dependency>
|
||||
<Dependency versionFrom="5.14.2">qt5-webchannel-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>qt5-webengine-docs</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency versionFrom="5.14.2">qt5-base</Dependency>
|
||||
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
@@ -165,6 +166,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="20">
|
||||
<Date>2020-09-09</Date>
|
||||
<Version>5.15.1</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="19">
|
||||
<Date>2020-05-30</Date>
|
||||
<Version>5.14.2</Version>
|
||||
|
||||
Reference in New Issue
Block a user