The package rpms/qt6-qtwebengine.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtwebengine.git/commit/?id=1b504....
Change: +%ifarch ppc64le
Thanks.
Full change: ============
commit 4d8326672ecf0d6ccd53fcb9b97f938af650a853 Author: Dan Horák dan@danny.cz Date: Thu Jun 5 06:20:37 2025 +0000
update ppc64le chromium patchset to qtwebengine specific change
diff --git a/qtwebengine-chromium-ppc64.patch b/qtwebengine-chromium-ppc64.patch index 4b5d07f..5496e4b 100644 --- a/qtwebengine-chromium-ppc64.patch +++ b/qtwebengine-chromium-ppc64.patch @@ -274,7 +274,7 @@ Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_paramete --- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc @@ -36,7 +36,7 @@ - #include "sandbox/linux/system_headers/linux_time.h" + #endif
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - !defined(__arm__) && !defined(__aarch64__) && \
commit fe1af83b4e42f7313de40c776cc065eb016200f5 Author: Jan Grulich jgrulich@redhat.com Date: Wed Jun 4 22:27:51 2025 +0200
6.9.1
diff --git a/.gitignore b/.gitignore index f247021..0dcd0ae 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /qtwebengine-everywhere-src-6.8.2-clean.tar.xz /qtwebengine-everywhere-src-6.9.0-rc-clean.tar.xz /qtwebengine-everywhere-src-6.9.0-clean.tar.xz +/qtwebengine-everywhere-src-6.9.1-clean.tar.xz diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index e01aa60..00ca0e3 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -81,8 +81,8 @@
Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -Version: 6.9.0 -Release: 2%{?dist} +Version: 6.9.1 +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 @@ -127,12 +127,11 @@ Patch50: qtwebengine-fix-build.patch ## Upstream patches: # https://bugreports.qt.io/browse/QTBUG-129985 Patch80: qtwebengine-fix-arm-build.patch -Patch81: qtwebengine-webrtc-fix-build-with-pipewire.patch
## Upstreamable patches:
## ppc64le port -Patch200: qtwebengine-6.7-ppc64.patch +Patch200: qtwebengine-6.9-ppc64.patch Patch201: qtwebengine-chromium-ppc64.patch # https://src.fedoraproject.org/rpms/chromium/c/c675db4ac0623d2d97344be0b3b2d9... Patch202: chromium-130-size-assertions.patch @@ -480,7 +479,6 @@ popd
## upstream patches %patch -P80 -p1 -b .fix-arm-build -%patch -P81 -p1 -b .webrtc-fix-build-with-pipewire
## upstreamable patches
@@ -840,6 +838,9 @@ done %endif
%changelog +* Tue Jun 03 2025 Jan Grulich jgrulich@redhat.com - 6.9.1-1 +- 6.9.1 + * Tue Apr 22 2025 Marie Loise Nolden loise@kde.org - 6.9.0-2 - global define all optional system libs, enable XFA - cleanup spec diff --git a/qtwebengine-6.7-ppc64.patch b/qtwebengine-6.7-ppc64.patch deleted file mode 100644 index 4079f06..0000000 --- a/qtwebengine-6.7-ppc64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtwebengine-everywhere-src-6.7.2/cmake/Functions.cmake.orig qtwebengine-everywhere-src-6.7.2/cmake/Functions.cmake ---- qtwebengine-everywhere-src-6.7.2/cmake/Functions.cmake.orig 2024-09-19 16:19:27.740234419 +0200 -+++ qtwebengine-everywhere-src-6.7.2/cmake/Functions.cmake 2024-09-19 16:28:30.744377245 +0200 -@@ -635,6 +635,8 @@ function(get_gn_arch result arch) - set(${result} "mips64el" PARENT_SCOPE) - elseif(arch STREQUAL "riscv64") - set(${result} "riscv64" PARENT_SCOPE) -+ elseif(arch STREQUAL "power64") -+ set(${result} "ppc64" PARENT_SCOPE) - else() - message(FATAL_ERROR "Unknown architecture: ${arch}") - endif() diff --git a/qtwebengine-6.9-ppc64.patch b/qtwebengine-6.9-ppc64.patch new file mode 100644 index 0000000..8b58211 --- /dev/null +++ b/qtwebengine-6.9-ppc64.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtToolchainHelpers.cmake b/cmake/QtToolchainHelpers.cmake +index eaa3a4339..5693c4cc4 100644 +--- a/cmake/QtToolchainHelpers.cmake ++++ b/cmake/QtToolchainHelpers.cmake +@@ -55,6 +55,8 @@ function(get_gn_arch result arch) + set(${result} "mips64el" PARENT_SCOPE) + elseif(arch STREQUAL "riscv64") + set(${result} "riscv64" PARENT_SCOPE) ++ elseif(arch STREQUAL "power64") ++ set(${result} "ppc64" PARENT_SCOPE) + else() + message(FATAL_ERROR "Unknown architecture: ${arch}") + endif() diff --git a/qtwebengine-fix-arm-build.patch b/qtwebengine-fix-arm-build.patch index 7f30e1a..5013750 100644 --- a/qtwebengine-fix-arm-build.patch +++ b/qtwebengine-fix-arm-build.patch @@ -1,8 +1,8 @@ diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index cc992b4d2..ae1fba849 100644 +index d5e9b715e..af4c046c4 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -566,6 +566,10 @@ foreach(arch ${archs}) +@@ -570,6 +570,10 @@ foreach(arch ${archs}) list(APPEND gnArgArg libyuv_use_sve=false) endif() endif() diff --git a/qtwebengine-webrtc-fix-build-with-pipewire.patch b/qtwebengine-webrtc-fix-build-with-pipewire.patch deleted file mode 100644 index 4a3b5f3..0000000 --- a/qtwebengine-webrtc-fix-build-with-pipewire.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/webrtc/AUTHORS b/src/3rdparty/chromium/third_party/webrtc/AUTHORS -index 064e12611..0543ba699 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/AUTHORS -+++ b/src/3rdparty/chromium/third_party/webrtc/AUTHORS -@@ -60,6 +60,7 @@ Hans Knoechel hans@hans-knoechel.de - Helmut Januschka helmut@januschka.com - Hugues Ekra hekra01@gmail.com - Hyungjoo Na element11sodium@gmail.com -+Ilya Katsnelson me@0upti.me - Jake Hilton jakehilton@gmail.com - James H. Brown jbrown@burgoyne.com - Jan Grulich grulja@gmail.com -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -index e9f7f765a..358cf3d7e 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -@@ -85,7 +85,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, - .param = OnNodeParam, - }; - -- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); -+ pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this); - } - - // static -@@ -117,7 +117,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { - uint32_t id = info->params[i].id; - if (id == SPA_PARAM_EnumFormat && - info->params[i].flags & SPA_PARAM_INFO_READ) { -- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); -+ pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); - break; - } - } diff --git a/sources b/sources index 9b4d189..c263b96 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qtwebengine-everywhere-src-6.9.0-clean.tar.xz) = 003c4372dddc112bf0e48ee644301e948729e9fc119ada4d420410ad04ac78a1665af6023e99d73516316e8298e5f19e59e4c1f37c91607d66b401b8a688b7e7 +SHA512 (qtwebengine-everywhere-src-6.9.1-clean.tar.xz) = f83a7c9c18971b543c4ebf6d5083687450a28a6f6f0148c7a10c4eb1ba0af47f3c7c29d78b98329b9912f54664f381250c3d8c60b8baf56a82eb0686c9d07661 SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
commit 1729aaf5cff0515c711ce85c5f8eec250ffd43b6 Author: Marie Loise Nolden loise@kde.org Date: Thu Apr 24 06:32:00 2025 +0000
more cleanup
diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index d3f9174..e01aa60 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -143,10 +143,35 @@ Patch202: chromium-130-size-assertions.patch ExclusiveArch: aarch64 x86_64 ppc64le
BuildRequires: cmake +BuildRequires: ninja-build >= 1.7.2 BuildRequires: make +%if 0%{?rhel} && 0%{?rhel} < 10 +BuildRequires: gcc-toolset-13 +BuildRequires: gcc-toolset-13-libatomic-devel +%else +BuildRequires: gcc-c++ +%endif + +# gn links statically (for now) +BuildRequires: libstdc++-static +BuildRequires: libatomic + +BuildRequires: %{__python3} +BuildRequires: python3-html5lib +BuildRequires: gperf +BuildRequires: bison +BuildRequires: flex +BuildRequires: perl-interpreter + +BuildRequires: nodejs >= 14.9 +BuildRequires: krb5-devel +BuildRequires: git-core + BuildRequires: qt6-srpm-macros BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qtbase-private-devel +%{?_qt6_version:Requires: qt6-qtbase%{?_isa} = %{_qt6_version}} + # TODO: check of = is really needed or if >= would be good enough -- rex %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel @@ -158,27 +183,10 @@ BuildRequires: qt6-qtquickcontrols2-devel BuildRequires: qt6-qtwebchannel-devel BuildRequires: qt6-qtwebsockets-devel BuildRequires: qt6-qthttpserver-devel -# for examples? -BuildRequires: ninja-build -BuildRequires: cmake -BuildRequires: bison -BuildRequires: flex -BuildRequires: gcc-c++ -%if 0%{?rhel} && 0%{?rhel} < 10 -BuildRequires: gcc-toolset-13 -BuildRequires: gcc-toolset-13-libatomic-devel -%endif -# gn links statically (for now) -BuildRequires: libstdc++-static -BuildRequires: git-core -BuildRequires: gperf -BuildRequires: krb5-devel -BuildRequires: libatomic -BuildRequires: nodejs
# optional system libraries in the order of the -- Configure summary: listing %if 0%{?use_system_re2} -BuildRequires: pkgconfig(re2) +BuildRequires: pkgconfig(re2) >= 11.0.0 %else Provides: bundled(re2) %endif @@ -189,16 +197,16 @@ BuildRequires: libicu-devel >= 70 BuildRequires: pkgconfig(libwebp) >= 0.6.0 %endif %if 0%{?use_system_opus} -BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(opus) >= 1.3.1 %endif %if %{?use_system_ffmpeg} -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libavutil) >= 58.29.100 +BuildRequires: pkgconfig(libavcodec) >= 60.31.102 +BuildRequires: pkgconfig(libavformat) >= 60.16.100 BuildRequires: pkgconfig(openh264) %endif %if %{?use_system_libvpx} -BuildRequires: pkgconfig(vpx) >= 1.8.0 +BuildRequires: pkgconfig(vpx) >= 1.10.0 %endif %if 0%{?use_system_snappy} BuildRequires: pkgconfig(snappy) @@ -233,10 +241,10 @@ Provides: bundled(libxslt) = 1.1.3 BuildRequires: pkgconfig(lcms2) %endif %if 0%{?use_system_libpng} -BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libpng) >= 1.6.0 %endif %if 0%{?use_system_libtiff} -BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libtiff-4) >= 4.2.0 %endif %if 0%{?use_system_libjpeg} BuildRequires: pkgconfig(libjpeg) @@ -245,11 +253,11 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libopenjp2) %endif %if 0%{?use_system_harfbuzz} -BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(harfbuzz) >= 4.3.0 %endif %if 0%{?use_system_freetype} +BuildRequires: pkgconfig(freetype2) >= 2.4.2 BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) %endif %if 0%{?use_system_libpci} BuildRequires: pkgconfig(libpci) @@ -258,8 +266,32 @@ BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libudev) %endif
+# qpa-xcb support libraries +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xrandr) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xshmfence) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(xcb) + +# required for webrtc +BuildRequires: pkgconfig(xdamage) + +# required for alsa BuildRequires: pkgconfig(alsa) +# required for pulseaudio BuildRequires: pkgconfig(libpulse) +# required for vaapi +BuildRequires: pkgconfig(libva) +# required for pipewire +BuildRequires: pkgconfig(libpipewire-0.3) + BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(epoxy) @@ -267,30 +299,9 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libcap) -BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libpipewire-0.3) -BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(nss) >= 3.26 BuildRequires: pkgconfig(poppler-cpp) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcomposite) -BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(xdamage) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(xkbfile) -BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(xrender) -%if ! (0%{?rhel} >= 10) -BuildRequires: pkgconfig(xscrnsaver) -%endif -BuildRequires: pkgconfig(xshmfence) -BuildRequires: pkgconfig(xtst) -BuildRequires: perl-interpreter -BuildRequires: %{__python3} -BuildRequires: python3-html5lib -BuildRequires: pkgconfig(libva) +
%if 0%{?fedora} && 0%{?fedora} >= 39 BuildRequires: python3-zombie-imp @@ -406,8 +417,6 @@ Provides: bundled(v8) = 11.8.172.18 # http://www.netlib.org/fdlibm/readme Provides: bundled(fdlibm) = 5.3
-%{?_qt6_version:Requires: qt6-qtbase%{?_isa} = %{_qt6_version}} - %description %{summary}.
@@ -450,7 +459,7 @@ Requires: qt6-qtdeclarative-devel%{?_isa}
%package -n qt6-qtpdf-examples Summary: Example files for qt6-qtpdf - +Requires: qt6-qtsvg%{?_isa} %description -n qt6-qtpdf-examples %{summary}.
commit 1b504add43c2002a2f3ed6d7053a73b8f992795d Author: Marie Loise Nolden loise@kde.org Date: Sun Apr 20 17:17:19 2025 +0200
global define all optional system libs, enable XFA
diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index d251557..d3f9174 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -5,14 +5,42 @@ # package-notes causes FTBFS (#2043178) %undefine _package_note_file
-%global use_system_libxslt 1 -%global use_system_libxml 1 +# defines for Optional system libraries: +%global use_system_re2 1 +%global use_system_libicu 1 %global use_system_libwebp 1 -%global use_system_jsoncpp 1 +%global use_system_opus 1 +%global use_system_ffmpeg 1 +# libvpx is exclusive with VA-API support (libva) which is enabled by default +%global use_system_libvpx 0 +%global use_system_snappy 1 +%global use_system_glib 1 +%global use_system_zlib 1 +%global use_system_minizip 1 +%global use_system_libevent 1 +%global use_system_libxml 1 +%global use_system_lcms2 1 +%global use_system_libpng 1 +%global use_system_libtiff 1 +%global use_system_libjpeg 1 +%global use_system_libopenjpeg2 1 +%global use_system_harfbuzz 1 +%global use_system_freetype 1 +%global use_system_libpci 1 +%global use_system_libudev 1 + %if 0%{?rhel} && 0%{?rhel} == 9 +%global use_system_re2 0 %global use_system_libicu 0 +%global use_system_minizip 0 +%global use_system_harfbuzz 0 +%endif + +# ppc64le builds currently fail with V8/XFA enabled (qt 6.9.0) +%ifarch ppc64le +%global enable_pdf_v8 0 %else -%global use_system_libicu 1 +%global enable_pdf_v8 1 %endif
%if 0%{?fedora} && 0%{?fedora} >= 39 @@ -20,8 +48,6 @@ %global use_system_py_six 1 %endif
-%global use_system_re2 0 - # NEON support on ARM (detected at runtime) - disable this if you are hitting # FTBFS due to e.g. GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495 #global arm_neon 1 @@ -56,7 +82,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.9.0 -Release: 1%{?dist} +Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -131,6 +157,7 @@ BuildRequires: qt6-qttools-static BuildRequires: qt6-qtquickcontrols2-devel BuildRequires: qt6-qtwebchannel-devel BuildRequires: qt6-qtwebsockets-devel +BuildRequires: qt6-qthttpserver-devel # for examples? BuildRequires: ninja-build BuildRequires: cmake @@ -146,49 +173,103 @@ BuildRequires: libstdc++-static BuildRequires: git-core BuildRequires: gperf BuildRequires: krb5-devel -%if 0%{?use_system_libicu} -BuildRequires: libicu-devel >= 68 -%endif BuildRequires: libatomic -BuildRequires: libjpeg-devel BuildRequires: nodejs + +# optional system libraries in the order of the -- Configure summary: listing %if 0%{?use_system_re2} -BuildRequires: re2-devel +BuildRequires: pkgconfig(re2) +%else Provides: bundled(re2) %endif -BuildRequires: snappy-devel -BuildConflicts: minizip-devel +%if 0%{?use_system_libicu} +BuildRequires: libicu-devel >= 70 +%endif +%if 0%{?use_system_libwebp} +BuildRequires: pkgconfig(libwebp) >= 0.6.0 +%endif +%if 0%{?use_system_opus} +BuildRequires: pkgconfig(opus) +%endif +%if %{?use_system_ffmpeg} +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(openh264) +%endif +%if %{?use_system_libvpx} +BuildRequires: pkgconfig(vpx) >= 1.8.0 +%endif +%if 0%{?use_system_snappy} +BuildRequires: pkgconfig(snappy) +%endif +%if 0%{?use_system_glib} +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gio-2.0) +%endif +%if %{?use_system_zlib} +BuildRequires: pkgconfig(zlib) +%endif +%if 0%{?use_system_minizip} +BuildRequires: pkgconfig(minizip) +%else Provides: bundled(minizip) = 2.8.1 +%endif +%if 0%{?use_system_libevent} +BuildRequires: pkgconfig(libevent) +%endif +%if %{?use_system_libxml} +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxslt) +%else +# bundled as "libxml" +# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h +Provides: bundled(libxml2) = 2.9.13 +# see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version +Provides: bundled(libxslt) = 1.1.3 +%endif +%if 0%{?use_system_lcms2} +BuildRequires: pkgconfig(lcms2) +%endif +%if 0%{?use_system_libpng} +BuildRequires: pkgconfig(libpng) +%endif +%if 0%{?use_system_libtiff} +BuildRequires: pkgconfig(libtiff-4) +%endif +%if 0%{?use_system_libjpeg} +BuildRequires: pkgconfig(libjpeg) +%endif +%if 0%{?use_system_libopenjpeg2} +BuildRequires: pkgconfig(libopenjp2) +%endif +%if 0%{?use_system_harfbuzz} +BuildRequires: pkgconfig(harfbuzz) +%endif +%if 0%{?use_system_freetype} +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +%endif +%if 0%{?use_system_libpci} +BuildRequires: pkgconfig(libpci) +%endif +%if 0%{?use_system_libudev} +BuildRequires: pkgconfig(libudev) +%endif + BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gbm) -BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(harfbuzz) -%if 0%{?use_system_jsoncpp} -BuildRequires: pkgconfig(jsoncpp) -%endif -BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libevent) -BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libpipewire-0.3) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libudev) -%if 0%{?use_system_libwebp} -BuildRequires: pkgconfig(libwebp) >= 0.6.0 -%endif BuildRequires: pkgconfig(nss) -BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) @@ -206,21 +287,9 @@ BuildRequires: pkgconfig(xscrnsaver) %endif BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(zlib) -%if %{?use_system_libxslt} -BuildRequires: pkgconfig(libxslt) -%endif -%if %{?use_system_libxml} -BuildRequires: pkgconfig(libxml-2.0) -%endif BuildRequires: perl-interpreter BuildRequires: %{__python3} BuildRequires: python3-html5lib -BuildRequires: pkgconfig(vpx) >= 1.8.0 -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(openh264) BuildRequires: pkgconfig(libva)
%if 0%{?fedora} && 0%{?fedora} >= 39 @@ -285,19 +354,9 @@ Provides: bundled(leveldb) = 1.23 Provides: bundled(libjingle) # see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number Provides: bundled(libsrtp) = 2.4.0 -%if ! %{?use_system_libxml} -# bundled as "libxml" -# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h -Provides: bundled(libxml2) = 2.9.13 -%endif -%if ! %{?use_system_libxslt} -# see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version -Provides: bundled(libxslt) = 1.1.3 -%endif Provides: bundled(libyuv) = 1819 Provides: bundled(modp_b64) Provides: bundled(ots) -Provides: bundled(re2) # see src/3rdparty/chromium/third_party/protobuf/CHANGES.txt for the version Provides: bundled(protobuf) = 3.13.0.1 Provides: bundled(qcms) = 4 @@ -439,27 +498,22 @@ ln -s /usr/lib/python%{python3_version}/site-packages/six.py src/3rdparty/chromi ln -s /usr/lib/python%{python3_version}/site-packages/six.py src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/third_party/six/six.py %endif
-%if 0%{?use_system_re2} +#%%if 0%{?use_system_re2} # http://bugzilla.redhat.com/1337585 # can't just delete, but we'll overwrite with system headers to be on the safe side -cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/ -%endif +#cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/ +#%%endif
# copy the Chromium license so it is installed with the appropriate name cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium
-# use system libraries +# use system libraries not handled by cmake options correctly system_libs=() -%if %{?use_system_libxml} - system_libs+=(libxml) -%endif -%if %{?use_system_libxslt} - system_libs+=(libxslt) -%endif +%if %{?use_system_ffmpeg} system_libs+=(ffmpeg) system_libs+=(openh264) - +%endif # Use system libraries src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py --system-libraries ${system_libs[@]}
@@ -482,21 +536,61 @@ export STRIP=strip export NINJAFLAGS="%{__ninja_common_opts}" export NINJA_PATH=%{__ninja}
+# this follows the logic of the Configure summary to turn on and off %cmake_qt6 \ -DCMAKE_TOOLCHAIN_FILE:STRING="%{_libdir}/cmake/Qt6/qt.toolchain.cmake" \ - -DFEATURE_qtpdf_build:BOOL=ON \ + -DFEATURE_webengine_build_gn:BOOL=ON \ + -DFEATURE_webengine_jumbo_build:BOOL=ON \ -DFEATURE_webengine_developer_build:BOOL=OFF \ + -DFEATURE_qtwebengine_build:BOOL=ON \ + -DFEATURE_qtwebengine_core_build:BOOL=ON \ + -DFEATURE_qtwebengine_widgets_build:BOOL=ON \ + -DFEATURE_qtwebengine_quick_build:BOOL=ON \ + -DFEATURE_qtpdf_build:BOOL=ON \ + -DFEATURE_qtpdf_widgets_build:BOOL=ON \ + -DFEATURE_qtpdf_quick_build:BOOL=ON \ + -DFEATURE_webengine_system_re2:BOOL=%{?use_system_re2} \ + -DFEATURE_webengine_system_icu:BOOL=%{?use_system_libicu} \ + -DFEATURE_webengine_system_libwebp:BOOL=%{?use_system_libwebp} \ + -DFEATURE_webengine_system_opus:BOOL=%{?use_system_opus} \ + -DFEATURE_webengine_system_ffmpeg:BOOL=%{?use_system_ffmpeg} \ + -DFEATURE_webengine_system_libvpx:BOOL=%{?use_system_libvpx} \ + -DFEATURE_webengine_system_snappy:BOOL=%{?use_system_snappy} \ + -DFEATURE_webengine_system_glib:BOOL=%{?use_system_glib} \ + -DFEATURE_webengine_system_zlib:BOOL=%{?use_system_zlib} \ + -DFEATURE_webengine_system_minizip:BOOL=%{?use_system_minizip} \ + -DFEATURE_webengine_system_libevent:BOOL=%{?use_system_libevent} \ + -DFEATURE_webengine_system_libxml:BOOL=%{?use_system_libxml} \ + -DFEATURE_webengine_system_lcms2:BOOL=%{?use_system_lcms2} \ + -DFEATURE_webengine_system_libpng:BOOL=%{?use_system_libpng} \ + -DFEATURE_webengine_system_libtiff:BOOL=%{?use_system_libtiff} \ + -DFEATURE_webengine_system_libjpeg:BOOL=%{?use_system_libjpeg} \ + -DFEATURE_webengine_system_libopenjpeg2:BOOL=%{?use_system_libopenjpeg2} \ + -DFEATURE_webengine_system_harfbuzz:BOOL=%{?use_system_harfbuzz} \ + -DFEATURE_webengine_system_freetype:BOOL=%{?use_system_freetype} \ + -DFEATURE_webengine_system_libpci:BOOL=%{?use_system_libpci} \ + -DFEATURE_webengine_system_libudev:BOOL=%{?use_system_libudev} \ -DFEATURE_webengine_embedded_build:BOOL=OFF \ - -DFEATURE_webengine_extensions:BOOL=ON \ - -DFEATURE_webengine_kerberos:BOOL=ON \ - -DFEATURE_webengine_native_spellchecker:BOOL=OFF \ + -DFEATURE_webengine_pepper_plugins:BOOL=ON \ -DFEATURE_webengine_printing_and_pdf:BOOL=ON \ -DFEATURE_webengine_proprietary_codecs:BOOL=ON \ - -DFEATURE_webengine_system_icu:BOOL=%{?use_system_libicu} \ - -DFEATURE_webengine_system_libevent:BOOL=ON \ - -DFEATURE_webengine_system_ffmpeg:BOOL=ON \ + -DFEATURE_webengine_spellchecker:BOOL=ON \ + -DFEATURE_webengine_native_spellchecker:BOOL=OFF \ -DFEATURE_webengine_webrtc:BOOL=ON \ -DFEATURE_webengine_webrtc_pipewire:BOOL=ON \ + -DFEATURE_webengine_geolocation:BOOL=ON \ + -DFEATURE_webengine_webchannel:BOOL=ON \ + -DFEATURE_webengine_kerberos:BOOL=ON \ + -DFEATURE_webengine_extensions:BOOL=ON \ + -DFEATURE_webengine_ozone_x11:BOOL=ON \ + -DFEATURE_webengine_vulkan:BOOL=ON \ + -DFEATURE_webengine_vaapi:BOOL=ON \ + -DFEATURE_webengine_system_alsa:BOOL=ON \ + -DFEATURE_webengine_system_pulseaudio:BOOL=ON \ + -DFEATURE_webengine_system_gbm:BOOL=ON \ + -DFEATURE_webengine_v8_context_snapshot:BOOL=ON \ + -DFEATURE_webenginedriver:BOOL=ON \ + -DFEATURE_pdf_v8:BOOL=%{?enable_pdf_v8} \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
@@ -737,6 +831,10 @@ done %endif
%changelog +* Tue Apr 22 2025 Marie Loise Nolden loise@kde.org - 6.9.0-2 +- global define all optional system libs, enable XFA +- cleanup spec + * Wed Apr 02 2025 Jan Grulich jgrulich@redhat.com - 6.9.0-1 - 6.9.0
commit b90081532bae65537769926c6bedc82a59ca448e Author: Marie Loise Nolden loise@kde.org Date: Sat Apr 19 15:50:54 2025 +0000
undo last commit
diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index ed6694e..d251557 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -221,9 +221,8 @@ BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(openh264) -%if 0%{?fedora} && 0%{?fedora} >= 39 BuildRequires: pkgconfig(libva) -%endif + %if 0%{?fedora} && 0%{?fedora} >= 39 BuildRequires: python3-zombie-imp %endif
commit 08ba518990759852218475511b322f6eff109fd3 Author: Marie Loise Nolden loise@kde.org Date: Sat Apr 19 15:48:33 2025 +0000
libva only for fedora
diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index d251557..ed6694e 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -221,8 +221,9 @@ BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(openh264) +%if 0%{?fedora} && 0%{?fedora} >= 39 BuildRequires: pkgconfig(libva) - +%endif %if 0%{?fedora} && 0%{?fedora} >= 39 BuildRequires: python3-zombie-imp %endif