automatic version update by autodist [release 75.0.3770.142-1mamba;Tue Jul 30 2019]
This commit is contained in:
parent
a74e350c76
commit
89159538c9
48
chromium-73.0.3683.103-color_utils_use_std_sqrt.patch
Normal file
48
chromium-73.0.3683.103-color_utils_use_std_sqrt.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
||||||
|
Date: Fri, 8 Feb 2019 02:57:28 +0000
|
||||||
|
Subject: [PATCH] color_utils: Use std::sqrt() instead of std::sqrtf()
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
This fixes the build with libstdc++:
|
||||||
|
|
||||||
|
../../ui/gfx/color_utils.cc: In function ‘SkColor color_utils::SetDarkestColorForTesting(SkColor)’:
|
||||||
|
../../ui/gfx/color_utils.cc:434:12: error: ‘sqrtf’ is not a member of ‘std’
|
||||||
|
std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
|
||||||
|
^~~~~
|
||||||
|
../../ui/gfx/color_utils.cc:434:12: note: suggested alternative: ‘sqrt’
|
||||||
|
std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
|
||||||
|
^~~~~
|
||||||
|
sqrt
|
||||||
|
|
||||||
|
sqrtf() is not formally part of C++14 as far as I can see even though libc++
|
||||||
|
has it in <cmath>. Additionally, we're only dealing with floats in all parts
|
||||||
|
of the expression above, so using the float sqrt() overload should be
|
||||||
|
harmless anyway.
|
||||||
|
|
||||||
|
Bug: 819294
|
||||||
|
Change-Id: If6c7bf31819df97a761e6963def6d6506154c34d
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/1458193
|
||||||
|
Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
||||||
|
Reviewed-by: Peter Kasting <pkasting@chromium.org>
|
||||||
|
Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#630140}
|
||||||
|
---
|
||||||
|
ui/gfx/color_utils.cc | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc
|
||||||
|
index c868cd54bac3f..92ba1407d594f 100644
|
||||||
|
--- a/ui/gfx/color_utils.cc
|
||||||
|
+++ b/ui/gfx/color_utils.cc
|
||||||
|
@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) {
|
||||||
|
// GetContrastRatio(kWhiteLuminance, g_luminance_midpoint). The formula below
|
||||||
|
// can be verified by plugging it into how GetContrastRatio() operates.
|
||||||
|
g_luminance_midpoint =
|
||||||
|
- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
|
||||||
|
+ std::sqrt((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
|
||||||
|
|
||||||
|
return previous_darkest_color;
|
||||||
|
}
|
@ -0,0 +1,36 @@
|
|||||||
|
From aeed4d1f15ce84a17ea0bc219e258dc4982b2368 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jose Dapena Paz <jose.dapena@lge.com>
|
||||||
|
Date: Fri, 26 Apr 2019 20:07:05 +0000
|
||||||
|
Subject: [PATCH] libstdc++: do not assume unique_ptr has ostream operator
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
CompositorFrameReportingController is using DCHECK_NE to compare
|
||||||
|
several unique_ptr. This is valid in libc++, but on libstdc++ unique_ptr
|
||||||
|
does not have an ostream operator.
|
||||||
|
|
||||||
|
Change-Id: I9f23ef17f02b9e107694ba493f6f8f3caf5cac4d
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1584292
|
||||||
|
Reviewed-by: Sunny Sachanandani <sunnyps@chromium.org>
|
||||||
|
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#654570}
|
||||||
|
---
|
||||||
|
cc/scheduler/compositor_frame_reporting_controller.cc | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cc/scheduler/compositor_frame_reporting_controller.cc b/cc/scheduler/compositor_frame_reporting_controller.cc
|
||||||
|
index f1587ed158..1b17021fd2 100644
|
||||||
|
--- a/cc/scheduler/compositor_frame_reporting_controller.cc
|
||||||
|
+++ b/cc/scheduler/compositor_frame_reporting_controller.cc
|
||||||
|
@@ -31,8 +31,8 @@ void CompositorFrameReportingController::WillBeginImplFrame() {
|
||||||
|
|
||||||
|
void CompositorFrameReportingController::WillBeginMainFrame() {
|
||||||
|
DCHECK(reporters_[PipelineStage::kBeginImplFrame]);
|
||||||
|
- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame],
|
||||||
|
- reporters_[PipelineStage::kBeginImplFrame]);
|
||||||
|
+ DCHECK(reporters_[PipelineStage::kBeginMainFrame] !=
|
||||||
|
+ reporters_[PipelineStage::kBeginImplFrame]);
|
||||||
|
reporters_[PipelineStage::kBeginImplFrame]->StartStage(
|
||||||
|
"SendBeginMainFrameToCommit");
|
||||||
|
AdvanceReporterStage(PipelineStage::kBeginImplFrame,
|
@ -1,6 +1,6 @@
|
|||||||
Name: chromium
|
Name: chromium
|
||||||
Epoch: 3
|
Epoch: 3
|
||||||
Version: 72.0.3626.119
|
Version: 75.0.3770.142
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
||||||
Group: Graphical Desktop/Applications/Internet
|
Group: Graphical Desktop/Applications/Internet
|
||||||
@ -51,6 +51,8 @@ Patch32: chromium-67.0.3396.87-widevine-r2.patch
|
|||||||
Patch33: chromium-67.0.3396.99-x86-clang_stackrealign-no-longer-needed.patch
|
Patch33: chromium-67.0.3396.99-x86-clang_stackrealign-no-longer-needed.patch
|
||||||
Patch34: chromium-72.0.3626.119-webrtc-missing-header.patch
|
Patch34: chromium-72.0.3626.119-webrtc-missing-header.patch
|
||||||
Patch35: chromium-72.0.3626.119-blink-fix_zero_length_array.patch
|
Patch35: chromium-72.0.3626.119-blink-fix_zero_length_array.patch
|
||||||
|
Patch36: chromium-73.0.3683.103-color_utils_use_std_sqrt.patch
|
||||||
|
Patch37: chromium-75.0.3770.142-libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch
|
||||||
License: BSD
|
License: BSD
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: libGConf-devel
|
BuildRequires: libGConf-devel
|
||||||
@ -182,9 +184,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|||||||
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web.
|
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -D -T
|
||||||
#-D -T
|
:<< _EOF
|
||||||
#:<< _EOF
|
|
||||||
%patch19 -p1
|
%patch19 -p1
|
||||||
%patch28 -p1
|
%patch28 -p1
|
||||||
#%patch29 -p1
|
#%patch29 -p1
|
||||||
@ -192,8 +193,10 @@ Chromium is an open-source browser project that aims to build a safer, faster, a
|
|||||||
#%patch31 -p1
|
#%patch31 -p1
|
||||||
#%patch32 -p1
|
#%patch32 -p1
|
||||||
#%patch33 -p1
|
#%patch33 -p1
|
||||||
%patch34 -p0
|
#%patch34 -p0
|
||||||
%patch35 -p1
|
%patch35 -p1
|
||||||
|
#%patch36 -p1
|
||||||
|
%patch37 -p1
|
||||||
|
|
||||||
# Allow building against system libraries in official builds
|
# Allow building against system libraries in official builds
|
||||||
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
||||||
@ -217,9 +220,6 @@ sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
|
|||||||
mkdir -p python2-path
|
mkdir -p python2-path
|
||||||
ln -sf %{_bindir}/python2 python2-path/python
|
ln -sf %{_bindir}/python2 python2-path/python
|
||||||
|
|
||||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
|
||||||
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/
|
|
||||||
|
|
||||||
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
|
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
|
||||||
# Keys are the names in the above script; values are the dependencies in Arch
|
# Keys are the names in the above script; values are the dependencies in Arch
|
||||||
declare -rgA _system_libs=(
|
declare -rgA _system_libs=(
|
||||||
@ -232,7 +232,7 @@ declare -rgA _system_libs=(
|
|||||||
[libdrm]=
|
[libdrm]=
|
||||||
[libjpeg]=libjpeg
|
[libjpeg]=libjpeg
|
||||||
#[libpng]=libpng
|
#[libpng]=libpng
|
||||||
#[libvpx]=libvpx # https://bugs.gentoo.org/show_bug.cgi?id=611394
|
[libvpx]=libvpx
|
||||||
[libwebp]=libwebp
|
[libwebp]=libwebp
|
||||||
[libxml]=libxml2 # https://bugs.gentoo.org/show_bug.cgi?id=616818
|
[libxml]=libxml2 # https://bugs.gentoo.org/show_bug.cgi?id=616818
|
||||||
[libxslt]=libxslt
|
[libxslt]=libxslt
|
||||||
@ -258,6 +258,15 @@ done
|
|||||||
python2 build/linux/unbundle/replace_gn_files.py \
|
python2 build/linux/unbundle/replace_gn_files.py \
|
||||||
--system-libraries "${!_system_libs[@]}"
|
--system-libraries "${!_system_libs[@]}"
|
||||||
|
|
||||||
|
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||||
|
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/
|
||||||
|
|
||||||
|
# Remove compiler flags not supported by our system clang
|
||||||
|
sed -i \
|
||||||
|
-e '/"-fsplit-lto-unit"/d' \
|
||||||
|
-e '/"-Wno-defaulted-function-deleted"/d' \
|
||||||
|
build/config/compiler/BUILD.gn
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CC=clang
|
export CC=clang
|
||||||
export CXX=clang++
|
export CXX=clang++
|
||||||
@ -289,14 +298,11 @@ chromium_conf=(
|
|||||||
'fieldtrial_testing_like_official_build=true'
|
'fieldtrial_testing_like_official_build=true'
|
||||||
'ffmpeg_branding="Chrome"'
|
'ffmpeg_branding="Chrome"'
|
||||||
'proprietary_codecs=true'
|
'proprietary_codecs=true'
|
||||||
|
'rtc_use_pipewire=true'
|
||||||
|
'rtc_link_pipewire=true'
|
||||||
'link_pulseaudio=true'
|
'link_pulseaudio=true'
|
||||||
'use_gnome_keyring=false'
|
'use_gnome_keyring=false'
|
||||||
'use_sysroot=false'
|
'use_sysroot=false'
|
||||||
'use_kerberos=true'
|
|
||||||
'use_pulseaudio=true'
|
|
||||||
'use_sysroot=false'
|
|
||||||
'use_system_freetype=true'
|
|
||||||
'use_system_harfbuzz=true'
|
|
||||||
'linux_use_bundled_binutils=false'
|
'linux_use_bundled_binutils=false'
|
||||||
'use_custom_libcxx=false'
|
'use_custom_libcxx=false'
|
||||||
'enable_hangout_services_extension=true'
|
'enable_hangout_services_extension=true'
|
||||||
@ -457,6 +463,9 @@ fi
|
|||||||
#%{_mandir}/man1/chromium.1*
|
#%{_mandir}/man1/chromium.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 30 2019 Automatic Build System <autodist@mambasoft.it> 75.0.3770.142-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Fri Mar 01 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 72.0.3626.119-1mamba
|
* Fri Mar 01 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 72.0.3626.119-1mamba
|
||||||
- update to 72.0.3626.119
|
- update to 72.0.3626.119
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user