X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtwebengine.spec;h=15341777728c426ba1b98ff0add053b08e6a99f1;hb=2d01134509a60af7a65d341d8f6d7cd06bf00185;hp=664bb712430b410171554af0ad3e21bd1894731d;hpb=de8a9faab947a64e9f6789c74150c563f93996df;p=packages%2Fqt5-qtwebengine.git

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 664bb71..1534177 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -1,37 +1,83 @@
 #
 # Conditional build:
 %bcond_without	doc	# Documentation
+%bcond_without	system_libvpx	# Build with system libvpx
 
 %define		orgname		qtwebengine
-%define		qtbase_ver		%{version}
-%define		qtdeclarative_ver	%{version}
-%define		qttools_ver		%{version}
-%define		qtwebchannel_ver	%{version}
 Summary:	The Qt5 WebEngine library
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine
 Name:		qt5-%{orgname}
-Version:	5.5.1
-Release:	0.1
+Version:	5.14.0
+Release:	1
 License:	LGPL v3 or GPL v2+ or commercial
 Group:		X11/Libraries
-Source0:	http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
-# Source0-md5:	2a548bde706e8639cdec2cbe31d85545
+Source0:	http://download.qt.io/official_releases/qt/5.14/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
+# Source0-md5:	a6765a7674728f6a3326de21937f9a94
+Patch1:		x32.patch
 URL:		http://www.qt.io/
-BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
-BuildRequires:	Qt5Gui-devel >= %{qtbase_ver}
-BuildRequires:	Qt5Network-devel >= %{qtbase_ver}
-BuildRequires:	Qt5Qml-devel >= %{qtdeclarative_ver}
-BuildRequires:	Qt5Quick-devel >= %{qtdeclarative_ver}
-BuildRequires:	Qt5WebChannel-devel >= %{qtwebchannel_ver}
-BuildRequires:	Qt5Widgets-devel >= %{qtbase_ver}
+BuildRequires:	Mesa-khrplatform-devel
+BuildRequires:	Qt5Core-devel >= %{version}
+BuildRequires:	Qt5Designer-devel >= %{version}
+BuildRequires:	Qt5Gui-devel >= %{version}
+BuildRequires:	Qt5Network-devel >= %{version}
+BuildRequires:	Qt5Positioning-devel >= %{version}
+BuildRequires:	Qt5PrintSupport-devel >= %{version}
+BuildRequires:	Qt5Qml-devel >= %{version}
+BuildRequires:	Qt5Quick-devel >= %{version}
+BuildRequires:	Qt5UiTools-devel >= %{version}
+BuildRequires:	Qt5WebChannel-devel >= %{version}
+BuildRequires:	Qt5WebSockets-devel >= %{version}
+BuildRequires:	Qt5Widgets-devel >= %{version}
+BuildRequires:	alsa-lib-devel >= 1.0.10
+BuildRequires:	bison
+BuildRequires:	dbus-devel
+BuildRequires:	ffmpeg-devel
+BuildRequires:	flex
+BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel >= 2.4.2
+BuildRequires:	glib2-devel >= 1:2.32.0
+BuildRequires:	glibc-misc >= 2.17
+BuildRequires:	gperf
+BuildRequires:	harfbuzz-devel >= 1.4.2
+BuildRequires:	jsoncpp-devel
+BuildRequires:	lcms2-devel
+BuildRequires:	libdrm-devel
+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
+BuildRequires:	libxslt-devel
+BuildRequires:	minizip-devel
+BuildRequires:	ninja
+BuildRequires:	nss-devel >= 3.26
+BuildRequires:	opus-devel
+BuildRequires:	pkgconfig
+BuildRequires:	poppler-cpp-devel
+BuildRequires:	protobuf-devel
+BuildRequires:	pulseaudio-devel >= 0.9.10
+BuildRequires:	re2-devel
+BuildRequires:	snappy-devel
 %if %{with doc}
-BuildRequires:	qt5-assistant >= %{qttools_ver}
+BuildRequires:	qt5-assistant >= %{version}
 %endif
-BuildRequires:	qt5-build >= %{qtbase_ver}
-BuildRequires:	qt5-qmake >= %{qtbase_ver}
+BuildRequires:	qt5-build >= %{version}
+BuildRequires:	qt5-qmake >= %{version}
 BuildRequires:	rpmbuild(macros) >= 1.654
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXcomposite-devel
+BuildRequires:	xorg-lib-libXcursor-devel
+BuildRequires:	xorg-lib-libXi-devel
+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
@@ -56,9 +102,9 @@ Ten pakiet zawiera bibliotekę Qt5 WebEngine.
 Summary:	The Qt5 WebEngine library
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine
 Group:		Libraries
-Requires:	Qt5Core >= %{qtbase_ver}
-Requires:	Qt5Network >= %{qtbase_ver}
-Requires:	Qt5Qml >= %{qtdeclarative_ver}
+Requires:	Qt5Core >= %{version}
+Requires:	Qt5Network >= %{version}
+Requires:	Qt5Qml >= %{version}
 
 %description -n Qt5WebEngine
 Qt5 WebEngine library provides seamless integration of C++ and QML
@@ -72,9 +118,9 @@ klientami w HTML-u/JavaScripcie.
 Summary:	Qt5 WebEngine library - development files
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine - pliki programistyczne
 Group:		Development/Libraries
