[mingw-qt5-qtsystems] Fix FTBFS against gcc 4.9
Erik van Pienbroek
epienbro at fedoraproject.org
Fri May 30 15:57:01 UTC 2014
commit a1d38bb02d266c3186fffa86d699478fbf5cf969
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri May 30 17:57:01 2014 +0200
Fix FTBFS against gcc 4.9
mingw-qt5-qtsystems.spec | 9 +++++-
qt5-qtsystems-fix-gcc49-compatibility.patch | 41 +++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/mingw-qt5-qtsystems.spec b/mingw-qt5-qtsystems.spec
index 1b3f598..2a224be 100644
--- a/mingw-qt5-qtsystems.spec
+++ b/mingw-qt5-qtsystems.spec
@@ -14,7 +14,7 @@
Name: mingw-qt5-%{qt_module}
Version: 5.0.0
-Release: 0.11%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release: 0.12%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
Summary: Qt5 for Windows - QtSystems component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -49,6 +49,9 @@ Patch0: qt5-qtsystems-fix-case-sensitive-includes.patch
# Don't use case-sensitive library names when linking
Patch1: qt5-qtsystems-link-against-correct-win32-libs.patch
+# Fix FTBFS when using gcc 4.9
+Patch2: qt5-qtsystems-fix-gcc49-compatibility.patch
+
%description
This package contains the Qt software toolkit for developing
@@ -89,6 +92,7 @@ Fedora Windows cross-compiler.
%setup -q -n %{source_folder}
%patch0 -p1
%patch1 -p1
+%patch2 -p0
%if 0%{?snapshot_date}
# Make sure the syncqt tool is run because we're using a git snapshot
@@ -192,6 +196,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll
%changelog
+* Fri May 30 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.0.0-0.12.git20140323.3f65ffa
+- Fix FTBFS against gcc 4.9
+
* Tue May 27 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.0.0-0.11.git20140323.3f65ffa
- Update to 20140323 snapshot (rev 3f65ffa)
This is the last Qt 5.3 based revision
diff --git a/qt5-qtsystems-fix-gcc49-compatibility.patch b/qt5-qtsystems-fix-gcc49-compatibility.patch
new file mode 100644
index 0000000..2c8a0ff
--- /dev/null
+++ b/qt5-qtsystems-fix-gcc49-compatibility.patch
@@ -0,0 +1,41 @@
+--- src/serviceframework/qservicereply.h.orig 2014-05-30 17:43:14.131200835 +0200
++++ src/serviceframework/qservicereply.h 2014-05-30 17:51:31.890174763 +0200
+@@ -91,17 +91,8 @@
+ {
+ Q_OBJECT
+ public:
+- QServiceReply(QObject *p = 0)
+- : QServiceReplyBase(p),
+- m_proxyObject(0)
+- {
+- // nothing to do
+- }
+-
+- ~QServiceReply()
+- {
+- // nothing to do
+- }
++ QServiceReply(QObject *p = 0);
++ ~QServiceReply();
+
+ QObject *proxyObject() const
+ {
+--- src/serviceframework/qservicereply.cpp.orig 2014-05-30 17:46:50.227663534 +0200
++++ src/serviceframework/qservicereply.cpp 2014-05-30 17:51:08.046792856 +0200
+@@ -259,3 +259,16 @@
+ Q_ASSERT(!d->running);
+ #endif
+ }
++
++QServiceReply::QServiceReply(QObject *p)
++ : QServiceReplyBase(p),
++ m_proxyObject(0)
++{
++ // nothing to do
++}
++
++QServiceReply::~QServiceReply()
++{
++ // nothing to do
++}
++
More information about the scm-commits
mailing list