From eaaaf190ea0bd3e5efe0bf4539aeb83e1c4f5790 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 17 Feb 2017 07:59:51 -0600 Subject: [PATCH] gcc7 FTBFS fix (#1423090) --- ...r-add-missing-out-of-line-destructor.patch | 45 +++++++++++++++++++ qt5-qtbase.spec | 8 +++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0053-QMimeXMLProvider-add-missing-out-of-line-destructor.patch diff --git a/0053-QMimeXMLProvider-add-missing-out-of-line-destructor.patch b/0053-QMimeXMLProvider-add-missing-out-of-line-destructor.patch new file mode 100644 index 0000000..af69c01 --- /dev/null +++ b/0053-QMimeXMLProvider-add-missing-out-of-line-destructor.patch @@ -0,0 +1,45 @@ +From 7740f5e98b2f3ab5d9c1f512d1a89e9e1b64434d Mon Sep 17 00:00:00 2001 +From: J-P Nurmi +Date: Thu, 13 Oct 2016 13:04:33 +0200 +Subject: [PATCH 053/233] QMimeXMLProvider: add missing out-of-line destructor + +Fixes build with the latest GCC 7. + +Change-Id: I4900a256ed1c6cb177d7f94d54e5b07c06ddad08 +Task-number: QTBUG-56514 +Reviewed-by: Marc Mutz +--- + src/corelib/mimetypes/qmimeprovider.cpp | 4 ++++ + src/corelib/mimetypes/qmimeprovider_p.h | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp +index fbd14e2..aa8d8c9 100644 +--- a/src/corelib/mimetypes/qmimeprovider.cpp ++++ b/src/corelib/mimetypes/qmimeprovider.cpp +@@ -706,6 +706,10 @@ QMimeXMLProvider::QMimeXMLProvider(QMimeDatabasePrivate *db) + initResources(); + } + ++QMimeXMLProvider::~QMimeXMLProvider() ++{ ++} ++ + bool QMimeXMLProvider::isValid() + { + return true; +diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h +index c0517d6..8eba71e 100644 +--- a/src/corelib/mimetypes/qmimeprovider_p.h ++++ b/src/corelib/mimetypes/qmimeprovider_p.h +@@ -132,6 +132,7 @@ class QMimeXMLProvider : public QMimeProviderBase + { + public: + QMimeXMLProvider(QMimeDatabasePrivate *db); ++ ~QMimeXMLProvider(); + + virtual bool isValid() Q_DECL_OVERRIDE; + virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE; +-- +2.9.3 + diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 22690b5..416a5d6 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -66,7 +66,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.7.1 -Release: 14%{?dist} +Release: 15%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -136,6 +136,8 @@ Patch100: qt5-qtbase-5.8-QTBUG-55583.patch # Ensure a pixel density of at least 1 for Qt::AA_EnableHighDpiScaling # https://bugreports.qt.io/browse/QTBUG-56140 Patch101: qt5-qtbase-5.8-QTBUG-56140.patch +# gcc7 FTBFS fix +Patch153: 0053-QMimeXMLProvider-add-missing-out-of-line-destructor.patch # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are @@ -370,6 +372,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch4 -p1 -b .QTBUG-35459 %patch100 -p1 -b .QTBUG-55583 %patch101 -p1 -b .QTBUG-56140 +%patch153 -p1 -b .0053 %patch50 -p1 -b .QT_VERSION_CHECK %patch51 -p1 -b .hidpi_scale_at_192 @@ -982,6 +985,9 @@ fi %changelog +* Fri Feb 17 2017 Rex Dieter - 5.7.1-15 +- gcc7 FTBFS fix (#1423090) + * Thu Feb 09 2017 Rex Dieter - 5.7.1-14 - 5.8 backport: Ensure a pixel density of at least 1 for Qt::AA_EnableHighDpiScaling (QTBUG-56140)