From 0048b5494c59211f54f9c97a769da636ad297550 Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Fri, 7 Sep 2018 10:13:12 -0600 Subject: Add patches directory Move patches into a subdirectory of `patches`. This will make installation easier as all the different targets won't be collected into the same root folder tree. Signed-off-by: Kenny Ballou --- .../www-client/chromium/background_fetch_context.patch | 14 ++++++++++++++ patches/www-client/chromium/input_event_prediciton.patch | 15 +++++++++++++++ patches/www-client/chromium/sizet.patch | 14 ++++++++++++++ www-client/chromium/background_fetch_context.patch | 14 -------------- www-client/chromium/input_event_prediciton.patch | 15 --------------- www-client/chromium/sizet.patch | 14 -------------- 6 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 patches/www-client/chromium/background_fetch_context.patch create mode 100644 patches/www-client/chromium/input_event_prediciton.patch create mode 100644 patches/www-client/chromium/sizet.patch delete mode 100644 www-client/chromium/background_fetch_context.patch delete mode 100644 www-client/chromium/input_event_prediciton.patch delete mode 100644 www-client/chromium/sizet.patch diff --git a/patches/www-client/chromium/background_fetch_context.patch b/patches/www-client/chromium/background_fetch_context.patch new file mode 100644 index 0000000..57714f6 --- /dev/null +++ b/patches/www-client/chromium/background_fetch_context.patch @@ -0,0 +1,14 @@ +description: https://657472.bugs.gentoo.org/attachment.cgi?id=535038 +author: Marcus Comstedt + +--- chromium-68.0.3438.3/content/browser/background_fetch/background_fetch_context.cc.orig 2018-06-05 22:27:27.977301187 +0200 ++++ chromium-68.0.3438.3/content/browser/background_fetch/background_fetch_context.cc 2018-06-05 23:00:11.661703304 +0200 +@@ -218,7 +218,8 @@ + + scheduler_->AddJobController(controller.get()); + +- job_controllers_.insert({unique_id, std::move(controller)}); ++ auto pair = std::make_pair(unique_id, std::move(controller)); ++ job_controllers_.insert(std::move(pair)); + std::move(done_closure).Run(); + } diff --git a/patches/www-client/chromium/input_event_prediciton.patch b/patches/www-client/chromium/input_event_prediciton.patch new file mode 100644 index 0000000..61fc1ff --- /dev/null +++ b/patches/www-client/chromium/input_event_prediciton.patch @@ -0,0 +1,15 @@ +description: https://657472.bugs.gentoo.org/attachment.cgi?id=535038 +author: Marcus Comstedt + +--- chromium-68.0.3438.3/content/renderer/input/input_event_prediction.cc.orig 2018-06-06 09:07:59.226082299 +0200 ++++ chromium-68.0.3438.3/content/renderer/input/input_event_prediction.cc 2018-06-06 09:09:40.725750812 +0200 +@@ -119,7 +119,8 @@ + if (predictor != pointer_id_predictor_map_.end()) { + predictor->second->Update(data); + } else { +- pointer_id_predictor_map_.insert({event.id, SetUpPredictor()}); ++ auto pair = std::make_pair(event.id, SetUpPredictor()); ++ pointer_id_predictor_map_.insert(std::move(pair)); + pointer_id_predictor_map_[event.id]->Update(data); + } + } diff --git a/patches/www-client/chromium/sizet.patch b/patches/www-client/chromium/sizet.patch new file mode 100644 index 0000000..5c5ed22 --- /dev/null +++ b/patches/www-client/chromium/sizet.patch @@ -0,0 +1,14 @@ +description: size_t is not in scope by default in gcc 6 +author: Michael Gilbert + +--- a/media/base/subsample_entry.h ++++ b/media/base/subsample_entry.h +@@ -36,7 +36,7 @@ struct SubsampleEntry { + // does not match |input_size|. + MEDIA_EXPORT bool VerifySubsamplesMatchSize( + const std::vector& subsamples, +- size_t input_size); ++ std::size_t input_size); + + } // namespace media + diff --git a/www-client/chromium/background_fetch_context.patch b/www-client/chromium/background_fetch_context.patch deleted file mode 100644 index 57714f6..0000000 --- a/www-client/chromium/background_fetch_context.patch +++ /dev/null @@ -1,14 +0,0 @@ -description: https://657472.bugs.gentoo.org/attachment.cgi?id=535038 -author: Marcus Comstedt - ---- chromium-68.0.3438.3/content/browser/background_fetch/background_fetch_context.cc.orig 2018-06-05 22:27:27.977301187 +0200 -+++ chromium-68.0.3438.3/content/browser/background_fetch/background_fetch_context.cc 2018-06-05 23:00:11.661703304 +0200 -@@ -218,7 +218,8 @@ - - scheduler_->AddJobController(controller.get()); - -- job_controllers_.insert({unique_id, std::move(controller)}); -+ auto pair = std::make_pair(unique_id, std::move(controller)); -+ job_controllers_.insert(std::move(pair)); - std::move(done_closure).Run(); - } diff --git a/www-client/chromium/input_event_prediciton.patch b/www-client/chromium/input_event_prediciton.patch deleted file mode 100644 index 61fc1ff..0000000 --- a/www-client/chromium/input_event_prediciton.patch +++ /dev/null @@ -1,15 +0,0 @@ -description: https://657472.bugs.gentoo.org/attachment.cgi?id=535038 -author: Marcus Comstedt - ---- chromium-68.0.3438.3/content/renderer/input/input_event_prediction.cc.orig 2018-06-06 09:07:59.226082299 +0200 -+++ chromium-68.0.3438.3/content/renderer/input/input_event_prediction.cc 2018-06-06 09:09:40.725750812 +0200 -@@ -119,7 +119,8 @@ - if (predictor != pointer_id_predictor_map_.end()) { - predictor->second->Update(data); - } else { -- pointer_id_predictor_map_.insert({event.id, SetUpPredictor()}); -+ auto pair = std::make_pair(event.id, SetUpPredictor()); -+ pointer_id_predictor_map_.insert(std::move(pair)); - pointer_id_predictor_map_[event.id]->Update(data); - } - } diff --git a/www-client/chromium/sizet.patch b/www-client/chromium/sizet.patch deleted file mode 100644 index 5c5ed22..0000000 --- a/www-client/chromium/sizet.patch +++ /dev/null @@ -1,14 +0,0 @@ -description: size_t is not in scope by default in gcc 6 -author: Michael Gilbert - ---- a/media/base/subsample_entry.h -+++ b/media/base/subsample_entry.h -@@ -36,7 +36,7 @@ struct SubsampleEntry { - // does not match |input_size|. - MEDIA_EXPORT bool VerifySubsamplesMatchSize( - const std::vector& subsamples, -- size_t input_size); -+ std::size_t input_size); - - } // namespace media - -- cgit v1.2.1