X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtwebengine.spec;h=cb902cc4c84852bfb65f5b9ce17e200da4755614;hb=f50c21bf6edd2290aef9601cb0b750493544c52d;hp=a12447015f1203bbcf0e9b4c09afda431d982e84;hpb=ce64a084022b3380c4caf11deec35aa629917357;p=packages%2Fqt5-qtwebengine.git

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index a124470..cb902cc 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -1,20 +1,21 @@
 #
 # Conditional build:
 %bcond_without	doc	# Documentation
-%bcond_with	system_libvpx	# Build with system libvpx
+%bcond_without	system_libvpx	# Build with system libvpx
 
 %define		orgname		qtwebengine
 Summary:	The Qt5 WebEngine library
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine
 Name:		qt5-%{orgname}
-Version:	5.12.1
+Version:	5.13.2
 Release:	1
 License:	LGPL v3 or GPL v2+ or commercial
 Group:		X11/Libraries
-Source0:	http://download.qt.io/official_releases/qt/5.11/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
-# Source0-md5:	516c70f4f5ef8f4d0462425735f4ff47
+Source0:	http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
+# Source0-md5:	e688da1efa123f3158e85b08bd919489
 Patch0:		remove-compiler-check.patch
 Patch1:		x32.patch
+Patch2:		icu65.patch
 URL:		http://www.qt.io/
 BuildRequires:	Mesa-khrplatform-devel
 BuildRequires:	Qt5Core-devel >= %{version}
@@ -47,6 +48,8 @@ BuildRequires:	libevent-devel
 BuildRequires:	libicu-devel >= 53
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.6.0
+BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-static
 %{?with_system_libvpx:BuildRequires:	libvpx-devel >= 1.8.0}
 BuildRequires:	libwebp-devel
 BuildRequires:	libxml2-devel
@@ -76,6 +79,7 @@ BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xz
 BuildRequires:	zlib-devel
+BuildConflicts:	Qt5WebEngine-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
@@ -177,6 +181,7 @@ Przykłady do biblioteki Qt5 WebEngine.
 %ifarch x32
 %patch1 -p1
 %endif
+%patch2 -p1
 cd ./src/3rdparty/chromium
 
 %build