$ git diff --patch-with-stat --summary 5a1d77cd9394d3a40b4ff811d0adffc1319f657c..249976d38c906929732f2d4b222a2a75dd56aa5a
.abf.yml | 2 +-
qt-5.14.0-qtbug-79118.patch | 55 ++++++++++++++++++
qt-5.7.0-setuid-XDG_RUNTIME_DIR.patch | 24 ++++----
qt5-qtbase.spec | 81 +++++++++++++++++++--------
qtbase-everywhere-src-5.3.2-QTBUG-35459.patch | 11 ++--
5 files changed, 131 insertions(+), 42 deletions(-)
create mode 100644 qt-5.14.0-qtbug-79118.patch
diff --git a/.abf.yml b/.abf.yml
index 5189647..2319d51 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- qtbase-everywhere-src-5.13.0.tar.xz: 68506e1d6a710f657fe9ddf4e8fec55ad845e81b
+ qtbase-everywhere-src-5.14.0-beta1.tar.xz: 276bc570d6d36e6d2f7251a3d9c925296cce1c8e
diff --git a/qt-5.14.0-qtbug-79118.patch b/qt-5.14.0-qtbug-79118.patch
new file mode 100644
index 0000000..d8aee6c
--- /dev/null
+++ b/qt-5.14.0-qtbug-79118.patch
@@ -0,0 +1,55 @@
+diff -up qtbase-everywhere-src-5.14.0-beta1/qmake/Makefile.unix.omv~ qtbase-everywhere-src-5.14.0-beta1/qmake/Makefile.unix
+--- qtbase-everywhere-src-5.14.0-beta1/qmake/Makefile.unix.omv~ 2019-10-09 17:29:35.243225031 +0200
++++ qtbase-everywhere-src-5.14.0-beta1/qmake/Makefile.unix 2019-10-09 17:32:12.156521048 +0200
+@@ -26,7 +26,7 @@ QOBJS = \
+ qiodevice.o qsettings.o qtemporaryfile.o qtextstream.o \
+ qjsonarray.o qjson.o qjsondocument.o qjsonobject.o qjsonparser.o qjsonvalue.o \
+ qmetatype.o qsystemerror.o qvariant.o \
+- quuid.o \
++ quuid.o qsimd.o \
+ qarraydata.o qbitarray.o qbytearray.o qbytearraymatcher.o \
+ qcalendar.o qgregoriancalendar.o qromancalendar.o \
+ qcryptographichash.o qdatetime.o qhash.o qlist.o \
+@@ -96,6 +96,7 @@ DEPEND_SRC = \
+ $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
+ $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
+ $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \
++ $(SOURCE_PATH)/src/corelib/tools/qsimd.cpp \
+ $(SOURCE_PATH)/src/corelib/serialization/qdatastream.cpp \
+ $(SOURCE_PATH)/src/corelib/serialization/qjsonarray.cpp \
+ $(SOURCE_PATH)/src/corelib/serialization/qjson.cpp \
+@@ -426,6 +427,9 @@ qdiriterator.o: $(SOURCE_PATH)/src/corel
+ quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) $<
+
++qsimd.o: $(SOURCE_PATH)/src/corelib/tools/qsimd.cpp
++ $(CXX) -DBUILDING_QMAKE -c -o $@ $(CXXFLAGS) $<
++
+ qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) $<
+
+diff -up qtbase-everywhere-src-5.14.0-beta1/qmake/qmake.pro.omv~ qtbase-everywhere-src-5.14.0-beta1/qmake/qmake.pro
+--- qtbase-everywhere-src-5.14.0-beta1/qmake/qmake.pro.omv~ 2019-10-09 17:23:00.482480285 +0200
++++ qtbase-everywhere-src-5.14.0-beta1/qmake/qmake.pro 2019-10-09 17:23:16.661510807 +0200
+@@ -149,6 +149,7 @@ SOURCES += \
+ qregexp.cpp \
+ qromancalendar.cpp \
+ qsettings.cpp \
++ qsimd.cpp \
+ qstring.cpp \
+ qstringlist.cpp \
+ qsystemerror.cpp \
+diff -up qtbase-everywhere-src-5.14.0-beta1/src/corelib/global/qrandom.cpp.omv~ qtbase-everywhere-src-5.14.0-beta1/src/corelib/global/qrandom.cpp
+diff -up qtbase-everywhere-src-5.14.0-beta1/src/corelib/tools/qsimd.cpp.omv~ qtbase-everywhere-src-5.14.0-beta1/src/corelib/tools/qsimd.cpp
+--- qtbase-everywhere-src-5.14.0-beta1/src/corelib/tools/qsimd.cpp.omv~ 2019-10-09 17:20:20.791179003 +0200
++++ qtbase-everywhere-src-5.14.0-beta1/src/corelib/tools/qsimd.cpp 2019-10-09 17:35:30.182894630 +0200
+@@ -43,7 +43,7 @@
+ #include <QByteArray>
+ #include <stdio.h>
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && !defined(BUILDING_QMAKE)
+ # include "../testlib/3rdparty/valgrind_p.h"
+ #endif
+
+diff -up qtbase-everywhere-src-5.14.0-beta1/src/corelib/tools/qsimd_p.h.omv~ qtbase-everywhere-src-5.14.0-beta1/src/corelib/tools/qsimd_p.h
diff --git a/qt-5.7.0-setuid-XDG_RUNTIME_DIR.patch b/qt-5.7.0-setuid-XDG_RUNTIME_DIR.patch
index b79f19e..5b39c23 100644
--- a/qt-5.7.0-setuid-XDG_RUNTIME_DIR.patch
+++ b/qt-5.7.0-setuid-XDG_RUNTIME_DIR.patch
@@ -1,22 +1,24 @@
---- qtbase-opensource-src-5.7.0/src/corelib/io/qstandardpaths_unix.cpp.0002~ 2016-06-10 08:48:56.000000000 +0200
-+++ qtbase-opensource-src-5.7.0/src/corelib/io/qstandardpaths_unix.cpp 2016-07-11 19:44:25.177932269 +0200
-@@ -126,7 +126,10 @@ QString QStandardPaths::writableLocation
+diff -up qtbase-everywhere-src-5.14.0-beta1/src/corelib/io/qstandardpaths_unix.cpp.2~ qtbase-everywhere-src-5.14.0-beta1/src/corelib/io/qstandardpaths_unix.cpp
+--- qtbase-everywhere-src-5.14.0-beta1/src/corelib/io/qstandardpaths_unix.cpp.2~ 2019-10-09 16:49:55.538735597 +0200
++++ qtbase-everywhere-src-5.14.0-beta1/src/corelib/io/qstandardpaths_unix.cpp 2019-10-09 17:05:00.317442410 +0200
+@@ -151,7 +151,10 @@ QString QStandardPaths::writableLocation
xdgRuntimeDir = QDir::tempPath() + QLatin1String("/runtime-") + userName;
fileInfo.setFile(xdgRuntimeDir);
if (!fileInfo.isDir()) {
- if (!QDir().mkdir(xdgRuntimeDir)) {
+ mode_t old_umask = umask(0077);
-+ bool ok = QDir().mkdir(xdgRuntimeDir);
++ bool const ok = QDir().mkdir(xdgRuntimeDir);
+ umask(old_umask);
-+ if(!ok) {
- qWarning("QStandardPaths: error creating runtime directory %s: %s", qPrintable(xdgRuntimeDir), qPrintable(qt_error_string(errno)));
++ if (!ok) {
+ qErrnoWarning("QStandardPaths: error creating runtime directory %ls",
+ qUtf16Printable(xdgRuntimeDir));
return QString();
- }
-@@ -147,9 +150,19 @@ QString QStandardPaths::writableLocation
+@@ -175,10 +178,19 @@ QString QStandardPaths::writableLocation
}
// "The directory MUST be owned by the user"
if (fileInfo.ownerId() != myUid) {
-- qWarning("QStandardPaths: wrong ownership on runtime directory %s, %d instead of %d", qPrintable(xdgRuntimeDir),
+- qWarning("QStandardPaths: wrong ownership on runtime directory %ls, %d instead of %d",
+- qUtf16Printable(xdgRuntimeDir),
- fileInfo.ownerId(), myUid);
- return QString();
+ // We're probably setuid with XDG_RUNTIME_DIR persisting. Let's do the right thing here...
@@ -24,8 +26,8 @@
+ fileInfo.setFile(xdgRuntimeDir);
+ if(!fileInfo.isDir()) {
+ mode_t old_umask = umask(0077);
-+ bool ok = QDir().mkdir(xdgRuntimeDir);
-+ umask(old_umask);
++ bool const ok = QDir().mkdir(xdgRuntimeDir);
++ umask(old_umask);
+ if(!ok) {
+ qWarning("QStandardPaths: error creating runtime directory %s: %s", qPrintable(xdgRuntimeDir), qPrintable(qt_error_string(errno)));
+ return QString();
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 16ab3ae..2804823 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -5,17 +5,14 @@
# this makes sure the files dont get marked as docs
%define _no_default_doc_files 1
-# (tpg) optimize it a bit
-%ifarch %{aarch64}
-# Workaround for weird signal/slot problem
+# If we ever switch back to ld.gold as default
+# linker, we need to add -fuse-ld=bfd or -fuse-ld=lld
+# on aarch64 as workaround for a weird signal/slot problem
# (slots defined as lambdas never called)
-%global optflags %{optflags} -O2 -fuse-ld=bfd
-%else
-%global optflags %{optflags} -O3
-%endif
+%global optflags %{optflags} -Ofast
#% define debug_package %{nil}
-%define beta %{nil}
+%define beta beta1
%define api 5
%define major 5
@@ -94,12 +91,7 @@
%endif
%bcond_without gtk
-%ifarch %{aarch64}
-# Attempted workaround for signal/slot breakage at runtime
-%bcond_with clang
-%else
%bcond_without clang
-%endif
%bcond_without mysql
%define qtmajor %(echo %{version} |cut -d. -f1)
@@ -109,11 +101,11 @@
Summary: Version 5 of the Qt toolkit
Name: qt5-qtbase
-Version: 5.13.0
+Version: 5.14.0
%if "%{beta}" != ""
Release: 0.%{beta}.1
%define qttarballdir qtbase-everywhere-src-%{version}-%{beta}
-Source0: http://download.qt.io/development_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}-%(echo %{beta} |sed -e "s,1$,,")/submodules/%{qttarballdir}.tar.xz
+Source0: http://download.qt.io/development_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}-%{beta}/submodules/%{qttarballdir}.tar.xz
%else
Release: 1
%define qttarballdir qtbase-everywhere-src-%{version}
@@ -138,6 +130,7 @@ Patch2: qt-5.7.0-setuid-XDG_RUNTIME_DIR.patch
# https://codereview.qt-project.org/#/c/151459/
Patch3: qt-5.5.1-barf-on-clang-PIE.patch
Patch4: qt-5.8.0-no-isystem-usr-include.patch
+Patch5: qt-5.14.0-qtbug-79118.patch
### Fedora patches
Patch102: qtbase-everywhere-src-5.6.0-moc_WORDSIZE.patch
@@ -157,6 +150,7 @@ BuildRequires: python >= 3.0
BuildRequires: python2
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(libsctp)
# CUPS
BuildRequires: cups-devel
# OpenGL
@@ -164,6 +158,7 @@ BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(libdrm)
# OpenVG
BuildRequires: openvg-devel
# Vulkan
@@ -234,6 +229,8 @@ BuildRequires: gdb
BuildRequires: qdoc5
BuildRequires: qt5-qttools
BuildRequires: qt5-assistant
+# Platform plugin required for qhelpgenerator startup
+BuildRequires: %{qtgui}-minimal
%endif
# For the Provides: generator
BuildRequires: cmake >= 3.11.0-1
@@ -255,6 +252,7 @@ Development files for version 5 if the QtBootstrap library.
%files -n %{qtbootstrapd}
%{_qt_libdir}/libQt%{api}Bootstrap.a
%{_qt_libdir}/libQt%{api}Bootstrap.prl
+%{_libdir}/cmake/Qt%{api}Bootstrap
#----------------------------------------------------------------------------
@@ -340,9 +338,11 @@ Development files for version 5 of the QtCore library.
%{_qt_docdir}/global
%{_bindir}/moc-qt%{api}
%{_qt_bindir}/moc
+%{_bindir}/moc
%{_qt_bindir}/syncqt*
%{_bindir}/rcc-qt%{api}
%{_qt_bindir}/rcc
+%{_bindir}/rcc
%{_qt_includedir}/QtCore
%{_qt_libdir}/libQt%{api}Core.so
%{_qt_libdir}/libQt%{api}Core.prl
@@ -384,8 +384,10 @@ Development files for version 5 of the QtDBus library.
%files -n %{qtdbusd}
%{_qt_bindir}/qdbuscpp2xml
+%{_bindir}/qdbuscpp2xml
%{_bindir}/qdbuscpp2xml-qt%{api}
%{_qt_bindir}/qdbusxml2cpp
+%{_bindir}/qdbusxml2cpp
%{_bindir}/qdbusxml2cpp-qt%{api}
%{_qt_includedir}/QtDBus
%{_qt_libdir}/libQt%{api}DBus.so
@@ -427,6 +429,7 @@ Development files for version 5 of the QtEGLDeviceIntegration library.
%{_qt_libdir}/libQt%{api}EglFSDeviceIntegration.so
%{_qt_libdir}/libQt%{api}EglFSDeviceIntegration.prl
%{_qt_includedir}/QtEglFSDeviceIntegration
+%{_libdir}/cmake/Qt%{api}EglFSDeviceIntegration
#----------------------------------------------------------------------------
@@ -494,6 +497,7 @@ Development files for version 5 of the QtGui library.
%files -n %{qtguid}
%{_qt_bindir}/uic
+%{_bindir}/uic
%{_bindir}/uic-qt%{api}
%{_qt_includedir}/QtGui
%{_qt_includedir}/QtPlatformHeaders
@@ -632,6 +636,7 @@ Development files for the X11 output driver for QtGui v5.
%{_includedir}/qt5/QtXkbCommonSupport
%{_libdir}/libQt5XkbCommonSupport.a
%{_libdir}/libQt5XkbCommonSupport.prl
+%{_libdir}/cmake/Qt%{api}XkbCommonSupport
#----------------------------------------------------------------------------
@@ -694,6 +699,8 @@ Development files for the EGL fullscreen output driver for QtGui v5.
%{_libdir}/libQt5KmsSupport.a
%{_libdir}/libQt5KmsSupport.prl
%{_libdir}/cmake/Qt%{api}Gui/Qt5Gui_QEglFS*.cmake
+%{_libdir}/cmake/Qt%{api}EglFsKmsSupport
+%{_libdir}/cmake/Qt%{api}KmsSupport
#----------------------------------------------------------------------------
@@ -1066,6 +1073,7 @@ Development files for version 5 of the QtXcbQpa library.
%files -n %{qtxcbqpad}
%{_qt_libdir}/libQt%{api}XcbQpa.so
%{_qt_libdir}/libQt%{api}XcbQpa.prl
+%{_libdir}/cmake/Qt%{api}XcbQpa
#----------------------------------------------------------------------------
@@ -1160,9 +1168,6 @@ Requires: pkgconfig(Qt5Location) = %{version}
Requires: pkgconfig(Qt5Positioning) = %{version}
Requires: pkgconfig(Qt5Sensors) = %{version}
Requires: pkgconfig(Qt5Test) = %{version}
-Requires: pkgconfig(Qt5CLucene) = %{version}
-Requires: pkgconfig(Qt5Declarative) = %{version}
-Requires: pkgconfig(Qt5DesignerComponents) = %{version}
Requires: pkgconfig(Qt5Designer) = %{version}
Requires: pkgconfig(Qt5Help) = %{version}
Requires: pkgconfig(Qt5Multimedia) = %{version}
@@ -1170,7 +1175,6 @@ Requires: pkgconfig(Qt5MultimediaWidgets) = %{version}
Requires: pkgconfig(Qt5Nfc) = %{version}
Requires: pkgconfig(Qt5Qml) = %{version}
Requires: pkgconfig(Qt5Quick) = %{version}
-Requires: pkgconfig(Qt5QuickParticles) = %{version}
Requires: pkgconfig(Qt5QuickTest) = %{version}
Requires: pkgconfig(Qt5QuickWidgets) = %{version}
Requires: pkgconfig(Qt5Script) = %{version}
@@ -1181,8 +1185,6 @@ Suggests: pkgconfig(Qt5WaylandCompositor) = %{version}
%ifnarch %arm
Requires: pkgconfig(Qt5WebEngine) = %{version}
%endif
-Requires: pkgconfig(Qt5WebKit) = %{version}
-Requires: pkgconfig(Qt5WebKitWidgets) = %{version}
Requires: pkgconfig(Qt5WebChannel) = %{version}
Requires: pkgconfig(Qt5WebSockets) = %{version}
Requires: pkgconfig(Qt5XmlPatterns) = %{version}
@@ -1211,6 +1213,7 @@ QCH documentation for the Qt toolkit.
%files -n qt5-doc
%{_qt_docdir}/*.{tags,qch}
+%{_qt_docdir}/config/exampleurl-*.qdocconf
%endif
#----------------------------------------------------------------------------
@@ -1325,6 +1328,7 @@ Helper library for Qt accessibility support
%{_libdir}/libQt%{api}AccessibilitySupport.a
%{_libdir}/libQt%{api}AccessibilitySupport.prl
%{_libdir}/pkgconfig/Qt5LinuxAccessibilitySupport.pc
+%{_libdir}/cmake/Qt%{api}AccessibilitySupport
#----------------------------------------------------------------------------
%package -n %{qtedidsupportd}
@@ -1339,6 +1343,7 @@ Helper library for Qt EDID support
%{_includedir}/qt%{api}/QtEdidSupport
%{_libdir}/libQt%{api}EdidSupport.a
%{_libdir}/libQt%{api}EdidSupport.prl
+%{_libdir}/cmake/Qt%{api}EdidSupport
#----------------------------------------------------------------------------
%package -n %{qtvulkansupportd}
@@ -1354,6 +1359,7 @@ Helper library for Qt Vulkan support
%{_libdir}/libQt%{api}VulkanSupport.a
%{_libdir}/libQt%{api}VulkanSupport.prl
%{_libdir}/qt%{api}/bin/qvkgen
+%{_libdir}/cmake/Qt%{api}VulkanSupport
#----------------------------------------------------------------------------
%package -n %{qtdevicediscoverysupportd}
@@ -1368,6 +1374,7 @@ Helper library for Qt device discovery
%{_includedir}/qt%{api}/QtDeviceDiscoverySupport
%{_libdir}/libQt%{api}DeviceDiscoverySupport.a
%{_libdir}/libQt%{api}DeviceDiscoverySupport.prl
+%{_libdir}/cmake/Qt%{api}DeviceDiscoverySupport
#----------------------------------------------------------------------------
%package -n %{qteglsupportd}
@@ -1382,6 +1389,7 @@ Helper library for Qt EGL support
%{_includedir}/qt%{api}/QtEglSupport
%{_libdir}/libQt%{api}EglSupport.a
%{_libdir}/libQt%{api}EglSupport.prl
+%{_libdir}/cmake/Qt%{api}EglSupport
#----------------------------------------------------------------------------
%package -n %{qteventdispatchersupportd}
@@ -1396,6 +1404,7 @@ Helper library for Qt event dispatcher support
%{_includedir}/qt%{api}/QtEventDispatcherSupport
%{_libdir}/libQt%{api}EventDispatcherSupport.a
%{_libdir}/libQt%{api}EventDispatcherSupport.prl
+%{_libdir}/cmake/Qt%{api}EventDispatcherSupport
#----------------------------------------------------------------------------
%package -n %{qtfbsupportd}
@@ -1411,6 +1420,7 @@ Helper library for Qt framebuffer support
%{_libdir}/libQt%{api}FbSupport.a
%{_libdir}/libQt%{api}FbSupport.prl
%{_libdir}/cmake/Qt%{api}Gui/Qt%{api}Gui_QLinuxFb*.cmake
+%{_libdir}/cmake/Qt%{api}FbSupport
#----------------------------------------------------------------------------
%package -n %{qtfontdatabasesupportd}
@@ -1425,6 +1435,7 @@ Helper library for Qt font database support
%{_includedir}/qt%{api}/QtFontDatabaseSupport
%{_libdir}/libQt%{api}FontDatabaseSupport.a
%{_libdir}/libQt%{api}FontDatabaseSupport.prl
+%{_libdir}/cmake/Qt%{api}FontDatabaseSupport
#----------------------------------------------------------------------------
%package -n %{qtglxsupportd}
@@ -1439,6 +1450,7 @@ Helper library for Qt GLX support
%{_includedir}/qt%{api}/QtGlxSupport
%{_libdir}/libQt%{api}GlxSupport.a
%{_libdir}/libQt%{api}GlxSupport.prl
+%{_libdir}/cmake/Qt%{api}GlxSupport
#----------------------------------------------------------------------------
%package -n %{qtinputsupportd}
@@ -1453,6 +1465,7 @@ Helper library for Qt input support
%{_includedir}/qt%{api}/QtInputSupport
%{_libdir}/libQt%{api}InputSupport.a
%{_libdir}/libQt%{api}InputSupport.prl
+%{_libdir}/cmake/Qt%{api}InputSupport
#----------------------------------------------------------------------------
%package -n %{qtlinuxaccessibilitysupportd}
@@ -1467,6 +1480,7 @@ Helper library for Qt Linux accessibility support
%{_includedir}/qt%{api}/QtLinuxAccessibilitySupport
%{_libdir}/libQt%{api}LinuxAccessibilitySupport.a
%{_libdir}/libQt%{api}LinuxAccessibilitySupport.prl
+%{_libdir}/cmake/Qt%{api}LinuxAccessibilitySupport
#----------------------------------------------------------------------------
%package -n %{qtplatformcompositorsupportd}
@@ -1481,6 +1495,7 @@ Helper library for Qt platform compositor support
%{_includedir}/qt%{api}/QtPlatformCompositorSupport
%{_libdir}/libQt%{api}PlatformCompositorSupport.a
%{_libdir}/libQt%{api}PlatformCompositorSupport.prl
+%{_libdir}/cmake/Qt%{api}PlatformCompositorSupport
#----------------------------------------------------------------------------
%package -n %{qtservicesupportd}
@@ -1495,6 +1510,7 @@ Helper library for Qt service support
%{_includedir}/qt%{api}/QtServiceSupport
%{_libdir}/libQt%{api}ServiceSupport.a
%{_libdir}/libQt%{api}ServiceSupport.prl
+%{_libdir}/cmake/Qt%{api}ServiceSupport
#----------------------------------------------------------------------------
%package -n %{qtthemesupportd}
@@ -1509,6 +1525,7 @@ Helper library for Qt theme support
%{_includedir}/qt%{api}/QtThemeSupport
%{_libdir}/libQt%{api}ThemeSupport.a
%{_libdir}/libQt%{api}ThemeSupport.prl
+%{_libdir}/cmake/Qt%{api}ThemeSupport
#----------------------------------------------------------------------------
@@ -1522,6 +1539,7 @@ Makefile generation system for Qt 5.
%files -n qmake%{api}
%{_bindir}/qmake-qt%{api}
+%{_bindir}/qmake
%{_qt_bindir}/qmake
%{_qt_prefix}/mkspecs
@@ -1537,6 +1555,7 @@ Qt LALR parser generator.
%files -n qlalr%{api}
%{_qt_bindir}/qlalr
+%{_bindir}/qlalr
#----------------------------------------------------------------------------
@@ -1673,8 +1692,9 @@ export PATH="$(pwd)/pybin:$PATH"
-system-freetype \
-optimized-qmake \
-optimized-tools \
+ -sctp \
-ssl \
- -openssl-runtime \
+ -openssl-linked \
-cups \
-icu \
-inotify \
@@ -1723,7 +1743,7 @@ export PATH="$(pwd)/pybin:$PATH"
-sm \
-gif \
-ico \
- -c++std c++14 \
+ -c++std c++2a \
-xkb \
-confirm-license \
-system-proxies \
@@ -1766,8 +1786,20 @@ rm -f %{buildroot}%{_libdir}/libqtlibpng.*
%if %{with docs}
make install_qch_docs INSTALL_ROOT=%{buildroot}
cp doc/*/*.tags %{buildroot}%{_qt_docdir}/
+%else
+rm -f %{buildroot}%{_qt_docdir}/config/exampleurl-*.qdocconf
%endif
+# Those will eventually get installed... By the qt5-qtdeclarative
+# source package.
+# Not sure why they exist in the qtcore sources as well, probably an
+# upstream packaging bug.
+rm -rf %{buildroot}%{_libdir}/cmake/Qt%{api}PacketProtocol \
+ %{buildroot}%{_libdir}/cmake/Qt%{api}QmlDebug \
+ %{buildroot}%{_libdir}/cmake/Qt%{api}QmlDevTools \
+ %{buildroot}%{_libdir}/cmake/Qt%{api}QuickParticles \
+ %{buildroot}%{_libdir}/cmake/Qt%{api}QuickShapes
+
# Probably not useful outside of Qt source tree?
rm -f %{buildroot}%{_qt_bindir}/qtmodule-configtests
# Let's not ship -devel files for private libraries... At least not until
@@ -1779,8 +1811,9 @@ rm -f %{buildroot}%{_qt_translationsdir}/qtconfig_*.qm
mkdir -p %{buildroot}%{_bindir}
for i in qmake moc uic rcc qdbuscpp2xml qdbusxml2cpp; do
ln -s ../%{_lib}/qt%{api}/bin/$i %{buildroot}%{_bindir}/$i-qt%{api}
+ ln -s ../%{_lib}/qt%{api}/bin/$i %{buildroot}%{_bindir}/$i
done
-for i in fixqt4headers.pl; do
+for i in fixqt4headers.pl qlalr; do
ln -s ../%{_lib}/qt%{api}/bin/$i %{buildroot}%{_bindir}/$i
done
diff --git a/qtbase-everywhere-src-5.3.2-QTBUG-35459.patch b/qtbase-everywhere-src-5.3.2-QTBUG-35459.patch
index 1ef698b..3fe56b9 100644
--- a/qtbase-everywhere-src-5.3.2-QTBUG-35459.patch
+++ b/qtbase-everywhere-src-5.3.2-QTBUG-35459.patch
@@ -1,12 +1,11 @@
-diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp
-diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h
---- qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 2014-09-11 05:48:05.000000000 -0500
-+++ qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h 2014-09-16 09:35:01.189255615 -0500
-@@ -223,7 +223,7 @@ private:
+diff -up qtbase-everywhere-src-5.14.0-beta1/src/xml/sax/qxml_p.h.1~ qtbase-everywhere-src-5.14.0-beta1/src/xml/sax/qxml_p.h
+--- qtbase-everywhere-src-5.14.0-beta1/src/xml/sax/qxml_p.h.1~ 2019-10-09 16:46:56.079397180 +0200
++++ qtbase-everywhere-src-5.14.0-beta1/src/xml/sax/qxml_p.h 2019-10-09 16:49:30.852689042 +0200
+@@ -229,7 +229,7 @@ private:
// for the DTD currently being parsed.
static const int dtdRecursionLimit = 2;
// The maximum amount of characters an entity value may contain, after expansion.
-- static const int entityCharacterLimit = 1024;
+- static const int entityCharacterLimit = 4096;
+ static const int entityCharacterLimit = 65536;
const QString &string();