Attachment #181233 for bug #218165




#   $MCom: ports/textproc/libxml++26/Makefile,v 1.43 2011/04/18 19:58:29 kwm Exp $

PORTNAME=	libxml++
PORTVERSION=	2.40.1
PORTREVISION?=	0
CATEGORIES=	textproc
MASTER_SITES=	GNOME


MAINTAINER=	bland@FreeBSD.org
COMMENT=	XML API for C++

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING

USES+=		tar:xz

PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (libxml++-2.34.2.tar.xz) = 77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa	1	TIMESTAMP = 1490627284
2	SIZE (libxml++-2.34.2.tar.xz) = 1070956	2	SHA256 (libxml++-2.40.1.tar.xz) = 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9
		3	SIZE (libxml++-2.40.1.tar.xz) = 955220




From 7dbfb0aed508451e8237c34472815e44925a545c Mon Sep 17 00:00:00 2001
From: Mikhail Titov <mlt@gmx.us>
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


Return to bug 218165

Lines 3-10 Link Here

(-)Makefile (-2 / +5 lines)
3	# $MCom: ports/textproc/libxml++26/Makefile,v 1.43 2011/04/18 19:58:29 kwm Exp $	3	# $MCom: ports/textproc/libxml++26/Makefile,v 1.43 2011/04/18 19:58:29 kwm Exp $
4		4
5	PORTNAME= libxml++	5	PORTNAME= libxml++
6	PORTVERSION= 2.34.2	6	PORTVERSION= 2.40.1
7	PORTREVISION?= 4	7	PORTREVISION?= 0
8	CATEGORIES= textproc	8	CATEGORIES= textproc
9	MASTER_SITES= GNOME	9	MASTER_SITES= GNOME
10		10
Lines 11-16 Link Here
11	MAINTAINER= bland@FreeBSD.org	11	MAINTAINER= bland@FreeBSD.org
12	COMMENT= XML API for C++	12	COMMENT= XML API for C++
13		13
		14	LICENSE= LGPL21
		15	LICENSE_FILE= ${WRKSRC}/COPYING
		16
14	USES+= tar:xz	17	USES+= tar:xz
15		18
16	PLIST_SUB= VERSION="2.6" API_VERSION="2.6"	19	PLIST_SUB= VERSION="2.6" API_VERSION="2.6"

Lines 1-46 Link Here

(-)files/patch-c++11 (-46 lines)
1	From 7dbfb0aed508451e8237c34472815e44925a545c Mon Sep 17 00:00:00 2001
2	From: Mikhail Titov <mlt@gmx.us>
3	Date: Thu, 30 Apr 2015 17:51:20 +0200
4	Subject: Fix the build with C++11 compilers, such as MS Visual C++ 2013.
5
6	Implicit conversions from streams to bool are no longer allowed.
7	---
8	libxml++/io/istreamparserinputbuffer.cc \| 2 +-
9	libxml++/io/ostreamoutputbuffer.cc \| 4 ++--
10	2 files changed, 3 insertions(+), 3 deletions(-)
11
12	diff --git a/libxml++/io/istreamparserinputbuffer.cc b/libxml++/io/istreamparserinputbuffer.cc
13	index b1d6e5b..7a7f283 100644
14	--- libxml++/io/istreamparserinputbuffer.cc
15	+++ libxml++/io/istreamparserinputbuffer.cc
16	@@ -39,6 +39,6 @@ namespace xmlpp
17
18	bool IStreamParserInputBuffer::do_close()
19	{
20	- return input_;
21	+ return input_.good();
22	}
23	}
24	diff --git a/libxml++/io/ostreamoutputbuffer.cc b/libxml++/io/ostreamoutputbuffer.cc
25	index 0a3e6db..b23a8b6 100644
26	--- libxml++/io/ostreamoutputbuffer.cc
27	+++ libxml++/io/ostreamoutputbuffer.cc
28	@@ -29,13 +29,13 @@ namespace xmlpp
29	// here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded.
30	if(output_)
31	output_.write(buffer, len);
32	- return output_;
33	+ return output_.good();
34	}
35
36	bool OStreamOutputBuffer::do_close()
37	{
38	if(output_)
39	output_.flush();
40	- return output_;
41	+ return output_.good();
42	}
43	}
44	--
45	cgit v0.12
46

Lines 1-5 Link Here

(-)pkg-plist (+12 lines)
1	include/libxml++-%%API_VERSION%%/include/libxml++config.h	1	include/libxml++-%%API_VERSION%%/include/libxml++config.h
2	include/libxml++-%%API_VERSION%%/libxml++/attribute.h	2	include/libxml++-%%API_VERSION%%/libxml++/attribute.h
		3	include/libxml++-%%API_VERSION%%/libxml++/attributedeclaration.h
		4	include/libxml++-%%API_VERSION%%/libxml++/attributenode.h
