icu rebuild

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

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 254c5207aec0b46cd3a613cd66c6d1b8f20ef05e..5607d9b1a993a2efac33c935760c5756004af438 100644 (file)
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -3,6 +3,8 @@
 %bcond_without doc             # documentation
 %bcond_without system_libvpx   # Build with system libvpx
 
+%define                base_version    5.15
+
 %define                orgname         qtwebengine
 %define                qtbase_ver              5.15
 %define                qtdeclarative_ver       5.15
@@ -13,17 +15,15 @@
 Summary:       The Qt5 WebEngine library
 Summary(pl.UTF-8):     Biblioteka Qt5 WebEngine
 Name:          qt5-%{orgname}
-Version:       5.15.6
-Release:       1
+Version:       %{base_version}.8
+Release:       2
 License:       LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:         X11/Libraries
 Source0:       qtwebengine-%{version}.tar.xz
-# Source0-md5: 61a4fa3e98149543c08172c99993c844
+# Source0-md5: 57a2dbd98e641803478b6a04978a5c8b
 Patch0:                x32.patch
 Patch1:                %{name}-gn-dynamic.patch
 Patch2:                icu.patch
-Patch3:                glibc-2.33.patch
-Patch4:                glibc2.34.patch
 URL:           https://www.qt.io/
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
 BuildRequires: Qt5Designer-devel >= %{qttools_ver}
@@ -50,14 +50,15 @@ BuildRequires:      glib2-devel >= 1:2.32.0
 BuildRequires: glibc-misc >= 6:2.17
 BuildRequires: glibc-devel >= 6:2.17
 BuildRequires: gperf
-BuildRequires: harfbuzz-devel >= 2.2.0
+BuildRequires: harfbuzz-devel >= 3.0.0
+BuildRequires: harfbuzz-subset-devel >= 3.0.0
 # webengine-system-jsoncpp disabled in src/core/config/linux.pri
 #BuildRequires:        jsoncpp-devel
 BuildRequires: khrplatform-devel
 BuildRequires: lcms2-devel
 BuildRequires: libdrm-devel
 BuildRequires: libevent-devel
-BuildRequires: libicu-devel >= 64
+BuildRequires: libicu-devel >= 65
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel >= 2:1.6.0
 BuildRequires: libstdc++-devel >= 6:5
@@ -80,6 +81,7 @@ BuildRequires:        pkgconfig
 #BuildRequires:        protobuf-devel
 BuildRequires: pulseaudio-devel >= 0.9.10
 BuildRequires: python >= 1:2.7.5
+BuildRequires: python-modules >= 1:2.7.5
 %if %{with doc}
 BuildRequires: qt5-assistant >= 5.15
 %endif
@@ -88,6 +90,7 @@ BuildRequires:        qt5-qmake >= 5.15
 BuildRequires: qt5-qtdoc
 BuildRequires: qt5-qttools
 BuildRequires: re2-devel
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: snappy-devel
 BuildRequires: tar >= 1:1.22
@@ -103,6 +106,8 @@ BuildRequires:      xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: xorg-lib-libxkbcommon-devel
+BuildRequires: xorg-lib-libxkbfile-devel
+BuildRequires: xorg-proto-glproto-devel
 BuildRequires: xz
 BuildRequires: zlib-devel
 BuildConflicts:        Qt5WebEngine-devel
@@ -141,8 +146,9 @@ Group:              Libraries
 %requires_ge_to        Qt5WebChannel Qt5WebChannel-devel
 Requires:      alsa-lib >= 1.0.10
 Requires:      freetype >= 1:2.4.2
-Requires:      harfbuzz >= 2.2.0
-Requires:      libicu >= 64
+Requires:      harfbuzz >= 3.0.0
+Requires:      harfbuzz-subset >= 3.0.0
+Requires:      libicu >= 65
 Requires:      libpng >= 2:1.6.0
 %{?with_system_libvpx:Requires:        libvpx >= 1.8.0}
 Requires:      nss >= 3.26
@@ -275,10 +281,6 @@ Przykłady do biblioteki Qt5 WebEngine.
 %endif
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-cd src/3rdparty/chromium
-%patch4 -p1
-cd ../../..
 
 %{qt5bindir}/syncqt.pl -version %{version}
 
@@ -344,6 +346,10 @@ ifecho_tree examples %{_examplesdir}/qt5/pdfwidgets
 ifecho_tree examples %{_examplesdir}/qt5/webengine
 ifecho_tree examples %{_examplesdir}/qt5/webenginewidgets
 
+# fixup artificial Qt version dependency
+sed -i -e 's/%{version} ${_Qt5WebEngine[^_]*_FIND_VERSION_EXACT}/%{base_version}/' \
+       $RPM_BUILD_ROOT%{_libdir}/cmake/Qt5WebEngine*/Qt5WebEngine*Config.cmake
+
 %clean
 rm -rf $RPM_BUILD_ROOT