aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2016-01-21 20:35:54 +0800
committerrakuco <rakuco@FreeBSD.org>2016-01-21 20:35:54 +0800
commit2012e09bbbf540b6c923e761b2fe0395e93b265d (patch)
treecc9906a42a4672f2239cb4e999201d023def46f7 /ports-mgmt
parent8726bfcf1d1445d08514aa8f17d9eff25c5343fb (diff)
downloadfreebsd-ports-gnome-2012e09bbbf540b6c923e761b2fe0395e93b265d.tar.gz
freebsd-ports-gnome-2012e09bbbf540b6c923e761b2fe0395e93b265d.tar.zst
freebsd-ports-gnome-2012e09bbbf540b6c923e761b2fe0395e93b265d.zip
Add patch (sent upstream) to prepare for the upcoming Qt 5.5.1 update.
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/octopkg/files/patch-git_5f02bb3e37
1 files changed, 37 insertions, 0 deletions
diff --git a/ports-mgmt/octopkg/files/patch-git_5f02bb3e b/ports-mgmt/octopkg/files/patch-git_5f02bb3e
new file mode 100644
index 000000000000..6135990f0fa9
--- /dev/null
+++ b/ports-mgmt/octopkg/files/patch-git_5f02bb3e
@@ -0,0 +1,37 @@
+Sent upstream: https://github.com/aarnt/octopkg/pull/4
+
+commit 5f02bb3e504d1d3560ee5a7a3d7c0f90b25adac5
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Thu Jan 21 13:27:57 2016 +0100
+
+ QtSolutions: Fix build with Qt 5.5.1.
+
+ Import commit ad9bc4600 to the qt-solutions git repository:
+ QtSingleApplication: Fix build with Qt 5.5 due to the QDataStream
+ include cleanup.
+
+ This fixes the following error:
+
+ src/QtSolutions/qtlocalpeer.cpp:159:17: error: variable has incomplete type 'QDataStream'
+ QDataStream ds(&socket);
+ ^
+ /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
+ class QDataStream;
+ ^
+ src/QtSolutions/qtlocalpeer.cpp:179:17: error: variable has incomplete type 'QDataStream'
+ QDataStream ds(socket);
+ ^
+ /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
+ class QDataStream;
+ ^
+
+--- src/QtSolutions/qtlocalpeer.cpp
++++ src/QtSolutions/qtlocalpeer.cpp
+@@ -40,6 +40,7 @@
+
+ #include "qtlocalpeer.h"
+ #include <QtCore/QCoreApplication>
++#include <QtCore/QDataStream>
+ #include <QtCore/QTime>
+ #include <QRegularExpression>
+