commit: 3aeae442d5b0419d9ab4d9742c042c3c63a60ee3 Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> AuthorDate: Fri Oct 18 08:13:30 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Oct 20 16:26:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aeae442
www-client/chromium: beta channel bump to 78.0.3904.63 Closes: https://github.com/gentoo/gentoo/pull/13333 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> www-client/chromium/Manifest | 3 +- ...3904.50.ebuild => chromium-78.0.3904.63.ebuild} | 3 +- .../chromium/files/chromium-78-pm-crash.patch | 43 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 8b6fc91ab22..959fae471eb 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,4 @@ DIST chromium-77.0.3865.120.tar.xz 729636120 BLAKE2B 7ff2467b5dd421c3962dd86503975fe042ced4a44e9d3705106ee9c9a7ceaa94c38fea2aefe4913bfe4af40775cb37b175d9a6c70b67d807c227f7e363ba5783 SHA512 4c72c9e9cd9a5d7f89e33c52d117018418ce0f5d23a57341b26ce47c8f90fa55f52a0c976b6959026dc273d5b37aa57306253a9b533172cd133a815edc7bccb4 DIST chromium-77.0.3865.90.tar.xz 729551228 BLAKE2B 865a40a7fa7d6a0b2de137249f7f14dad32b30cb0099fccc0d21570a2488834c5ab6504ef7c63f334e5d798de5391d6e96beaa49009caecb178d898e27317d89 SHA512 8b343c6ccc798c74cca8d5d41285153ace917da28360192afb21925c103ba425a4045f75c589f73a8c5c75bd1bbca44bfae1a4b96e9b7a97636d9929c7961bbc DIST chromium-78-revert-noexcept-r1.patch.gz 12094 BLAKE2B 1fd0c939af773ed398c9ab14fa80b042b4237cabdbcb06425e4d1c72200ec49c3c1383cfc95013cce4df411b0a2397b79030d41a0379ae80a0c60bae1fbb5ffa SHA512 dcb62b82b34d5d6982762cacfe3ab7d3538d908b3befe7666f5d70d98ba4f979b5bf056e5c5343ed76aa744a643318fc5a75ddedfcb1b7de3e7c28eb2587439f -DIST chromium-78-revert-pm-observer.patch 22149 BLAKE2B d0169db31948a0a11930d23dbb1fd6573525218a795fe57702cdc6bfef87ce3ab856f8429f5bc9751bf6c96750ad3ed16ce22a4e8be1c57a183da30ca4b56d84 SHA512 68b4558226264aa04af265f7fd42c7319f1cd483d249ad53244efa9d640d99bfb97d39aa8a3e395e1ece4384092b21f7c27d635bc0f3a9f0ba6ddd2f38f4dbae -DIST chromium-78.0.3904.50.tar.xz 741967532 BLAKE2B 01f544b61209ee4778642a8cd7b55f36425ec61b4a59751f10f93fafb898dde8c15a374c4ede4197974c7b382646277188507ecc04bc92e69f235a4846c78de6 SHA512 699d1880d81343fb81db407adc5b257b44761fe921f352c69d3c41dc4b21b1eb61875f49fdcc060d6a6133c7542609f93f03088609ed0f589f52b41dec72d484 +DIST chromium-78.0.3904.63.tar.xz 742770704 BLAKE2B 01e48d24dd12a7f923d7772dcda35ecf159cdaaaaba9adf8599443db4dc4dc69fed1b44aedddf3f8cadd9fb02621ecfdc7a47a12e732992e1090b197ad68a7ce SHA512 abda5c5108edbf9e3a67f1fda40f0a09fcc74600e3b746da60df34d4eeb1a5fcd52e09f894cf2f7a6cce42b8509a4e6f261bbbb9463c95c3170c92357f91b359 diff --git a/www-client/chromium/chromium-78.0.3904.50.ebuild b/www-client/chromium/chromium-78.0.3904.63.ebuild similarity index 99% rename from www-client/chromium/chromium-78.0.3904.50.ebuild rename to www-client/chromium/chromium-78.0.3904.63.ebuild index da61abdb047..db0c938d37b 100644 --- a/www-client/chromium/chromium-78.0.3904.50.ebuild +++ b/www-client/chromium/chromium-78.0.3904.63.ebuild @@ -14,7 +14,6 @@ DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="http://chromium.org/"; SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz https://dev.gentoo.org/~floppym/dist/chromium-78-revert-noexcept-r1.patch.gz - https://dev.gentoo.org/~floppym/dist/chromium-78-revert-pm-observer.patch " LICENSE="BSD" @@ -153,8 +152,8 @@ PATCHES=( "${FILESDIR}/chromium-78-include.patch" "${FILESDIR}/chromium-78-icon.patch" "${FILESDIR}/chromium-78-protobuf-export.patch" + "${FILESDIR}/chromium-78-pm-crash.patch" "${WORKDIR}/chromium-78-revert-noexcept-r1.patch" - "${DISTDIR}/chromium-78-revert-pm-observer.patch" "${FILESDIR}/chromium-78-gcc-enum-range.patch" "${FILESDIR}/chromium-78-gcc-std-vector.patch" "${FILESDIR}/chromium-78-gcc-noexcept.patch" diff --git a/www-client/chromium/files/chromium-78-pm-crash.patch b/www-client/chromium/files/chromium-78-pm-crash.patch new file mode 100644 index 00000000000..ada266120dc --- /dev/null +++ b/www-client/chromium/files/chromium-78-pm-crash.patch @@ -0,0 +1,43 @@ +From e73aed9a5ef15102f29ac31b70290faf5c90f9fe Mon Sep 17 00:00:00 2001 +From: Evan Stade <est...@chromium.org> +Date: Wed, 16 Oct 2019 16:01:32 +0000 +Subject: [PATCH] Fix shutdown crash in ProfileManager. + +OnProfileMarkedForPermanentDeletion should move from +ProfileManagerObserver to ProfileObserver, which would also +fix this bug. However, changing the order of members is the +quickest and most cherry-pick-able way to avoid the crash. + +Bug: 1005244 +Change-Id: If2db68c846dd418cd02864b57b9b543687fa1e03 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863518 +Auto-Submit: Evan Stade <est...@chromium.org> +Reviewed-by: David Roger <dro...@chromium.org> +Commit-Queue: Evan Stade <est...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#706467} +--- + +diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h +index b60df76d..7d02af7 100644 +--- a/chrome/browser/profiles/profile_manager.h ++++ b/chrome/browser/profiles/profile_manager.h +@@ -409,6 +409,10 @@ class ProfileManager : public content::NotificationObserver, + const base::FilePath& profile_dir); + #endif // !defined(OS_ANDROID) + ++ // Destroy after |profile_info_cache_| since Profile destruction may trigger ++ // some observers to unregister themselves. ++ base::ObserverList<ProfileManagerObserver> observers_; ++ + // Object to cache various information about profiles. Contains information + // about every profile which has been created for this instance of Chrome, + // if it has not been explicitly deleted. It must be destroyed after +@@ -450,8 +454,6 @@ class ProfileManager : public content::NotificationObserver, + // Controls whether to initialize some services. Only disabled for testing. + bool do_final_services_init_ = true; + +- base::ObserverList<ProfileManagerObserver> observers_; +- + // TODO(chrome/browser/profiles/OWNERS): Usage of this in profile_manager.cc + // should likely be turned into DCHECK_CURRENTLY_ON(BrowserThread::UI) for + // consistency with surrounding code in the same file but that wasn't trivial
