From owner-svn-ports-all@freebsd.org Mon Feb 8 11:18:45 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 576A2A9F87C; Mon, 8 Feb 2016 11:18:45 +0000 (UTC) (envelope-from amdmi3@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 3182230A; Mon, 8 Feb 2016 11:18:45 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u18BIiQO060127; Mon, 8 Feb 2016 11:18:44 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u18BIhiN060121; Mon, 8 Feb 2016 11:18:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602081118.u18BIhiN060121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 8 Feb 2016 11:18:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408475 - head/graphics/aqsis/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: Mon, 08 Feb 2016 11:18:45 -0000 Author: amdmi3 Date: Mon Feb 8 11:18:43 2016 New Revision: 408475 URL: https://svnweb.freebsd.org/changeset/ports/408475 Log: - Fix build with boost 1.60 PR: 199601 Added: head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h (contents, props changed) head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h (contents, props changed) head/graphics/aqsis/files/patch-include_aqsis_util_socket.h (contents, props changed) head/graphics/aqsis/files/patch-tools_displays_piqsl_piqsldisplay.cpp (contents, props changed) head/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp (contents, props changed) head/graphics/aqsis/files/patch-tools_piqsl_image.h (contents, props changed) head/graphics/aqsis/files/patch-tools_piqsl_imagelistmodel.cpp (contents, props changed) Added: head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h Mon Feb 8 11:18:43 2016 (r408475) @@ -0,0 +1,12 @@ +--- include/aqsis/tex/buffers/channellist.h.orig 2012-08-24 12:26:50 UTC ++++ include/aqsis/tex/buffers/channellist.h +@@ -43,7 +43,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include Added: head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h Mon Feb 8 11:18:43 2016 (r408475) @@ -0,0 +1,14 @@ +--- include/aqsis/tex/buffers/mixedimagebuffer.h.orig 2012-08-24 12:26:50 UTC ++++ include/aqsis/tex/buffers/mixedimagebuffer.h +@@ -45,9 +45,11 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include + #include + #include ++#endif + + #include + #include Added: head/graphics/aqsis/files/patch-include_aqsis_util_socket.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-include_aqsis_util_socket.h Mon Feb 8 11:18:43 2016 (r408475) @@ -0,0 +1,12 @@ +--- include/aqsis/util/socket.h.orig 2012-08-24 12:26:50 UTC ++++ include/aqsis/util/socket.h +@@ -32,7 +32,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + #ifdef AQSIS_SYSTEM_WIN32 + # include Added: head/graphics/aqsis/files/patch-tools_displays_piqsl_piqsldisplay.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-tools_displays_piqsl_piqsldisplay.cpp Mon Feb 8 11:18:43 2016 (r408475) @@ -0,0 +1,13 @@ +--- tools/displays/piqsl/piqsldisplay.cpp.orig 2012-08-24 12:26:50 UTC ++++ tools/displays/piqsl/piqsldisplay.cpp +@@ -450,8 +450,8 @@ extern "C" PtDspyError DspyImageData(PtD + + TiXmlElement* bucketDataXML = new TiXmlElement("BucketData"); + std::stringstream base64Data; +- std::copy( base64_text(BOOST_MAKE_PFTO_WRAPPER(data)), +- base64_text(BOOST_MAKE_PFTO_WRAPPER(data + bufferlength)), ++ std::copy( base64_text(data), ++ base64_text(data + bufferlength), + std::ostream_iterator(base64Data)); + TiXmlText* dataTextXML = new TiXmlText(base64Data.str()); + dataTextXML->SetCDATA(true); Added: head/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp Mon Feb 8 11:18:43 2016 (r408475) @@ -0,0 +1,16 @@ +--- tools/piqsl/displayserverimage.cpp.orig 2012-08-24 12:26:50 UTC ++++ tools/piqsl/displayserverimage.cpp +@@ -39,11 +39,13 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include + #include + #include + #include + #include ++#endif + + #include "displayserverimage.h" + Added: head/graphics/aqsis/files/patch-tools_piqsl_image.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-tools_piqsl_image.h Mon Feb 8 11:18:43 2016 (r408475) @@ -0,0 +1,15 @@ +--- tools/piqsl/image.h.orig 2012-08-24 12:26:50 UTC ++++ tools/piqsl/image.h +@@ -46,10 +46,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include + #include + #include + #include ++#endif + + #include "tinyxml.h" + Added: head/graphics/aqsis/files/patch-tools_piqsl_imagelistmodel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-tools_piqsl_imagelistmodel.cpp Mon Feb 8 11:18:43 2016 (r408475) @@ -0,0 +1,23 @@ +--- tools/piqsl/imagelistmodel.cpp.orig 2012-08-24 12:26:50 UTC ++++ tools/piqsl/imagelistmodel.cpp +@@ -42,11 +42,6 @@ + #include + #include + #include +-#if BOOST_VERSION < 103700 +-# include +-#else +-# include +-#endif + + + #include "displayserverimage.h" +@@ -286,7 +281,7 @@ class SocketDataHandler + std::string data = dataText->Value(); + std::vector binaryData; + binaryData.reserve(count); +- base64_binary ti_begin = base64_binary(BOOST_MAKE_PFTO_WRAPPER(data.begin())); ++ base64_binary ti_begin = base64_binary(data.begin()); + std::size_t padding = 2 - count % 3; + while(--count > 0) + {