X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtbase.spec;h=09b187289a0b1ae18a49bb519accf6b94fb9af17;hb=a6843360bef9ec2badb430d785e292b972c10710;hp=e887b691ec631045c13cabf1ea5b67b7ebcd18c1;hpb=5cb823f585a10ac48c26d8d003478d1fb9feff5a;p=packages%2Fqt5-qtbase.git

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index e887b69..09b1872 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -15,6 +15,7 @@
 %bcond_without	directfb	# DirectFB platform support
 %bcond_without	egl		# EGL (EGLFS, minimal EGL) platform support
 %bcond_without	gtk		# GTK+ theme integration
+%bcond_without	kerberos5	# KRB5 GSSAPI Support
 %bcond_without	kms		# KMS platform support
 %bcond_without	libinput	# libinput support
 %bcond_without	pch		# pch (pre-compiled headers) in qmake
@@ -52,31 +53,33 @@
 %ifarch pentium4 %{x8664} x32
 %define		with_sse2	1
 %endif
+# QTBUG-36129
+%ifnarch %{arm} aarch64
+%define		with_red_reloc	1
+%endif
 
 %if %{with bootstrap}
 %undefine	with_doc
 %undefine	with_qm
 %endif
 
-%define		icu_abi		65
+%define		icu_abi		67
 %define		next_icu_abi	%(echo $((%{icu_abi} + 1)))
 
 %define		orgname		qtbase
 Summary:	Qt5 - base components
 Summary(pl.UTF-8):	Biblioteka Qt5 - podstawowe komponenty
 Name:		qt5-%{orgname}
-Version:	5.13.1
-Release:	3
+Version:	5.15.2
+Release:	2
 # See LGPL_EXCEPTION.txt for exception details
 License:	LGPL v2 with Digia Qt LGPL Exception v1.1 or GPL v3
 Group:		X11/Libraries
-Source0:	http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
-# Source0-md5:	0a1761145531b74fff5b4d9a80c7b1c2
-Source1:	http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
-# Source1-md5:	8f2e2ce52c296a1bfd814610770663ae
+Source0:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
+# Source0-md5:	0eb522ff6c2194f9690cbdcd5b33e803
+Source1:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
+# Source1-md5:	9b66cdb64402e8fd9e843f8a7120abb1
 Patch0:		%{name}-system_cacerts.patch
-Patch1:		qdoc_default_incdirs.diff
-Patch2:		qtbug-77364.patch
 URL:		http://www.qt.io/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	EGL-devel
@@ -84,16 +87,20 @@ BuildRequires:	EGL-devel
 %{?with_kms:BuildRequires:	Mesa-libgbm-devel}
 BuildRequires:	OpenGL-devel
 %{?with_kms:BuildRequires:	OpenGLESv2-devel}
+BuildRequires:	Vulkan-Loader-devel
+BuildRequires:	at-spi2-core-devel
 %{?with_cups:BuildRequires:	cups-devel >= 1.4}
 BuildRequires:	dbus-devel >= 1.2
+BuildRequires:	double-conversion-devel
 BuildRequires:	fontconfig-devel
 %{?with_freetds:BuildRequires:	freetds-devel}
-BuildRequires:	freetype-devel >= 2.1.3
+BuildRequires:	freetype-devel >= 2.2.0
 %{?with_pch:BuildRequires:	gcc >= 5:4.0}
 BuildRequires:	gdb
 BuildRequires:	glib2-devel >= 2.0.0
 %{?with_gtk:BuildRequires:	gtk+3-devel >= 3.6}
 BuildRequires:	harfbuzz-devel >= 1.6.0
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
 %{?with_kms:BuildRequires:	libdrm-devel}
 # see dependency on libicu version below
 BuildRequires:	libicu-devel < %{next_icu_abi}
