Received: by mail.netbsd.org (Postfix, from userid 605) id A849784E8A; Mon, 30 Jan 2023 11:46:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D7C8D84D44 for ; Mon, 30 Jan 2023 11:46:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wbA5YpkepwYl for ; Mon, 30 Jan 2023 11:46:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3C97A84CE8 for ; Mon, 30 Jan 2023 11:46:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 39E45FA90; Mon, 30 Jan 2023 11:46:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167507916445400" MIME-Version: 1.0 Date: Mon, 30 Jan 2023 11:46:04 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc/FlightCrew To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230130114604.39E45FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167507916445400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Jan 30 11:46:04 UTC 2023 Modified Files: pkgsrc/textproc/FlightCrew: Makefile distinfo Added Files: pkgsrc/textproc/FlightCrew/patches: patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp Log Message: FlightCrew: fix build with boost 1.81.0 To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 pkgsrc/textproc/FlightCrew/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/FlightCrew/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167507916445400 Content-Disposition: inline Content-Length: 3277 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/FlightCrew/Makefile diff -u pkgsrc/textproc/FlightCrew/Makefile:1.66 pkgsrc/textproc/FlightCrew/Makefile:1.67 --- pkgsrc/textproc/FlightCrew/Makefile:1.66 Sun Jan 29 21:17:53 2023 +++ pkgsrc/textproc/FlightCrew/Makefile Mon Jan 30 11:46:03 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.66 2023/01/29 21:17:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.67 2023/01/30 11:46:03 wiz Exp $ DISTNAME= FlightCrew-0.7.2-Code PKGNAME= ${DISTNAME:S/-Code//} -PKGREVISION= 51 +PKGREVISION= 52 CATEGORIES= textproc MASTER_SITES= http://flightcrew.googlecode.com/files/ EXTRACT_SUFX= .zip Index: pkgsrc/textproc/FlightCrew/distinfo diff -u pkgsrc/textproc/FlightCrew/distinfo:1.9 pkgsrc/textproc/FlightCrew/distinfo:1.10 --- pkgsrc/textproc/FlightCrew/distinfo:1.9 Tue Oct 26 11:21:29 2021 +++ pkgsrc/textproc/FlightCrew/distinfo Mon Jan 30 11:46:03 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2021/10/26 11:21:29 nia Exp $ +$NetBSD: distinfo,v 1.10 2023/01/30 11:46:03 wiz Exp $ BLAKE2s (FlightCrew-0.7.2-Code.zip) = 50b593a716ff0d33052b3fe7b70b85e42a3c404c5fe2beebb3b71d8405575992 SHA512 (FlightCrew-0.7.2-Code.zip) = 6933cd85bab0300ee2258106225cbf23474516c4993bc1bcad6736676169eabcaf4a5b31a6cdfc2bf4ff3be8fee9432a8048615112f330d1ac55a04874d094aa @@ -6,6 +6,7 @@ Size (FlightCrew-0.7.2-Code.zip) = 77947 SHA1 (patch-CMakeLists.txt) = 8423ab7b53fad354e04fdfd159b070a8f8bf61f9 SHA1 (patch-src_FlightCrew_CMakeLists.txt) = 2c60cb722bb7613f007f2e3a644f1d9f8509f8ba SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293 +SHA1 (patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp) = 65b6fe9e04d4567449dd36039999d14bee1e7e61 SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = 79b165b1b6c4801a92868d4ad1b6496f3bf0d34a SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce SHA1 (patch-src_utf8-cpp_utf8_core.h) = 1ff6b89132f1ff671e48735ca11153d17d38fd17 Added files: Index: pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp diff -u /dev/null pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp:1.1 --- /dev/null Mon Jan 30 11:46:04 2023 +++ pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp Mon Jan 30 11:46:03 2023 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp,v 1.1 2023/01/30 11:46:03 wiz Exp $ + +Work around +error: 'scoped_ptr' is not a member of 'boost' +appearing with boost 1.81.0 + +--- src/FlightCrew/Validators/SaxSchemaValidator.cpp.orig 2011-08-11 21:03:56.000000000 +0000 ++++ src/FlightCrew/Validators/SaxSchemaValidator.cpp +@@ -35,7 +35,7 @@ std::vector< Result > SaxSchemaValidator + const std::string &external_schema_location, + const std::vector< const xc::MemBufInputSource* > &schemas ) + { +- boost::scoped_ptr< xc::SAX2XMLReader > parser( xc::XMLReaderFactory::createXMLReader() ); ++ std::shared_ptr< xc::SAX2XMLReader > parser( xc::XMLReaderFactory::createXMLReader() ); + + parser->setFeature( xc::XMLUni::fgSAX2CoreValidation, true ); + parser->setFeature( xc::XMLUni::fgXercesLoadSchema, false ); --_----------=_167507916445400--