-Requires:	Qt5Core-devel >= %{qtbase_ver}
-Requires:	Qt5Network-devel >= %{qtbase_ver}
-Requires:	Qt5Qml-devel >= %{qtdeclarative_ver}
+Requires:	Qt5Core-devel >= %{version}
+Requires:	Qt5Network-devel >= %{version}
+Requires:	Qt5Qml-devel >= %{version}
 Requires:	Qt5WebEngine = %{version}-%{release}
 
 %description -n Qt5WebEngine-devel
@@ -87,7 +133,7 @@ Biblioteka Qt5 WebEngine - pliki programistyczne.
 Summary:	Qt5 WebEngine documentation in HTML format
 Summary(pl.UTF-8):	Dokumentacja do biblioteki Qt5 WebEngine w formacie HTML
 Group:		Documentation
-Requires:	qt5-doc-common >= %{qtbase_ver}
+Requires:	qt5-doc-common >= %{version}
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif
@@ -102,7 +148,7 @@ Dokumentacja do biblioteki Qt5 WebEngine w formacie HTML.
 Summary:	Qt5 WebEngine documentation in QCH format
 Summary(pl.UTF-8):	Dokumentacja do biblioteki Qt5 WebEngine w formacie QCH
 Group:		Documentation
-Requires:	qt5-doc-common >= %{qtbase_ver}
+Requires:	qt5-doc-common >= %{version}
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif
@@ -128,10 +174,20 @@ Qt5 WebEngine examples.
 Przykłady do biblioteki Qt5 WebEngine.
 
 %prep
-%setup -q -n %{orgname}-opensource-src-%{version}
+%setup -q -n %{orgname}-everywhere-src-%{version}
+%ifarch x32
+%patch1 -p1
+%endif
+cd ./src/3rdparty/chromium
 
 %build
-qmake-qt5
+%ifarch x32
+export V8_TARGET_ARCH="x32"
+%endif
+qmake-qt5 -- \
+	-webengine-ffmpeg \
+	-webengine-icu \
+	-webengine-proprietary-codecs
 %{__make}
 %{?with_doc:%{__make} docs}
 
@@ -146,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 # useless symlinks
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.so.5.?
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.so.5.??
 # actually drop *.la, follow policy of not packaging them when *.pc exist
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.la
 
@@ -173,8 +229,8 @@ ifecho_tree() {
 }
 
 echo "%defattr(644,root,root,755)" > examples.files
-ifecho_tree examples %{_examplesdir}/qt5/qwebengine
 ifecho_tree examples %{_examplesdir}/qt5/webengine
+ifecho_tree examples %{_examplesdir}/qt5/webenginewidgets
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -186,20 +242,47 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5WebEngine.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5WebEngine.so.5
+%attr(755,root,root) %{_libdir}/libQt5WebEngineCore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5WebEngineCore.so.5
+%attr(755,root,root) %{_libdir}/libQt5WebEngineWidgets.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5WebEngineWidgets.so.5
 %dir %{qt5dir}/qml/QtWebEngine
-%attr(755,root,root) %{qt5dir}/qml/QtWebEngine/libdeclarative_webengine.so
 %{qt5dir}/qml/QtWebEngine/plugins.qmltypes
 %{qt5dir}/qml/QtWebEngine/qmldir
+%{qt5dir}/qml/QtWebEngine/Controls1Delegates
+%{qt5dir}/qml/QtWebEngine/Controls2Delegates
+%attr(755,root,root) %{qt5dir}/qml/QtWebEngine/libqtwebengineplugin.so
+%dir %{_datadir}/qt5/resources
+%{_datadir}/qt5/resources/qtwebengine*.pak
+%attr(755,root,root)  %{_libdir}/qt5/bin/qwebengine_convert_dict
+%attr(755,root,root) %{_libdir}/qt5/libexec/QtWebEngineProcess
+%attr(755,root,root) %{_libdir}/qt5/plugins/designer/libqwebengineview.so
 
 %files -n Qt5WebEngine-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5WebEngine.so
+%attr(755,root,root) %{_libdir}/libQt5WebEngineCore.so
+%attr(755,root,root) %{_libdir}/libQt5WebEngineWidgets.so
 %{_libdir}/libQt5WebEngine.prl
+%{_libdir}/libQt5WebEngineCore.prl
+%{_libdir}/libQt5WebEngineWidgets.prl
 %{_includedir}/qt5/QtWebEngine
+%{_includedir}/qt5/QtWebEngineCore
+%{_includedir}/qt5/QtWebEngineWidgets
 %{_pkgconfigdir}/Qt5WebEngine.pc
+%{_pkgconfigdir}/Qt5WebEngineCore.pc
+%{_pkgconfigdir}/Qt5WebEngineWidgets.pc
 %{_libdir}/cmake/Qt5WebEngine
+%{_libdir}/cmake/Qt5WebEngineCore
+%{_libdir}/cmake/Qt5WebEngineWidgets
+%{_libdir}/cmake/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake
 %{qt5dir}/mkspecs/modules/qt_lib_webengine.pri
 %{qt5dir}/mkspecs/modules/qt_lib_webengine_private.pri
+%{_libdir}/qt5/mkspecs/modules/qt_lib_webenginecore.pri
+%{_libdir}/qt5/mkspecs/modules/qt_lib_webenginecore_private.pri
+%{_libdir}/qt5/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri
+%{_libdir}/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri
+%{_libdir}/qt5/mkspecs/modules/qt_lib_webenginewidgets_private.pri
 
 %if %{with doc}
 %files doc