3	include/libxml++-%%API_VERSION%%/libxml++/document.h	5	include/libxml++-%%API_VERSION%%/libxml++/document.h
4	include/libxml++-%%API_VERSION%%/libxml++/dtd.h	6	include/libxml++-%%API_VERSION%%/libxml++/dtd.h
5	include/libxml++-%%API_VERSION%%/libxml++/exceptions/exception.h	7	include/libxml++-%%API_VERSION%%/libxml++/exceptions/exception.h
Lines 6-11 Link Here
6	include/libxml++-%%API_VERSION%%/libxml++/exceptions/internal_error.h	8	include/libxml++-%%API_VERSION%%/libxml++/exceptions/internal_error.h
7	include/libxml++-%%API_VERSION%%/libxml++/exceptions/parse_error.h	9	include/libxml++-%%API_VERSION%%/libxml++/exceptions/parse_error.h
8	include/libxml++-%%API_VERSION%%/libxml++/exceptions/validity_error.h	10	include/libxml++-%%API_VERSION%%/libxml++/exceptions/validity_error.h
		11	include/libxml++-%%API_VERSION%%/libxml++/exceptions/wrapped_exception.h
9	include/libxml++-%%API_VERSION%%/libxml++/io/istreamparserinputbuffer.h	12	include/libxml++-%%API_VERSION%%/libxml++/io/istreamparserinputbuffer.h
10	include/libxml++-%%API_VERSION%%/libxml++/io/ostreamoutputbuffer.h	13	include/libxml++-%%API_VERSION%%/libxml++/io/ostreamoutputbuffer.h
11	include/libxml++-%%API_VERSION%%/libxml++/io/outputbuffer.h	14	include/libxml++-%%API_VERSION%%/libxml++/io/outputbuffer.h
Lines 16-34 Link Here
16	include/libxml++-%%API_VERSION%%/libxml++/nodes/commentnode.h	19	include/libxml++-%%API_VERSION%%/libxml++/nodes/commentnode.h
17	include/libxml++-%%API_VERSION%%/libxml++/nodes/contentnode.h	20	include/libxml++-%%API_VERSION%%/libxml++/nodes/contentnode.h
18	include/libxml++-%%API_VERSION%%/libxml++/nodes/element.h	21	include/libxml++-%%API_VERSION%%/libxml++/nodes/element.h
		22	include/libxml++-%%API_VERSION%%/libxml++/nodes/entitydeclaration.h
19	include/libxml++-%%API_VERSION%%/libxml++/nodes/entityreference.h	23	include/libxml++-%%API_VERSION%%/libxml++/nodes/entityreference.h
20	include/libxml++-%%API_VERSION%%/libxml++/nodes/node.h	24	include/libxml++-%%API_VERSION%%/libxml++/nodes/node.h
21	include/libxml++-%%API_VERSION%%/libxml++/nodes/processinginstructionnode.h	25	include/libxml++-%%API_VERSION%%/libxml++/nodes/processinginstructionnode.h
22	include/libxml++-%%API_VERSION%%/libxml++/nodes/textnode.h	26	include/libxml++-%%API_VERSION%%/libxml++/nodes/textnode.h
		27	include/libxml++-%%API_VERSION%%/libxml++/nodes/xincludeend.h
		28	include/libxml++-%%API_VERSION%%/libxml++/nodes/xincludestart.h
23	include/libxml++-%%API_VERSION%%/libxml++/noncopyable.h	29	include/libxml++-%%API_VERSION%%/libxml++/noncopyable.h
24	include/libxml++-%%API_VERSION%%/libxml++/parsers/domparser.h	30	include/libxml++-%%API_VERSION%%/libxml++/parsers/domparser.h
25	include/libxml++-%%API_VERSION%%/libxml++/parsers/parser.h	31	include/libxml++-%%API_VERSION%%/libxml++/parsers/parser.h
26	include/libxml++-%%API_VERSION%%/libxml++/parsers/saxparser.h	32	include/libxml++-%%API_VERSION%%/libxml++/parsers/saxparser.h
27	include/libxml++-%%API_VERSION%%/libxml++/parsers/textreader.h	33	include/libxml++-%%API_VERSION%%/libxml++/parsers/textreader.h
		34	include/libxml++-%%API_VERSION%%/libxml++/relaxngschema.h
28	include/libxml++-%%API_VERSION%%/libxml++/schema.h	35	include/libxml++-%%API_VERSION%%/libxml++/schema.h
		36	include/libxml++-%%API_VERSION%%/libxml++/schemabase.h
29	include/libxml++-%%API_VERSION%%/libxml++/validators/dtdvalidator.h	37	include/libxml++-%%API_VERSION%%/libxml++/validators/dtdvalidator.h
		38	include/libxml++-%%API_VERSION%%/libxml++/validators/relaxngvalidator.h
30	include/libxml++-%%API_VERSION%%/libxml++/validators/schemavalidator.h	39	include/libxml++-%%API_VERSION%%/libxml++/validators/schemavalidator.h
		40	include/libxml++-%%API_VERSION%%/libxml++/validators/schemavalidatorbase.h
31	include/libxml++-%%API_VERSION%%/libxml++/validators/validator.h	41	include/libxml++-%%API_VERSION%%/libxml++/validators/validator.h
		42	include/libxml++-%%API_VERSION%%/libxml++/validators/xsdvalidator.h
		43	include/libxml++-%%API_VERSION%%/libxml++/xsdschema.h
32	lib/libxml++-%%VERSION%%.a	44	lib/libxml++-%%VERSION%%.a
33	lib/libxml++-%%VERSION%%.so	45	lib/libxml++-%%VERSION%%.so
34	lib/libxml++-%%VERSION%%.so.2	46	lib/libxml++-%%VERSION%%.so.2