commit 71a2ca458ef48cdb522013bf1ccee2f010b33dfe Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com&gt; Date: Tue Apr 18 16:34:49 2023 +0100 feat: sync patch with fedora repo qt5-qtwebengine-c99.patch | 45 ++++++++++++++++++++++++++++++++++++++++++ qt5-qtwebengine-freeworld.spec | 9 ++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) --- diff --git a/qt5-qtwebengine-c99.patch b/qt5-qtwebengine-c99.patch new file mode 100644 index 0000000..bf34288 --- /dev/null +++ b/qt5-qtwebengine-c99.patch @@ -0,0 +1,45 @@ +Avoid calls to the undeclared strlcpy function in libsync. This +prevents a build failure with future compilers. + +Submitted upstream: <https://bugreports.qt.io/browse/QTBUG-111440> + +diff -up qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn.c99 qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn +--- qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn.c99 2023-02-23 10:54:15.909380015 +0100 ++++ qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn 2023-02-23 11:00:32.019601795 +0100 +@@ -21,24 +21,15 @@ if (!use_system_libsync) { + ] + } + +- config("libsync_private_config") { +- # To suppress the warning caused by strlcpy. +- cflags = [ "-Wno-implicit-function-declaration" ] +- } +- + source_set("libsync") { + sources = [ + "src/include/sync/sync.h", + "src/sw_sync.h", + "src/sync.c", +- "strlcpy.c", + ] + + configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ +- "//build/config/compiler:no_chromium_code", +- ":libsync_private_config", +- ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] + + public_configs = [ ":libsync_config" ] + } +diff -up qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c.c99 qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c +--- qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c.c99 2023-02-23 10:54:30.650231820 +0100 ++++ qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c 2023-02-23 10:54:50.116036131 +0100 +@@ -29,6 +29,7 @@ + + #include <sync/sync.h> + ++#include "../strlcpy.c" + + struct sw_sync_create_fence_data { + __u32 value; diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index 030bcbc..956400d 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -63,7 +63,7 @@ Summary: Qt5 - QtWebEngine components (freeworld version) Name: qt5-qtwebengine-freeworld Version: 5.15.12 -Release: 2%{?dist} +Release: 3%{?dist} %global major_minor %(echo %{version} | cut -d. -f-2) %global major %(echo %{version} | cut -d. -f1) @@ -110,6 +110,8 @@ Patch33: qtwebengine-5.15-Backport-of-16k-page-support-on-aarch64.patch # Fixes for GCC 13 # https://bugzilla.redhat.com/show_bug.cgi?id=2164993 Patch34: qtwebengine-fix-build.patch +# https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/628adfbb0613c892b916... +Patch35: qt5-qtwebengine-c99.patch ## Upstream patches: @@ -387,6 +389,7 @@ popd %patch -P 32 -p1 -b .skia-missing-includes %patch -P 33 -p1 -b .aarch64-16kb-support %patch -P 34 -p1 -b .gcc-13 +%patch -P 35 -p1 -b .c99 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS @@ -478,6 +481,10 @@ echo "%{_libdir}/%{name}" \ %changelog +* Tue Apr 18 2023 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.15.12-3 +- Port bundled libsync to C99 +- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/628adfbb0613c892b916... + * Tue Apr 18 2023 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.15.12-2 - Rebuild (Qt 5.15.9)