summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2020-06-04 12:26:46 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2020-06-04 12:26:46 +0200
commitdcb090afe8c0204690917d6b5c2611e3d4ed036e (patch)
treed56570b274fa691a46fc8b0b12fc6376e60a2046 /extra
parentf2b29a12a94b82dd6ef695338e7e803a9b59ba1b (diff)
downloadpackages-dcb090afe8c0204690917d6b5c2611e3d4ed036e.tar.xz
extra/qt5-webengine: redone gcc 10 patching for 5.15.0, mostly fixed upstream
Diffstat (limited to 'extra')
-rw-r--r--extra/qt5-webengine/PKGBUILD10
-rw-r--r--extra/qt5-webengine/qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch55
-rw-r--r--extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch10
3 files changed, 17 insertions, 58 deletions
diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD
index 7e6dfce6..7af5e50c 100644
--- a/extra/qt5-webengine/PKGBUILD
+++ b/extra/qt5-webengine/PKGBUILD
@@ -24,12 +24,16 @@ eval "$(
)"
# redone patch, see also https://bugs.gentoo.org/721876
-source+=('qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch')
-sha256sums+=('76a2a761cb30f9b0a7549d86249f049f91ce2a9c15abdcb194990258585e9fee')
+# most is now fixed upstream in 5.15.0, patch for
+# src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
+# might be superfluous, but testing takes too much time, so keeping it for now.
+# (IMHO it would include cstdint just by accident, the header file need uintxx_t)
+source+=('qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch')
+sha256sums+=('b41d4eca4c75c6d8115444ac4b10b8aa0f742d3ce64077d77eb4fb2079d0a42c')
eval "$(
declare -f prepare | \
sed '
- $ i cd "$srcdir/${_pkgfqn}"; patch -Np1 -i "${srcdir}"/qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch
+ $ i cd "$srcdir/${_pkgfqn}"; patch -Np1 -i "${srcdir}"/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch
'
)"
diff --git a/extra/qt5-webengine/qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch b/extra/qt5-webengine/qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch
deleted file mode 100644
index c9d8b04d..00000000
--- a/extra/qt5-webengine/qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -rauN qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
---- qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h 2020-03-24 10:16:30.000000000 +0100
-+++ qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h 2020-05-17 10:33:16.354005355 +0200
-@@ -6,6 +6,7 @@
- #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
-
- #include <array>
-+#include <cstddef>
-
- #include "media/base/media_export.h"
- #include "media/cdm/api/content_decryption_module.h"
-diff -rauN qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
---- qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h 2020-03-24 10:16:30.000000000 +0100
-+++ qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h 2020-05-17 09:43:19.913698589 +0200
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
-
- #include <functional>
-+#include <cstdint>
-
- #include "perfetto/base/export.h"
-
-diff -rauN qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
---- qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h 2020-03-24 10:16:30.000000000 +0100
-+++ qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h 2020-05-17 09:47:24.907146499 +0200
-@@ -12,6 +12,7 @@
- #define CALL_RTX_RECEIVE_STREAM_H_
-
- #include <map>
-+#include <cstdint>
-
- #include "call/rtp_packet_sink_interface.h"
-
-diff -rauN qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
---- qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-03-24 10:16:30.000000000 +0100
-+++ qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-05-17 09:50:18.337210561 +0200
-@@ -12,6 +12,7 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
-
- #include <array>
-+#include <cstddef>
-
- namespace webrtc {
-
-diff -rauN qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
---- qtwebengine-everywhere-src-5.14.2/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 2020-03-24 10:16:30.000000000 +0100
-+++ qtwebengine-everywhere-src-5.14.2-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 2020-05-17 09:53:24.980597815 +0200
-@@ -13,6 +13,7 @@
-
- #include <map>
- #include <set>
-+#include <cstdint>
- #include <vector>
-
- namespace webrtc {
diff --git a/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch b/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch
new file mode 100644
index 00000000..2db3d074
--- /dev/null
+++ b/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch
@@ -0,0 +1,10 @@
+--- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 2020-05-06 16:21:29.000000000 +0200
++++ qtwebengine-everywhere-src-5.15.0-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 2020-06-04 12:07:20.407353742 +0200
+@@ -13,6 +13,7 @@
+
+ #include <map>
+ #include <set>
++#include <cstdint>
+ #include <vector>
+
+ namespace webrtc {