diff --git a/.gitignore b/.gitignore index eb88acf..f9e5389 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /qtwebengine-everywhere-src-5.13.2-clean.tar.xz /qtwebengine-everywhere-src-5.14.1-clean.tar.xz /qtwebengine-everywhere-src-5.14.2-clean.tar.xz +/qtwebengine-everywhere-src-5.15.0-clean.tar.xz diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index 7e1dd97..bb28dd4 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -80,6 +80,7 @@ header_files=" libavutil/x86/asm.h \ libavutil/lzo.h \ libavutil/macros.h \ libavutil/mem_internal.h \ + libavcodec/mlp_parse.h \ libavutil/old_pix_fmts.h \ libavutil/pixfmt.h \ libavutil/qsort.h \ @@ -89,6 +90,8 @@ header_files=" libavutil/x86/asm.h \ libavutil/timer.h \ libavutil/timestamp.h \ libavutil/time_internal.h \ + libavutil/tx_priv.h \ + libavutil/tx_template.c \ libavutil/version.h \ libavutil/x86_cpu.h libavcodec/aarch64/neon.S \ diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 94ffa85..378db7d 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -13,7 +13,7 @@ # need libwebp >= 0.6.0 %global use_system_libwebp 1 -%if 0%{?fedora} > 31 +%if 0%{?fedora} > 31 && 0%{?fedora} < 33 # need libicu >= 64, only currently available on f32+ %global use_system_libicu 1 %endif @@ -48,8 +48,8 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine -Version: 5.14.2 -Release: 2%{?dist} +Version: 5.15.0 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -95,10 +95,6 @@ Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch # Use Python2 Patch26: qtwebengine-everywhere-5.13.2-use-python2.patch -# Fix missing include in chromium -Patch27: qtwebengine-everywhere-5.13.2-fix-chromium-headers.patch -# Fix gcc10 FTBFS -Patch29: qtwebengine-everywhere-5.14.1-gcc10.patch ## Upstream patches: # qtwebengine-chromium @@ -114,6 +110,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtxmlpatterns-devel BuildRequires: qt5-qtlocation-devel BuildRequires: qt5-qtsensors-devel +BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtwebchannel-devel BuildRequires: qt5-qttools-static # for examples? @@ -380,7 +377,7 @@ popd %patch3 -p1 -b .no-neon %endif %patch4 -p1 -b .SIOCGSTAMP -%patch5 -p1 -b .QT_DEPRECATED_VERSION +#patch5 -p1 -b .QT_DEPRECATED_VERSION ## upstream patches @@ -389,8 +386,6 @@ popd #patch21 -p1 -b .gn-bootstrap-verbose %patch24 -p1 -b .aarch64-new-stat %patch26 -p1 -b .use-python2 -%patch27 -p1 -b .fix-chromium -%patch29 -p1 -b .gcc10 # the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references # when building on older Qt releases @@ -405,10 +400,12 @@ sed -i -e 's|QT_CONFIG(xkbcommon)|QT_CONFIG(xkbcommon_evdev)|g' src/core/web_eve sed -i -e 's!audio_processing//!audio_processing/!g' \ src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft.cc \ src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc + # remove ./ from #line commands in ANGLE to avoid debugedit failure (?) -sed -i -e 's!\./!!g' \ - src/3rdparty/chromium/third_party/angle/src/compiler/preprocessor/Tokenizer.cpp \ - src/3rdparty/chromium/third_party/angle/src/compiler/translator/glslang_lex.cpp +#sed -i -e 's!\./!!g' \ +# src/3rdparty/chromium/third_party/angle/src/compiler/preprocessor/Tokenizer.cpp \ +# src/3rdparty/chromium/third_party/angle/src/compiler/translator/glslang_lex.cpp + # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \ @@ -526,6 +523,7 @@ done %{_qt5_libdir}/qt5/qml/* %{_qt5_libdir}/qt5/libexec/QtWebEngineProcess %{_qt5_plugindir}/designer/libqwebengineview.so +%{_qt5_plugindir}/imageformats/libqpdf.so %dir %{_qt5_datadir}/resources/ %if ! 0%{?use_system_libicu} %{_qt5_datadir}/resources/icudtl.dat @@ -612,6 +610,10 @@ done %changelog +* Wed Jun 10 2020 Rex Dieter - 5.15.0-1 +- 5.15.0 +- f33's icu-67.x currently not compatible, use bundled icu + * Sat Apr 04 2020 Rex Dieter - 5.14.2-2 - rebuild (qt5) diff --git a/qtwebengine-everywhere-5.13.2-fix-chromium-headers.patch b/qtwebengine-everywhere-5.13.2-fix-chromium-headers.patch deleted file mode 100644 index e887fa3..0000000 --- a/qtwebengine-everywhere-5.13.2-fix-chromium-headers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 033c7aa2da1bc78347765d60c15843ece02ef4d8 Mon Sep 17 00:00:00 2001 -From: Troy Dawson -Date: Tue, 11 Feb 2020 15:43:30 -0800 -Subject: [PATCH] fix chromium headers - ---- - .../chromium/cc/base/list_container_helper.cc | 250 ----------------- - .../chromium/cc/base/list_container_helper.h | 254 ++++++++++++++++++ - .../aec3/clockdrift_detector.h | 1 + - .../modules/video_coding/decoding_state.h | 1 + - 4 files changed, 256 insertions(+), 250 deletions(-) - -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h -index 22528c948..69e624e8b 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h -@@ -12,6 +12,7 @@ - #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ - - #include -+#include - - namespace webrtc { - -diff --git 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 -index b87fb2d03..ec972949d 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 -@@ -11,6 +11,7 @@ - #ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_ - #define MODULES_VIDEO_CODING_DECODING_STATE_H_ - -+#include - #include - #include - #include --- -2.24.1 - diff --git a/sources b/sources index 2c0d922..a96de3d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be -SHA512 (qtwebengine-everywhere-src-5.14.2-clean.tar.xz) = 1b946115ac7fba2db6f2807bca5b8911147c164ed19aa13e46bd030a3317f484b2241150cad59ab071da5fd000fc003a81ccc93a68ef3f34a997ff8c4a7d113a +SHA512 (qtwebengine-everywhere-src-5.15.0-clean.tar.xz) = 888c29bb1d461e2fee369c84938de7738ff56f95a63bb91df0f6ecbc46b1cbe5a6787486c15972dea1e210afe4f7adc65ef0926cf1de6545a532d3a85dec54af