@@ -101,19 +108,19 @@ BuildRequires:	libicu-devel >= %{icu_abi}
 %{?with_libinput:BuildRequires:	libinput-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.0.8
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libxcb-devel >= 1.12
 BuildRequires:	mtdev-devel
 %{?with_mysql:BuildRequires:	mysql-devel}
-BuildRequires:	openssl-devel
+BuildRequires:	openssl-devel >= 1.1.1
 %{?with_oci:BuildRequires:	oracle-instantclient-devel}
-BuildRequires:	pcre2-16-devel >= 8.20
+BuildRequires:	pcre2-16-devel >= 10.20
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-backend-devel}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 %{?with_qm:BuildRequires:	qt5-linguist >= 5.2}
-%{?with_doc:BuildRequires:	qt5-assistant}
-BuildRequires:	rpmbuild(macros) >= 1.654
+%{?with_doc:BuildRequires:	qt5-assistant >= 5.9}
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 %{?with_sqlite2:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
@@ -122,7 +129,6 @@ BuildRequires:	tar >= 1:1.22
 %{?with_tslib:BuildRequires:	tslib-devel}
 BuildRequires:	udev-devel
 %{?with_odbc:BuildRequires:	unixODBC-devel >= 2.3.0}
-BuildRequires:	Vulkan-Loader-devel
 BuildRequires:	wayland-devel
 BuildRequires:	xcb-util-image-devel >= 0.3.9
 BuildRequires:	xcb-util-keysyms-devel >= 0.3.9
@@ -141,7 +147,8 @@ BuildRequires:	xorg-lib-libXrender-devel >= 0.6
 BuildRequires:	xorg-lib-libxkbcommon-devel >= 0.5.0
 BuildRequires:	xorg-lib-libxkbcommon-x11-devel >= 0.5.0
 BuildRequires:	xz
-BuildRequires:	zlib-devel
+BuildRequires:	zlib-devel >= 1.0.8
+BuildRequires:	zstd-devel >= 1.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
@@ -166,7 +173,7 @@ Summary(pl.UTF-8):	Biblioteka Qt5 AccessibilitySupport - pliki programistyczne
 Group:		Development/Libraries
 # for (subset of) Qt5Core headers
 Requires:	Qt5Core-devel = %{version}-%{release}
-Requires:	zlib-devel
+Requires:	zlib-devel >= 1.0.8
 
 %description -n Qt5AccessibilitySupport-devel
 Qt5 AccessibilitySupport library - development files.
@@ -180,7 +187,7 @@ Summary(pl.UTF-8):	Biblioteka Qt5 Bootstrap - pliki programistyczne
 Group:		Development/Libraries
 # for (subset of) Qt5Core headers
 Requires:	Qt5Core-devel = %{version}-%{release}
-Requires:	zlib-devel
+Requires:	zlib-devel >= 1.0.8
 
 %description -n Qt5Bootstrap-devel
 Qt5 Bootstrap library (minimal part of Qt5 Core) - development files.
@@ -222,7 +229,9 @@ Pliki nagłówkowe biblioteki Qt5 Concurrent.
 Summary:	Qt5 Core library
 Summary(pl.UTF-8):	Biblioteka Qt5 Core
 Group:		Libraries
-Requires:	pcre16 >= 8.30
+Requires:	pcre2-16 >= 10.20
+Requires:	zlib >= 1.0.8
+Requires:	zstd >= 1.3
 Obsoletes:	qt5-qtbase
 
 %description -n Qt5Core
@@ -239,8 +248,9 @@ Group:		Development/Libraries
 Requires:	Qt5Core = %{version}-%{release}
 Requires:	glib2-devel >= 2.0
 Requires:	libicu-devel
-Requires:	pcre16-devel >= 8.30
-Requires:	zlib-devel
+Requires:	libstdc++-devel >= 6:4.7
+Requires:	pcre2-16-devel >= 10.20
+Requires:	zlib-devel >= 1.0.8
 Obsoletes:	qt5-qtbase-devel
 
 %description -n Qt5Core-devel
@@ -378,6 +388,7 @@ Requires:	Qt5Core = %{version}-%{release}
 Requires:	Qt5DBus = %{version}-%{release}
 # for compose platforminputcontext plugin
 Requires:	xorg-lib-libxkbcommon >= 0.4.1
+Suggests:	Qt5Gui-platform-xcb
 
 %description -n Qt5Gui
 The Qt5 GUI library provides the basic enablers for graphical
@@ -605,6 +616,7 @@ Summary:	Qt5 Gui platform theme plugin for GTK+ 3.x
 Summary(pl.UTF-8):	Wtyczka motywów platform Qt5 Gui dla GTK+ 3.x
 Group:		Libraries
 Requires:	Qt5Gui = %{version}-%{release}
+Obsoletes:	Qt5Gui-platformtheme-gtk2 < 5.8
 
 %description -n Qt5Gui-platformtheme-gtk3
 Qt5 Gui platform theme plugin for GTK+ 3.x.
@@ -617,6 +629,7 @@ Summary:	Qt5 Gui platform theme plugin for xdg-desktop-portal
 Summary(pl.UTF-8):	Wtyczka motywów platform Qt5 Gui dla xdg-desktop-portal
 Group:		Libraries
 Requires:	Qt5Gui = %{version}-%{release}
+Requires:	harfbuzz >= 1.6.0
 Obsoletes:	Qt5Gui-platformtheme-flatpak < 5.12.1
 
 %description -n Qt5Gui-platformtheme-xdgdesktopportal
@@ -690,7 +703,7 @@ Summary(pl.UTF-8):	Biblioteka Qt5 Network - pliki programistyczne
 Group:		Development/Libraries
 Requires:	Qt5Core-devel = %{version}-%{release}
 Requires:	Qt5Network = %{version}-%{release}
-Requires:	openssl-devel
+%requires_ge	openssl-devel
 
 %description -n Qt5Network-devel
 Header files for Qt5 Network library.
@@ -767,7 +780,7 @@ Requires:	Qt5Core-devel = %{version}-%{release}
 Requires:	Qt5DBus-devel = %{version}-%{release}
 Requires:	Qt5Gui-devel = %{version}-%{release}
 Requires:	fontconfig-devel
-Requires:	freetype-devel >= 2.1.3
+Requires:	freetype-devel >= 2.2.0
 Requires:	udev-devel
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXext-devel
@@ -991,20 +1004,6 @@ Header files for Qt5 Test library.
 %description -n Qt5Test-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Qt5 Test.
 
-%package -n -devel
-Summary:	library - development files
-Summary(pl.UTF-8):	Biblioteka  - pliki programistyczne
-Group:		Development/Libraries
-# for (subset of) Qt5Core headers
-Requires:	Qt5Core-devel = %{version}-%{release}
-Requires:	zlib-devel
-
-%description -n -devel
-library - development files.
-
-%description -n -devel -l pl.UTF-8
-Biblioteka - pliki programistyczne.
-
 %package -n Qt5VulkanSupport-devel
 Summary:	Qt5 VulkanSupport library - development files
 Summary(pl.UTF-8):	Biblioteka Qt5 VulkanSupport - pliki programistyczne
@@ -1094,9 +1093,7 @@ Pliki nagłówkowe biblioteki Qt5 Xml.
 Summary:	Common part of Qt5 documentation
 Summary(pl.UTF-8):	Część wspólna dokumentacji do Qt5
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description -n qt5-doc-common
 Common part of Qt5 documentation, global for all components.
@@ -1110,38 +1107,35 @@ Summary:	Qt5 application framework base components documentation in HTML format
 Summary(pl.UTF-8):	Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie HTML
 Group:		Documentation
 Requires:	qt5-doc-common = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description doc
-Qt5 application framework base components documentation in HTML format.
+Qt5 application framework base components documentation in HTML
+format.
 
 %description doc -l pl.UTF-8
-Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie HTML.
+Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w
+formacie HTML.
 
 %package doc-qch
 Summary:	Qt5 application framework base components documentation in QCH format
 Summary(pl.UTF-8):	Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie QCH
 Group:		Documentation
 Requires:	qt5-doc-common = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description doc-qch
 Qt5 application framework base components documentation in QCH format.
 
 %description doc-qch -l pl.UTF-8
-Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie QCH.
+Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w
+formacie QCH.
 
 %package examples
 Summary:	Examples for Qt5 application framework base components
 Summary(pl.UTF-8):	Przykłady do podstawowych komponentów szkieletu aplikacji Qt5
 Group:		X11/Development/Libraries
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description examples
 Examples for Qt5 application framework base components.
@@ -1177,8 +1171,6 @@ Generator plików makefile dla aplikacji Qt5.
 %prep
 %setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
 
@@ -1202,6 +1194,14 @@ Generator plików makefile dla aplikacji Qt5.
 	s|^\(QMAKE_STRIP *\)=.*|\1= :|;
 	' mkspecs/common/linux.conf
 
+%{__sed} -i -e '1{
+	s,^#!.*bin/python$,#!%{__python},
+	s,^#!.*bin/env perl,#!%{__perl},
+}' \
+	bin/fixqt4headers.pl \
+	bin/syncqt.pl \
+	mkspecs/features/uikit/devices.py
+
 %build
 # pass OPTFLAGS to build qmake itself with optimization
 export OPTFLAGS="%{rpmcflags}"
@@ -1254,17 +1254,18 @@ COMMONOPT=" \
 	-openssl-linked \
 	-optimized-qmake \
 	-%{!?with_pch:no-}pch \
-	-reduce-relocations \
+	%{?with_red_reloc:-reduce-relocations} \
 	-sm \
+	-system-doubleconversion \
 	-system-freetype \
+	-system-harfbuzz \
 	-system-libjpeg \
 	-system-libpng \
 	-system-pcre \
 	-system-sqlite \
-	-system-xcb \
 	-system-zlib \
 	%{?with_tslib:-tslib} \
-	-xcb-xinput \
+	-xcb \
 	-xkbcommon \
 	%{!?with_db2:-no}-sql-db2 \
 	%{!?with_ibase:-no}-sql-ibase \
@@ -1310,7 +1311,7 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/qt5,%{_bindir},%{_pkgconfigdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/qt5,%{_bindir},%{_pkgconfigdir},%{qt5dir}/libexec}
 
 # for QtSolutions (qtlockedfile, qtsingleapplication, etc)
 install -d $RPM_BUILD_ROOT%{_includedir}/qt5/QtSolutions
@@ -1471,7 +1472,6 @@ rm -rf $RPM_BUILD_ROOT
 # static-only
 %{_libdir}/libQt5Bootstrap.a
 %{_libdir}/libQt5Bootstrap.prl
-%{_libdir}/cmake/Qt5Bootstrap
 %{qt5dir}/mkspecs/modules/qt_lib_bootstrap_private.pri
 
 %files -n Qt5Concurrent
@@ -1491,12 +1491,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n Qt5Core -f qtbase.lang
 %defattr(644,root,root,755)
-%doc header.* dist/{README,changes-*}
+%doc dist/{README,changes-*}
 %attr(755,root,root) %{_libdir}/libQt5Core.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Core.so.5
 %dir %{_sysconfdir}/qt5
 %dir %{qt5dir}
 %dir %{qt5dir}/bin
+%dir %{qt5dir}/libexec
 %dir %{qt5dir}/mkspecs
 %dir %{qt5dir}/mkspecs/modules
 %dir %{qt5dir}/plugins
@@ -1507,6 +1508,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Core.so
 %{_libdir}/libQt5Core.prl
+%dir %{_libdir}/metatypes
+%{_libdir}/metatypes/qt5core_metatypes.json
 %dir %{_includedir}/qt5
 %dir %{_includedir}/qt5/QtSolutions
 %{_includedir}/qt5/QtCore
@@ -1515,6 +1518,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Core
 %{qt5dir}/mkspecs/modules/qt_lib_core.pri
 %{qt5dir}/mkspecs/modules/qt_lib_core_private.pri
+%attr(755,root,root) %{qt5dir}/bin/tracegen
 
 %files -n Qt5DBus
 %defattr(644,root,root,755)
@@ -1767,6 +1771,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/bin/qvkgen
 %attr(755,root,root) %{_libdir}/libQt5Gui.so
 %{_libdir}/libQt5Gui.prl
+%{_libdir}/metatypes/qt5gui_metatypes.json
 %{_includedir}/qt5/QtGui
 %{_includedir}/qt5/QtPlatformHeaders
 %{_pkgconfigdir}/Qt5Gui.pc
@@ -2024,6 +2029,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Widgets.so
 %{_libdir}/libQt5Widgets.prl
+%{_libdir}/metatypes/qt5widgets_metatypes.json
 %{_includedir}/qt5/QtWidgets
 %{_pkgconfigdir}/Qt5Widgets.pc
 %dir %{_libdir}/cmake/Qt5Widgets
@@ -2146,6 +2152,7 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/qnx-*
 %{qt5dir}/mkspecs/solaris-*
 %{qt5dir}/mkspecs/unsupported
+%{qt5dir}/mkspecs/wasm-emscripten
 %{qt5dir}/mkspecs/win32-*
 %{qt5dir}/mkspecs/winrt-*
 %{qt5dir}/mkspecs/*.pri