merge fix
This commit is contained in:
Tom Callaway
commit
250ac29099
|
|
@ -1,165 +0,0 @@
|
|||
diff -up chromium-77.0.3865.75/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-77.0.3865.75/chrome/common/media_router/media_sink.cc
|
||||
--- chromium-77.0.3865.75/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-09-17 18:42:37.137393137 +0200
|
||||
+++ chromium-77.0.3865.75/chrome/common/media_router/media_sink.cc 2019-09-17 18:42:37.145393201 +0200
|
||||
@@ -19,12 +19,12 @@ MediaSink::MediaSink(const MediaSink::Id
|
||||
provider_id_(provider_id) {}
|
||||
|
||||
MediaSink::MediaSink(const MediaSink& other) = default;
|
||||
-MediaSink::MediaSink(MediaSink&& other) noexcept = default;
|
||||
+MediaSink::MediaSink(MediaSink&& other) = default;
|
||||
MediaSink::MediaSink() = default;
|
||||
MediaSink::~MediaSink() = default;
|
||||
|
||||
MediaSink& MediaSink::operator=(const MediaSink& other) = default;
|
||||
-MediaSink& MediaSink::operator=(MediaSink&& other) noexcept = default;
|
||||
+MediaSink& MediaSink::operator=(MediaSink&& other) = default;
|
||||
|
||||
bool MediaSink::IsMaybeCloudSink() const {
|
||||
switch (icon_type_) {
|
||||
diff -up chromium-77.0.3865.75/components/history/core/browser/history_types.cc.el7-noexcept chromium-77.0.3865.75/components/history/core/browser/history_types.cc
|
||||
--- chromium-77.0.3865.75/components/history/core/browser/history_types.cc.el7-noexcept 2019-09-17 18:42:09.417172829 +0200
|
||||
+++ chromium-77.0.3865.75/components/history/core/browser/history_types.cc 2019-09-17 18:42:09.385172574 +0200
|
||||
@@ -42,7 +42,7 @@ QueryResults::QueryResults(QueryResults&
|
||||
Swap(&other);
|
||||
}
|
||||
|
||||
-QueryResults& QueryResults::operator=(QueryResults&& other) noexcept {
|
||||
+QueryResults& QueryResults::operator=(QueryResults&& other) {
|
||||
Swap(&other);
|
||||
return *this;
|
||||
}
|
||||
@@ -186,7 +186,7 @@ QueryURLResult::QueryURLResult(QueryURLR
|
||||
|
||||
QueryURLResult& QueryURLResult::operator=(const QueryURLResult&) = default;
|
||||
|
||||
-QueryURLResult& QueryURLResult::operator=(QueryURLResult&&) noexcept = default;
|
||||
+QueryURLResult& QueryURLResult::operator=(QueryURLResult&&) = default;
|
||||
|
||||
// MostVisitedURL --------------------------------------------------------------
|
||||
|
||||
diff -up chromium-77.0.3865.75/components/history/core/browser/history_types.h.el7-noexcept chromium-77.0.3865.75/components/history/core/browser/history_types.h
|
||||
--- chromium-77.0.3865.75/components/history/core/browser/history_types.h.el7-noexcept 2019-09-17 18:42:09.437172988 +0200
|
||||
+++ chromium-77.0.3865.75/components/history/core/browser/history_types.h 2019-09-17 18:42:09.365172415 +0200
|
||||
@@ -143,7 +143,7 @@ class QueryResults {
|
||||
~QueryResults();
|
||||
|
||||
QueryResults(QueryResults&& other) noexcept;
|
||||
- QueryResults& operator=(QueryResults&& other) noexcept;
|
||||
+ QueryResults& operator=(QueryResults&& other);
|
||||
|
||||
void set_reached_beginning(bool reached) { reached_beginning_ = reached; }
|
||||
bool reached_beginning() { return reached_beginning_; }
|
||||
@@ -278,7 +278,7 @@ struct QueryURLResult {
|
||||
QueryURLResult(const QueryURLResult&);
|
||||
QueryURLResult(QueryURLResult&&) noexcept;
|
||||
QueryURLResult& operator=(const QueryURLResult&);
|
||||
- QueryURLResult& operator=(QueryURLResult&&) noexcept;
|
||||
+ QueryURLResult& operator=(QueryURLResult&&);
|
||||
~QueryURLResult();
|
||||
|
||||
// Indicates whether the call to HistoryBackend::QueryURL was successfull
|
||||
diff -up chromium-77.0.3865.75/components/history/core/browser/url_row.cc.el7-noexcept chromium-77.0.3865.75/components/history/core/browser/url_row.cc
|
||||
--- chromium-77.0.3865.75/components/history/core/browser/url_row.cc.el7-noexcept 2019-09-18 08:03:25.458138423 +0200
|
||||
+++ chromium-77.0.3865.75/components/history/core/browser/url_row.cc 2019-09-18 08:03:34.363234155 +0200
|
||||
@@ -26,7 +26,7 @@ URLRow::~URLRow() {
|
||||
}
|
||||
|
||||
URLRow& URLRow::operator=(const URLRow& other) = default;
|
||||
-URLRow& URLRow::operator=(URLRow&& other) noexcept = default;
|
||||
+URLRow& URLRow::operator=(URLRow&& other) = default;
|
||||
|
||||
void URLRow::Swap(URLRow* other) {
|
||||
std::swap(id_, other->id_);
|
||||
diff -up chromium-77.0.3865.75/components/omnibox/browser/suggestion_answer.cc.el7-noexcept chromium-77.0.3865.75/components/omnibox/browser/suggestion_answer.cc
|
||||
--- chromium-77.0.3865.75/components/omnibox/browser/suggestion_answer.cc.el7-noexcept 2019-09-17 22:00:18.670108528 +0200
|
||||
+++ chromium-77.0.3865.75/components/omnibox/browser/suggestion_answer.cc 2019-09-17 22:00:32.518272148 +0200
|
||||
@@ -60,7 +60,7 @@ SuggestionAnswer::TextField::TextField(T
|
||||
SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=(
|
||||
const TextField&) = default;
|
||||
SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=(
|
||||
- TextField&&) noexcept = default;
|
||||
+ TextField&&) = default;
|
||||
|
||||
// static
|
||||
bool SuggestionAnswer::TextField::ParseTextField(const base::Value& field_json,
|
||||
diff -up chromium-77.0.3865.75/components/policy/core/common/policy_map.cc.el7-noexcept chromium-77.0.3865.75/components/policy/core/common/policy_map.cc
|
||||
--- chromium-77.0.3865.75/components/policy/core/common/policy_map.cc.el7-noexcept 2019-09-17 18:42:14.622214197 +0200
|
||||
+++ chromium-77.0.3865.75/components/policy/core/common/policy_map.cc 2019-09-17 18:42:14.556213673 +0200
|
||||
@@ -52,7 +52,7 @@ PolicyMap::Entry::Entry(
|
||||
PolicyMap::Entry::~Entry() = default;
|
||||
|
||||
PolicyMap::Entry::Entry(Entry&&) noexcept = default;
|
||||
-PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) noexcept = default;
|
||||
+PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) = default;
|
||||
|
||||
PolicyMap::Entry PolicyMap::Entry::DeepCopy() const {
|
||||
Entry copy;
|
||||
diff -up chromium-77.0.3865.75/components/signin/public/identity_manager/account_info.cc.el7-noexcept chromium-77.0.3865.75/components/signin/public/identity_manager/account_info.cc
|
||||
--- chromium-77.0.3865.75/components/signin/public/identity_manager/account_info.cc.el7-noexcept 2019-09-17 21:06:27.037828110 +0200
|
||||
+++ chromium-77.0.3865.75/components/signin/public/identity_manager/account_info.cc 2019-09-17 21:07:20.726472932 +0200
|
||||
@@ -52,7 +52,7 @@ CoreAccountInfo::CoreAccountInfo(CoreAcc
|
||||
CoreAccountInfo& CoreAccountInfo::operator=(const CoreAccountInfo& other) =
|
||||
default;
|
||||
|
||||
-CoreAccountInfo& CoreAccountInfo::operator=(CoreAccountInfo&& other) noexcept =
|
||||
+CoreAccountInfo& CoreAccountInfo::operator=(CoreAccountInfo&& other) =
|
||||
default;
|
||||
|
||||
bool CoreAccountInfo::IsEmpty() const {
|
||||
@@ -69,7 +69,7 @@ AccountInfo::AccountInfo(AccountInfo&& o
|
||||
|
||||
AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default;
|
||||
|
||||
-AccountInfo& AccountInfo::operator=(AccountInfo&& other) noexcept = default;
|
||||
+AccountInfo& AccountInfo::operator=(AccountInfo&& other) = default;
|
||||
|
||||
bool AccountInfo::IsEmpty() const {
|
||||
return CoreAccountInfo::IsEmpty() && hosted_domain.empty() &&
|
||||
diff -up chromium-77.0.3865.75/google_apis/gaia/core_account_id.cc.el7-noexcept chromium-77.0.3865.75/google_apis/gaia/core_account_id.cc
|
||||
--- chromium-77.0.3865.75/google_apis/gaia/core_account_id.cc.el7-noexcept 2019-09-17 18:43:12.969677930 +0200
|
||||
+++ chromium-77.0.3865.75/google_apis/gaia/core_account_id.cc 2019-09-17 18:43:12.989678089 +0200
|
||||
@@ -14,7 +14,7 @@ CoreAccountId::~CoreAccountId() = defaul
|
||||
|
||||
CoreAccountId& CoreAccountId::operator=(const CoreAccountId&) = default;
|
||||
|
||||
-CoreAccountId& CoreAccountId::operator=(CoreAccountId&&) noexcept = default;
|
||||
+CoreAccountId& CoreAccountId::operator=(CoreAccountId&&) = default;
|
||||
|
||||
CoreAccountId::CoreAccountId(const char* id) : id(id) {}
|
||||
|
||||
diff -up chromium-77.0.3865.75/google_apis/gaia/core_account_id.h.el7-noexcept chromium-77.0.3865.75/google_apis/gaia/core_account_id.h
|
||||
--- chromium-77.0.3865.75/google_apis/gaia/core_account_id.h.el7-noexcept 2019-09-17 18:43:12.978678001 +0200
|
||||
+++ chromium-77.0.3865.75/google_apis/gaia/core_account_id.h 2019-09-17 18:43:12.983678041 +0200
|
||||
@@ -20,7 +20,7 @@ struct CoreAccountId {
|
||||
~CoreAccountId();
|
||||
|
||||
CoreAccountId& operator=(const CoreAccountId&);
|
||||
- CoreAccountId& operator=(CoreAccountId&&) noexcept;
|
||||
+ CoreAccountId& operator=(CoreAccountId&&);
|
||||
|
||||
// Those implicit constructor and conversion operator allow to
|
||||
// progressively migrate the code to use this struct. Removing
|
||||
diff -up chromium-77.0.3865.75/gpu/config/gpu_info.cc.el7-noexcept chromium-77.0.3865.75/gpu/config/gpu_info.cc
|
||||
--- chromium-77.0.3865.75/gpu/config/gpu_info.cc.el7-noexcept 2019-09-17 18:42:25.049297073 +0200
|
||||
+++ chromium-77.0.3865.75/gpu/config/gpu_info.cc 2019-09-17 18:42:25.049297073 +0200
|
||||
@@ -170,7 +170,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice::
|
||||
const GPUInfo::GPUDevice& other) = default;
|
||||
|
||||
GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=(
|
||||
- GPUInfo::GPUDevice&& other) noexcept = default;
|
||||
+ GPUInfo::GPUDevice&& other) = default;
|
||||
|
||||
GPUInfo::GPUInfo()
|
||||
: optimus(false),
|
||||
diff -up chromium-77.0.3865.75/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept chromium-77.0.3865.75/third_party/openscreen/src/osp/public/service_info.h
|
||||
--- chromium-77.0.3865.75/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept 2019-09-17 21:46:46.378655525 +0200
|
||||
+++ chromium-77.0.3865.75/third_party/openscreen/src/osp/public/service_info.h 2019-09-17 21:47:16.897035418 +0200
|
||||
@@ -21,7 +21,7 @@ struct ServiceInfo {
|
||||
ServiceInfo(ServiceInfo&&) MAYBE_NOEXCEPT = default;
|
||||
ServiceInfo(const ServiceInfo&) MAYBE_NOEXCEPT = default;
|
||||
|
||||
- ServiceInfo& operator=(ServiceInfo&&) MAYBE_NOEXCEPT = default;
|
||||
+ ServiceInfo& operator=(ServiceInfo&&) = default;
|
||||
ServiceInfo& operator=(const ServiceInfo&) MAYBE_NOEXCEPT = default;
|
||||
|
||||
bool operator==(const ServiceInfo& other) const;
|
||||
|
|
@ -22,12 +22,22 @@
|
|||
# We'd like to always have this on.
|
||||
%global use_vaapi 0
|
||||
|
||||
# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
|
||||
# If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)
|
||||
%global shared 1
|
||||
|
||||
# NEVER EVER EVER turn this on in official builds
|
||||
%global freeworld 0
|
||||
%if %{freeworld}
|
||||
%global lsuffix freeworld
|
||||
%if 0%{?shared}
|
||||
%global nsuffix -libs-media-freeworld
|
||||
%else
|
||||
%global nsuffix -freeworld
|
||||
%endif
|
||||
%else
|
||||
%global lsuffix fedora
|
||||
%global nsuffix %{nil}
|
||||
%endif
|
||||
|
||||
# Some people wish not to use the Fedora Google API keys. Mmkay.
|
||||
|
|
@ -67,10 +77,6 @@
|
|||
%endif
|
||||
%global __requires_exclude ^(%{privlibs})\\.so*
|
||||
|
||||
# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
|
||||
# If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)
|
||||
%global shared 1
|
||||
|
||||
# AddressSanitizer mode
|
||||
# https://www.chromium.org/developers/testing/addresssanitizer
|
||||
%global asan 0
|
||||
|
|
@ -157,13 +163,23 @@ BuildRequires: libicu-devel >= 5.4
|
|||
%global majorversion 78
|
||||
|
||||
%if %{freeworld}
|
||||
Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
|
||||
Name: chromium%{chromium_channel}%{nsuffix}
|
||||
%else
|
||||
Name: chromium%{chromium_channel}
|
||||
%endif
|
||||
Version: %{majorversion}.0.3904.70
|
||||
Version: %{majorversion}.0.3904.87
|
||||
Release: 1%{?dist}
|
||||
%if %{?freeworld}
|
||||
%if %{?shared}
|
||||
# chromium-libs-media-freeworld
|
||||
Summary: Chromium media libraries built with all possible codecs
|
||||
%else
|
||||
# chromium-freeworld
|
||||
Summary: A WebKit (Blink) powered web browser built with all possible codecs
|
||||
%endif
|
||||
%else
|
||||
Summary: A WebKit (Blink) powered web browser
|
||||
%endif
|
||||
Url: http://www.chromium.org/Home
|
||||
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
|
||||
|
||||
|
|
@ -529,9 +545,19 @@ Obsoletes: chromium-v8 <= 3.25.28.18
|
|||
Provides: webrtc = 0.2
|
||||
Obsoletes: webrtc <= 0.1
|
||||
%if 0%{?shared}
|
||||
%if 0%{?freeworld}
|
||||
# chromium-libs-media-freeworld case
|
||||
Provides: chromium-libs-media = %{version}-%{release}
|
||||
Provides: chromium-libs-media%{_isa} = %{version}-%{release}
|
||||
Requires: chromium-libs%{_isa} = %{version}
|
||||
Requires(post): %{_sbindir}/update-alternatives
|
||||
Requires(preun): %{_sbindir}/update-alternatives
|
||||
%else
|
||||
# chromium case with shared libs
|
||||
Requires: chromium-libs%{_isa} = %{version}-%{release}
|
||||
# This is broken out so it can be replaced.
|
||||
Requires: chromium-libs-media%{_isa} = %{version}-%{release}
|
||||
%endif
|
||||
# Nothing to do here. chromium-libs is real.
|
||||
%else
|
||||
Provides: chromium-libs = %{version}-%{release}
|
||||
|
|
@ -638,8 +664,22 @@ Provides: bundled(xdg-user-dirs)
|
|||
Requires(post): /usr/sbin/semanage
|
||||
Requires(post): /usr/sbin/restorecon
|
||||
|
||||
%if %{?freeworld}
|
||||
%if %{?shared}
|
||||
%description
|
||||
Chromium media libraries built with all possible codecs. Chromium is an
|
||||
open-source web browser, powered by WebKit (Blink). This package replaces
|
||||
the default chromium-libs-media package, which is limited in what it
|
||||
can include.
|
||||
%else
|
||||
%description
|
||||
Chromium built with all possible codecs. Chromium is an
|
||||
open-source web browser, powered by WebKit (Blink).
|
||||
%endif
|
||||
%else
|
||||
%description
|
||||
Chromium is an open-source web browser, powered by WebKit (Blink).
|
||||
%endif
|
||||
|
||||
%package common
|
||||
Summary: Files needed for both the headless_shell and full Chromium
|
||||
|
|
@ -665,21 +705,7 @@ Requires(preun): %{_sbindir}/update-alternatives
|
|||
%description libs
|
||||
Shared libraries used by chromium (and chrome-remote-desktop).
|
||||
|
||||
%if %{freeworld}
|
||||
%package -n chromium-libs-media-freeworld
|
||||
Summary: Chromium media libraries built with all possible codecs
|
||||
Provides: chromium-libs-media = %{version}-%{release}
|
||||
Provides: chromium-libs-media%{_isa} = %{version}-%{release}
|
||||
Requires: chromium-libs%{_isa} = %{version}
|
||||
Requires(post): %{_sbindir}/update-alternatives
|
||||
Requires(preun): %{_sbindir}/update-alternatives
|
||||
|
||||
%description -n chromium-libs-media-freeworld
|
||||
Chromium media libraries built with all possible codecs. Chromium is an
|
||||
open-source web browser, powered by WebKit (Blink). This package replaces
|
||||
the default chromium-libs-media package, which is limited in what it
|
||||
can include.
|
||||
%else
|
||||
%if ! %{freeworld}
|
||||
%package libs-media
|
||||
Summary: Shared libraries used by the chromium media subsystem
|
||||
Requires: chromium-libs%{_isa} = %{version}
|
||||
|
|
@ -1482,6 +1508,7 @@ if st and st.type == "link" then
|
|||
os.remove(path)
|
||||
end
|
||||
|
||||
%if %{shared}
|
||||
%if %{freeworld}
|
||||
%posttrans -n chromium-libs-media-freeworld
|
||||
%{_sbindir}/update-alternatives --install \
|
||||
|
|
@ -1517,6 +1544,7 @@ if [ $1 = 0 ]; then
|
|||
%{_libdir}/chromium-browser/libffmpeg.so.fedora
|
||||
fi
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%pre -n chrome-remote-desktop
|
||||
getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-desktop
|
||||
|
|
@ -1690,6 +1718,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 1 2019 Tom Callaway <spot@fedoraproject.org> - 78.0.3904.87-1
|
||||
- update to 78.0.3904.87
|
||||
- apply most of the freeworld changes in PR 23/24/25
|
||||
|
||||
* Wed Oct 23 2019 Tom Callaway <spot@fedoraproject.org> - 78.0.3904.80-1
|
||||
- update to 78.0.3904.80
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -17,4 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0
|
|||
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
|
||||
SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
|
||||
SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844
|
||||
SHA512 (chromium-78.0.3904.70-clean.tar.xz) = f702bc3c084a69adc81f47300d00f0b8cf46ee721dbb4986bfc5ba7fc95129172d021da0514350fe77591a209ec050307eead8e9bf309b70e46eb26d29d88509
|
||||
SHA512 (chromium-78.0.3904.87-clean.tar.xz) = ebd2a1440c36e9272b52b11ddfa596ce3d7b7a3a914970ebd4ce98d5bb862625ab61c392a9ea277ae8f791185d98d84ff5797db77bb80fa305b847e549035893
|
||||
|
|
|
|||
Loading…
Reference in New Issue