diff options
author | Ting-Wei Lan <lantw44@gmail.com> | 2020-04-12 00:48:33 +0800 |
---|---|---|
committer | Ting-Wei Lan <lantw44@gmail.com> | 2020-04-12 00:48:33 +0800 |
commit | c22b3a2d5019b8bffc481249d1383a9b53dc4195 (patch) | |
tree | d23931c8dc36d47f4a48804062e2cb6723a1813b | |
parent | 8e7d07d4e0e54c50313829929c7f8d1ba103c56d (diff) | |
download | copr-rpm-spec-c22b3a2d5019b8bffc481249d1383a9b53dc4195.tar copr-rpm-spec-c22b3a2d5019b8bffc481249d1383a9b53dc4195.tar.gz copr-rpm-spec-c22b3a2d5019b8bffc481249d1383a9b53dc4195.tar.bz2 copr-rpm-spec-c22b3a2d5019b8bffc481249d1383a9b53dc4195.tar.lz copr-rpm-spec-c22b3a2d5019b8bffc481249d1383a9b53dc4195.tar.xz copr-rpm-spec-c22b3a2d5019b8bffc481249d1383a9b53dc4195.tar.zst copr-rpm-spec-c22b3a2d5019b8bffc481249d1383a9b53dc4195.zip |
chromium: Fix GCC 10 build
-rw-r--r-- | chromium/chromium/chromium-angle-gcc10.patch | 29 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc10-chrome.patch | 12 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc10-r753781.patch | 35 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc10-r755016.patch | 37 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc10-ui.patch | 13 | ||||
-rw-r--r-- | chromium/chromium/chromium-perfetto-gcc10.patch | 31 | ||||
-rw-r--r-- | chromium/chromium/chromium-webrtc-gcc10.patch | 24 | ||||
-rw-r--r-- | chromium/chromium/chromium.spec | 13 |
8 files changed, 193 insertions, 1 deletions
diff --git a/chromium/chromium/chromium-angle-gcc10.patch b/chromium/chromium/chromium-angle-gcc10.patch new file mode 100644 index 0000000..e485f28 --- /dev/null +++ b/chromium/chromium/chromium-angle-gcc10.patch @@ -0,0 +1,29 @@ +From 9a481b6ec835cfd0d4014c0b11f03c27a209f305 Mon Sep 17 00:00:00 2001 +From: Pierre-Marc Berube <pmberube@google.com> +Date: Tue, 18 Feb 2020 19:21:34 -0500 +Subject: [PATCH] Add missing #include to fix build with GCC 10. + +Bug: angleproject:4389 +Change-Id: I4a2f04a12a059924871f5d54f137c67670747ebd +Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2063042 +Reviewed-by: Jamie Madill <jmadill@chromium.org> +Commit-Queue: Jamie Madill <jmadill@chromium.org> +--- + include/platform/Platform.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/platform/Platform.h b/include/platform/Platform.h +index b603ff9ba..131674008 100644 +--- a/third_party/angle/include/platform/Platform.h ++++ b/third_party/angle/include/platform/Platform.h +@@ -10,6 +10,7 @@ + #define ANGLE_PLATFORM_H + + #include <stdint.h> ++#include <stdlib.h> + #include <array> + + #define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x3482 +-- +2.25.2 + diff --git a/chromium/chromium/chromium-gcc10-chrome.patch b/chromium/chromium/chromium-gcc10-chrome.patch new file mode 100644 index 0000000..282d7c6 --- /dev/null +++ b/chromium/chromium/chromium-gcc10-chrome.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/search/background/ntp_backgrounds.h b/chrome/browser/search/background/ntp_backgrounds.h +index 7afc0a2..6d0957e 100644 +--- a/chrome/browser/search/background/ntp_backgrounds.h ++++ b/chrome/browser/search/background/ntp_backgrounds.h +@@ -6,6 +6,7 @@ + #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_ + + #include <array> ++#include <cstddef> + + class GURL; + diff --git a/chromium/chromium/chromium-gcc10-r753781.patch b/chromium/chromium/chromium-gcc10-r753781.patch new file mode 100644 index 0000000..14088ef --- /dev/null +++ b/chromium/chromium/chromium-gcc10-r753781.patch @@ -0,0 +1,35 @@ +From c6197f05ef6d19d072847ae628c4de65799743e1 Mon Sep 17 00:00:00 2001 +From: Chisoon Jeong <chisoon.jeong@lge.com> +Date: Thu, 26 Mar 2020 21:53:05 +0000 +Subject: [PATCH] Add '#include <string>' in trace_event_memory_overhead.h for + clarity. + +Depending on compilation environment, trace_event_memory_overhead.h|cc +is not compilable, owing to missing <string> header. + +Change-Id: I8e52e7bae33e68d5dc3cc08b1d38fcd3c87303a6 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2117932 +Reviewed-by: dsinclair <dsinclair@chromium.org> +Reviewed-by: Scott Violet <sky@chromium.org> +Reviewed-by: Kentaro Hara <haraken@chromium.org> +Commit-Queue: Nico Weber <thakis@chromium.org> +Cr-Commit-Position: refs/heads/master@{#753781} +--- + base/trace_event/trace_event_memory_overhead.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/base/trace_event/trace_event_memory_overhead.h b/base/trace_event/trace_event_memory_overhead.h +index 69468d464098..e10a3eca667d 100644 +--- a/base/trace_event/trace_event_memory_overhead.h ++++ b/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" +-- +2.25.2 + diff --git a/chromium/chromium/chromium-gcc10-r755016.patch b/chromium/chromium/chromium-gcc10-r755016.patch new file mode 100644 index 0000000..f0bd415 --- /dev/null +++ b/chromium/chromium/chromium-gcc10-r755016.patch @@ -0,0 +1,37 @@ +From 17902f2263622eb21bd8adddf078355dbe7654a5 Mon Sep 17 00:00:00 2001 +From: Chisoon Jeong <chisoon.jeong@lge.com> +Date: Tue, 31 Mar 2020 18:02:12 +0000 +Subject: [PATCH] Add #include <stddef.h> for clarity and supporting gcc + compilation + +Depending on compilation environments of gcc, supported_cdm_versions.h|cc +is not compiled. To fix this issue add '#include <stddef.h>' in +supported_cdm_versions.h + +Change-Id: I0f56cb4f69e1fb3867a1c168a28431661341784b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2117912 +Reviewed-by: Nico Weber <thakis@chromium.org> +Reviewed-by: Scott Violet <sky@chromium.org> +Reviewed-by: John Rummell <jrummell@chromium.org> +Commit-Queue: Nico Weber <thakis@chromium.org> +Cr-Commit-Position: refs/heads/master@{#755016} +--- + media/cdm/supported_cdm_versions.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/media/cdm/supported_cdm_versions.h b/media/cdm/supported_cdm_versions.h +index dbe59ba5ea7f..25bb6ed3f330 100644 +--- a/media/cdm/supported_cdm_versions.h ++++ b/media/cdm/supported_cdm_versions.h +@@ -5,6 +5,8 @@ + #ifndef MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ + #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ + ++#include <stddef.h> ++ + #include <array> + + #include "media/base/media_export.h" +-- +2.25.2 + diff --git a/chromium/chromium/chromium-gcc10-ui.patch b/chromium/chromium/chromium-gcc10-ui.patch new file mode 100644 index 0000000..d643663 --- /dev/null +++ b/chromium/chromium/chromium-gcc10-ui.patch @@ -0,0 +1,13 @@ +diff --git a/ui/gfx/linux/drm_util_linux.h b/ui/gfx/linux/drm_util_linux.h +index 86ff2eb..990f12c 100644 +--- a/ui/gfx/linux/drm_util_linux.h ++++ b/ui/gfx/linux/drm_util_linux.h +@@ -7,6 +7,8 @@ + + #include "ui/gfx/buffer_types.h" + ++#include <cstdint> ++ + namespace ui { + + int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format); diff --git a/chromium/chromium/chromium-perfetto-gcc10.patch b/chromium/chromium/chromium-perfetto-gcc10.patch new file mode 100644 index 0000000..5dacec4 --- /dev/null +++ b/chromium/chromium/chromium-perfetto-gcc10.patch @@ -0,0 +1,31 @@ +From 0e7ca0bf9872932322563e70bcf84eb033ffde4f Mon Sep 17 00:00:00 2001 +From: Chisoon Jeong <chisoon.jeong@lge.com> +Date: Tue, 24 Mar 2020 19:46:20 +0900 +Subject: [PATCH] Add #include <stdint.h> in + include/perfetto/base/task_runner.h + +Depending on compilation environment, task_runner.h|cc is +not compiled due to missing stdint.h. This change includes stdint.h in +task_runner.h to fix this issue. + +Change-Id: I6dcfbd4ad62cbd287b8e75e306930ad00731048a +--- + include/perfetto/base/task_runner.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/perfetto/base/task_runner.h b/include/perfetto/base/task_runner.h +index cf6040123..040aab2b7 100644 +--- a/third_party/perfetto/include/perfetto/base/task_runner.h ++++ b/third_party/perfetto/include/perfetto/base/task_runner.h +@@ -17,6 +17,8 @@ + #ifndef INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ + #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ + ++#include <stdint.h> ++ + #include <functional> + + #include "perfetto/base/export.h" +-- +2.25.2 + diff --git a/chromium/chromium/chromium-webrtc-gcc10.patch b/chromium/chromium/chromium-webrtc-gcc10.patch new file mode 100644 index 0000000..2aa90a2 --- /dev/null +++ b/chromium/chromium/chromium-webrtc-gcc10.patch @@ -0,0 +1,24 @@ +diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h +index 8ffa440..113a816 100644 +--- a/third_party/webrtc/call/rtx_receive_stream.h ++++ b/third_party/webrtc/call/rtx_receive_stream.h +@@ -12,6 +12,7 @@ + #define CALL_RTX_RECEIVE_STREAM_H_ + + #include <map> ++#include <cstdint> + + #include "call/rtp_packet_sink_interface.h" + +diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h +index 22528c9..69e624e 100644 +--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h ++++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h +@@ -12,6 +12,7 @@ + #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ + + #include <array> ++#include <cstddef> + + namespace webrtc { + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 555d8dd..f7607cd 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -52,7 +52,7 @@ Name: chromium Version: 81.0.4044.92 -Release: 100%{?dist} +Release: 101%{?dist} Summary: A WebKit (Blink) powered web browser 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) @@ -110,13 +110,21 @@ Patch30: chromium-webrtc-cstring.patch # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b7b57438d399738 # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e5fbd254535ca8 # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba7a983c4c70ff8 +# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ee7ce691b80d8a Patch41: chromium-base-location.patch Patch42: chromium-gcc9-blink.patch +Patch43: chromium-gcc10-chrome.patch +Patch44: chromium-gcc10-ui.patch +Patch45: chromium-webrtc-gcc10.patch # Pull upstream patches Patch51: chromium-quiche-gcc9.patch Patch52: chromium-gcc9-r742632.patch Patch53: chromium-gcc9-r742834.patch +Patch54: chromium-gcc10-r753781.patch +Patch55: chromium-gcc10-r755016.patch +Patch56: chromium-angle-gcc10.patch +Patch57: chromium-perfetto-gcc10.patch # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -669,6 +677,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Apr 11 2020 - Ting-Wei Lan <lantw44@gmail.com> - 81.0.4044.92-101 +- Fix build issues for GCC 10 + * Sat Apr 11 2020 - Ting-Wei Lan <lantw44@gmail.com> - 81.0.4044.92-100 - Update to 81.0.4044.92 - Disable NaCl because of build failures and being deprecated for a long time |