public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
Date: Sun, 17 May 2020 08:18:04 +0000 (UTC)	[thread overview]
Message-ID: <1589703414.459a1fb8aa74947e214661bbd5cbebcaed8ece17.asturm@gentoo> (raw)

commit:     459a1fb8aa74947e214661bbd5cbebcaed8ece17
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 08:16:10 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 17 08:16:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459a1fb8

dev-qt/qtwebengine: Update gcc-10.patch

Additionally includes patch to decoding_state.h.

Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org>
Bug: https://bugs.gentoo.org/721876
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/qtwebengine-5.14.2-gcc-10-2.patch        | 27 ----------------
 ...-10-1.patch => qtwebengine-5.14.2-gcc-10.patch} | 37 ++++++++++++++++++----
 dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild       |  4 +--
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
deleted file mode 100644
index 9a467f5d66b..00000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0dc7c21c33de634bb6bf90c9e2372054436e1606 Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev@qt.io>
-Date: Thu, 14 May 2020 16:31:09 +0200
-Subject: [PATCH] FIXUP: Fix build with GCC 10
-
-Add one more missing header when build with pch
-
-Change-Id: I42cddb26eacbd18cfbdb359ae1a85d0e2e43316f
----
- chromium/base/trace_event/trace_event_memory_overhead.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-index 69468d46409..916f9c775a3 100644
---- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-+++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-@@ -7,7 +7,7 @@
- 
- #include <stddef.h>
- #include <stdint.h>
--
-+#include <string>
- #include <unordered_map>
- 
- #include "base/base_export.h"
--- 
-2.16.3

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
similarity index 64%
rename from dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
index 214bf76a652..5df71a60252 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
@@ -1,18 +1,32 @@
-From f6e84fa97536812867be6f4c2162f5b86547477f Mon Sep 17 00:00:00 2001
+From cf83347e6fa9c086b5df022d23ca666245bf1989 Mon Sep 17 00:00:00 2001
 From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Tue, 5 May 2020 07:50:18 +0300
+Date: Sun, 10 May 2020 06:02:59 +0300
 Subject: [PATCH] Fix build with GCC 10
 
-Change-Id: I4101211163f3bb3f9a5fa673169aa41fa000ccca
+Change-Id: I733b8e8a00c49766effbee08c8b1f6f5d31a2dbf
 ---
+ chromium/base/trace_event/trace_event_memory_overhead.h          | 1 +
  chromium/media/cdm/supported_cdm_versions.h                      | 1 +
  .../third_party/perfetto/include/perfetto/base/task_runner.h     | 1 +
  chromium/third_party/webrtc/call/rtx_receive_stream.h            | 1 +
  .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h   | 1 +
- 4 files changed, 4 insertions(+)
+ .../third_party/webrtc/modules/video_coding/decoding_state.h     | 1 +
+ 6 files changed, 6 insertions(+)
 
+diff --git a/chromium/base/trace_event/trace_event_memory_overhead.h b/chromium/base/trace_event/trace_event_memory_overhead.h
+index 69468d46409..e10a3eca667 100644
+--- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
++++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <string>
+ #include <unordered_map>
+ 
+ #include "base/base_export.h"
 diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
-index dbe59ba5ea7..5216cfe3ee9 100644
+index 3f220da8c71..c54e3bb7d30 100644
 --- a/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
 +++ b/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
 @@ -6,6 +6,7 @@
@@ -59,6 +73,17 @@ index 22528c94892..69e624e8b19 100644
  
  namespace webrtc {
  
+diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
+index b87fb2d0345..e6c5e2855de 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
+@@ -13,6 +13,7 @@
+ 
+ #include <map>
+ #include <set>
++#include <stdint.h>
+ #include <vector>
+ 
+ namespace webrtc {
 -- 
 2.26.2
-

diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index 3ca9d6f594d..e063003ad5a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -80,8 +80,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
-	"${FILESDIR}"/${P}-gcc-10-{1,2}.patch # bug 721876
+	"${FILESDIR}/${P}-icu67.patch" # bug 720054
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 721876
 )
 
 src_prepare() {


             reply	other threads:[~2020-05-17  8:18 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-17  8:18 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-18 11:25 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ Ionen Wolkens
2025-03-31 15:57 Ionen Wolkens
2025-03-04 15:47 Ionen Wolkens
2024-12-04 12:19 Ionen Wolkens
2024-12-03  8:58 Ionen Wolkens
2024-12-02  7:23 Ionen Wolkens
2024-11-18  9:06 Ionen Wolkens
2024-10-30  2:55 Sam James
2024-09-13  2:45 Ionen Wolkens
2024-08-09  9:27 Ionen Wolkens
2024-07-29 20:20 Sam James
2024-05-23 16:04 Andreas Sturmlechner
2024-04-29 23:51 Sam James
2024-04-17  0:15 Ionen Wolkens
2023-12-19 20:33 Ionen Wolkens
2023-11-22 12:46 Ionen Wolkens
2023-11-21 22:36 Andreas Sturmlechner
2023-11-06 18:11 Andreas Sturmlechner
2023-08-10  3:53 Sam James
2023-08-04 12:35 Sam James
2023-07-26 13:31 Jimi Huotari
2023-06-10 13:33 Jimi Huotari
2023-06-10 13:33 Jimi Huotari
2023-04-26  3:54 Ionen Wolkens
2023-04-22 18:09 Andreas Sturmlechner
2023-03-27 12:51 Sam James
2023-01-08 21:45 Andreas Sturmlechner
2022-08-02 21:51 Sam James
2022-04-05 16:35 Andreas Sturmlechner
2022-04-05 16:35 Andreas Sturmlechner
2021-12-28 12:19 Andreas Sturmlechner
2021-12-25  0:10 Andreas Sturmlechner
2021-12-14 18:13 Andreas Sturmlechner
2021-11-14 19:53 Andreas Sturmlechner
2021-10-31  3:06 Sam James
2021-10-09 22:24 Sam James
2021-09-19 13:42 Andreas Sturmlechner
2021-09-14 16:27 Andreas Sturmlechner
2021-07-22  9:35 Andreas Sturmlechner
2021-05-17 21:15 Andreas Sturmlechner
2021-04-20 22:23 Andreas Sturmlechner
2021-04-06 21:34 Andreas Sturmlechner
2021-03-24  0:50 Georgy Yakovlev
2021-03-12 20:08 Andreas Sturmlechner
2021-02-26 21:19 Andreas Sturmlechner
2021-02-23 20:27 Andreas Sturmlechner
2021-01-02  1:23 Andreas Sturmlechner
2020-11-05 22:51 Andreas Sturmlechner
2020-08-19 19:39 Andreas Sturmlechner
2020-05-14 17:21 Andreas Sturmlechner
2020-04-29 20:44 Lars Wendler
2018-06-27 19:00 Andreas Sturmlechner
2018-02-07  2:04 Andreas Sturmlechner
2017-12-10  1:43 Michael Palimaka
2017-01-31  5:14 Davide Pesavento
2016-12-06  6:54 Michael Palimaka
2016-12-01 14:03 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1589703414.459a1fb8aa74947e214661bbd5cbebcaed8ece17.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox