up to 5.14.0

diff --git a/qdoc_default_incdirs.diff b/qdoc_default_incdirs.diff
deleted file mode 100644 (file)
index afab35e..0000000
--- a/qdoc_default_incdirs.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: pass default include directories to qdoc
-Author: Martin Smith <martin.smith@qt.io>
-Bug: https://bugs.debian.org/908328
-Forwarded: no
-Last-Update: 2018-10-29
-
---- a/mkspecs/features/qt_docs.prf
-+++ b/mkspecs/features/qt_docs.prf
-@@ -78,6 +78,10 @@ doc_command = $$QDOC $$QMAKE_DOCS
- prepare_docs {
-     prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors $(INCPATH)
-     generate_docs.commands += $$doc_command -generate $$DOC_INDEXES $(INCPATH)
-+    for (incdir, QMAKE_DEFAULT_INCDIRS) {
-+        prepare_docs.commands += -I$$shell_quote($$incdir)
-+        generate_docs.commands += -I$$shell_quote($$incdir)
-+    }
-     prepare_docs.depends += qtattributionsscanner
- } else {
-     html_docs.commands += $$doc_command $$DOC_INDEXES $(INCPATH)

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 8b4a1785e1e0e089384d466389cead6eebde7f3e..ab6e8bfdbf675b7d69c511c93c9ad1772b1de1d7 100644 (file)
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -65,17 +65,16 @@
 Summary:       Qt5 - base components
 Summary(pl.UTF-8):     Biblioteka Qt5 - podstawowe komponenty
 Name:          qt5-%{orgname}
-Version:       5.13.2
+Version:       5.14.0
 Release:       1
 # 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: 3735b864b716ca94fe1d7ebcd94101f0
-Source1:       http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
-# Source1-md5: fea07dab5b04fe170fc06987f4fd0b0f
+Source0:       http://download.qt.io/official_releases/qt/5.14/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
+# Source0-md5: 96436c05048f0266f328adc0520afb3a
+Source1:       http://download.qt.io/official_releases/qt/5.14/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
+# Source1-md5: 74ff09655d412069a7b4210fea5440fb
 Patch0:                %{name}-system_cacerts.patch
-Patch1:                qdoc_default_incdirs.diff
 URL:           http://www.qt.io/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 BuildRequires: EGL-devel
@@ -1176,7 +1175,6 @@ Generator plików makefile dla aplikacji Qt5.
 %prep
 %setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
 %patch0 -p1
-%patch1 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
 
@@ -1513,6 +1511,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)