From owner-svn-ports-all@freebsd.org Thu Jan 21 12:35:55 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA9D7A8912D; Thu, 21 Jan 2016 12:35:55 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F7C8154D; Thu, 21 Jan 2016 12:35:55 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LCZstt008512; Thu, 21 Jan 2016 12:35:54 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LCZsAY008511; Thu, 21 Jan 2016 12:35:54 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201601211235.u0LCZsAY008511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 21 Jan 2016 12:35:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406851 - head/ports-mgmt/octopkg/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2016 12:35:55 -0000 Author: rakuco Date: Thu Jan 21 12:35:54 2016 New Revision: 406851 URL: https://svnweb.freebsd.org/changeset/ports/406851 Log: Add patch (sent upstream) to prepare for the upcoming Qt 5.5.1 update. Added: head/ports-mgmt/octopkg/files/ head/ports-mgmt/octopkg/files/patch-git_5f02bb3e (contents, props changed) Added: head/ports-mgmt/octopkg/files/patch-git_5f02bb3e ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/octopkg/files/patch-git_5f02bb3e Thu Jan 21 12:35:54 2016 (r406851) @@ -0,0 +1,37 @@ +Sent upstream: https://github.com/aarnt/octopkg/pull/4 + +commit 5f02bb3e504d1d3560ee5a7a3d7c0f90b25adac5 +Author: Raphael Kubo da Costa +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 ++#include + #include + #include +