up to 5.15.17

[packages/qt5-qtwebengine.git] / qt5-qtwebengine.spec

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 8c656a2de84ac3c54b6a8e7efec6c8f7b3862837..4e540e195ab7f15bd281d4595526a7dad45d5786 100644 (file)
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without doc             # documentation
 %bcond_without system_libvpx   # Build with system libvpx
+%bcond_with    system_re2      # Build with system re2
 
 %define                base_version    5.15
 
@@ -15,15 +16,20 @@
 Summary:       The Qt5 WebEngine library
 Summary(pl.UTF-8):     Biblioteka Qt5 WebEngine
 Name:          qt5-%{orgname}
-Version:       %{base_version}.8
-Release:       3
+Version:       %{base_version}.17
+Release:       1
 License:       LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:         X11/Libraries
 Source0:       qtwebengine-%{version}.tar.xz
-# Source0-md5: 57a2dbd98e641803478b6a04978a5c8b
+# Source0-md5: 7c3144b76008377d8f7d74369bd9bc4f
 Patch0:                x32.patch
 Patch1:                %{name}-gn-dynamic.patch
-Patch2:                icu.patch
+Patch3:                qt5-webengine-ffmpeg5.patch
+Patch4:                qt5-webengine-pipewire-0.3.patch
+Patch5:                chromium-107-proprietary-codecs.patch
+Patch6:                chromium-112-ffmpeg-first_dts.patch
+Patch7:                ninja-1.12.patch
+Patch8:                system-ffmpeg-check.patch
 URL:           https://www.qt.io/
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
 BuildRequires: Qt5Designer-devel >= %{qttools_ver}
@@ -89,9 +95,9 @@ BuildRequires:        qt5-build >= 5.15
 BuildRequires: qt5-qmake >= 5.15
 BuildRequires: qt5-qtdoc
 BuildRequires: qt5-qttools
-BuildRequires: re2-devel
+%{?with_system_re2:BuildRequires:      re2-devel}
 BuildRequires: rpm-build >= 4.6
-BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: rpmbuild(macros) >= 2.016
 BuildRequires: snappy-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libX11-devel
@@ -111,6 +117,7 @@ BuildRequires:      xorg-proto-glproto-devel
 BuildRequires: xz
 BuildRequires: zlib-devel
 BuildConflicts:        Qt5WebEngine-devel
+%{!?with_system_re2:BuildConflicts:    re2-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags       -fno-strict-aliasing
@@ -118,6 +125,8 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                qt5bindir       %(qtpaths-qt5 --binaries-dir)
 
+%define                ffmpeg_ver      %(rpm --quiet -q --qf=%%{V} ffmpeg-devel)
+
 %description
 Qt is a cross-platform application and UI framework. Using Qt, you can
 write web-enabled applications once and deploy them across desktop,
@@ -137,7 +146,7 @@ Ten pakiet zawiera bibliotekę Qt5 WebEngine.
 Summary:       The Qt5 WebEngine library
 Summary(pl.UTF-8):     Biblioteka Qt5 WebEngine
 Group:         Libraries
-%requires_ge_to        Qt5Core Qt5Core-devel
+%requires_eq_to        Qt5Core Qt5Core-devel
 %requires_ge_to        Qt5Gui Qt5Gui-devel
 %requires_ge_to        Qt5Network Qt5Network-devel
 %requires_ge_to        Qt5Positioning Qt5Positioning-devel
@@ -188,7 +197,7 @@ Biblioteka Qt5 WebEngine - pliki programistyczne.
 Summary:       The Qt5 Pdf library
 Summary(pl.UTF-8):     Biblioteka Qt5 Pdf
 Group:         Libraries
-%requires_ge_to        Qt5Core Qt5Core-devel
+%requires_eq_to        Qt5Core Qt5Core-devel
 %requires_ge_to        Qt5Gui Qt5Gui-devel
 %requires_ge_to        Qt5Network Qt5Network-devel
 %requires_ge_to        Qt5Qml Qt5Qml-devel
@@ -280,7 +289,14 @@ Przykłady do biblioteki Qt5 WebEngine.
 %patch0 -p1
 %endif
 %patch1 -p1
-%patch2 -p1
+%patch4 -p1 -d src/3rdparty
+%patch5 -p1 -d src/3rdparty/chromium
+%if %{_ver_ge %ffmpeg_ver 5}
+%patch3 -p1 -d src/3rdparty
+%patch6 -p1 -d src/3rdparty/chromium
+%patch8 -p1 -R
+%endif
+%patch7 -p1 -d src/3rdparty
 
 %{qt5bindir}/syncqt.pl -version %{version}
 
@@ -288,7 +304,7 @@ Przykłady do biblioteki Qt5 WebEngine.
 %ifarch x32
 export V8_TARGET_ARCH="x32"
 %endif
-qmake-qt5 CONFIG+=use_gold_linker -- \
+%{qmake_qt5} CONFIG+=use_gold_linker -- \
        -webengine-ffmpeg \
        -webengine-icu \
        -webengine-opus \