From owner-svn-ports-head@freebsd.org Fri Jan 13 18:40:51 2017 Return-Path: Delivered-To: svn-ports-head@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 982DFCAEF4B; Fri, 13 Jan 2017 18:40:51 +0000 (UTC) (envelope-from jbeich@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 5019E1262; Fri, 13 Jan 2017 18:40:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0DIeohO003076; Fri, 13 Jan 2017 18:40:50 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0DIeokY003074; Fri, 13 Jan 2017 18:40:50 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701131840.v0DIeokY003074@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 13 Jan 2017 18:40:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431412 - in head/textproc/libxml++26: . 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 18:40:51 -0000 Author: jbeich Date: Fri Jan 13 18:40:50 2017 New Revision: 431412 URL: https://svnweb.freebsd.org/changeset/ports/431412 Log: textproc/libxml++26: replace r431411 with upstream fix PR: 216034 Added: head/textproc/libxml++26/files/patch-c++11 (contents, props changed) Deleted: head/textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc head/textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc Modified: head/textproc/libxml++26/Makefile (contents, props changed) Modified: head/textproc/libxml++26/Makefile ============================================================================== --- head/textproc/libxml++26/Makefile Fri Jan 13 18:23:39 2017 (r431411) +++ head/textproc/libxml++26/Makefile Fri Jan 13 18:40:50 2017 (r431412) @@ -4,7 +4,7 @@ PORTNAME= libxml++ PORTVERSION= 2.34.2 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= textproc MASTER_SITES= GNOME Added: head/textproc/libxml++26/files/patch-c++11 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxml++26/files/patch-c++11 Fri Jan 13 18:40:50 2017 (r431412) @@ -0,0 +1,46 @@ +From 7dbfb0aed508451e8237c34472815e44925a545c Mon Sep 17 00:00:00 2001 +From: Mikhail Titov +Date: Thu, 30 Apr 2015 17:51:20 +0200 +Subject: Fix the build with C++11 compilers, such as MS Visual C++ 2013. + +Implicit conversions from streams to bool are no longer allowed. +--- + libxml++/io/istreamparserinputbuffer.cc | 2 +- + libxml++/io/ostreamoutputbuffer.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libxml++/io/istreamparserinputbuffer.cc b/libxml++/io/istreamparserinputbuffer.cc +index b1d6e5b..7a7f283 100644 +--- libxml++/io/istreamparserinputbuffer.cc ++++ libxml++/io/istreamparserinputbuffer.cc +@@ -39,6 +39,6 @@ namespace xmlpp + + bool IStreamParserInputBuffer::do_close() + { +- return input_; ++ return input_.good(); + } + } +diff --git a/libxml++/io/ostreamoutputbuffer.cc b/libxml++/io/ostreamoutputbuffer.cc +index 0a3e6db..b23a8b6 100644 +--- libxml++/io/ostreamoutputbuffer.cc ++++ libxml++/io/ostreamoutputbuffer.cc +@@ -29,13 +29,13 @@ namespace xmlpp + // here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded. + if(output_) + output_.write(buffer, len); +- return output_; ++ return output_.good(); + } + + bool OStreamOutputBuffer::do_close() + { + if(output_) + output_.flush(); +- return output_; ++ return output_.good(); + } + } +-- +cgit v0.12 +