Mon Jan 30 11:46:04 2023 UTC ()
FlightCrew: fix build with boost 1.81.0


(wiz)
diff -r1.66 -r1.67 pkgsrc/textproc/FlightCrew/Makefile
diff -r1.9 -r1.10 pkgsrc/textproc/FlightCrew/distinfo
diff -r0 -r1.1 pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp
cvs diff -r1.66 -r1.67 pkgsrc/textproc/FlightCrew/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/FlightCrew/Makefile 2023/01/29 21:17:53 1.66
+++ pkgsrc/textproc/FlightCrew/Makefile 2023/01/30 11:46:03 1.67
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.66 2023/01/29 21:17:53 ryoon Exp $ 1# $NetBSD: Makefile,v 1.67 2023/01/30 11:46:03 wiz Exp $
2 2
3DISTNAME= FlightCrew-0.7.2-Code 3DISTNAME= FlightCrew-0.7.2-Code
4PKGNAME= ${DISTNAME:S/-Code//} 4PKGNAME= ${DISTNAME:S/-Code//}
5PKGREVISION= 51 5PKGREVISION= 52
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://flightcrew.googlecode.com/files/ 7MASTER_SITES= http://flightcrew.googlecode.com/files/
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://github.com/Sigil-Ebook/flightcrew 11HOMEPAGE= https://github.com/Sigil-Ebook/flightcrew
12COMMENT= EPUB validator 12COMMENT= EPUB validator
13LICENSE= gnu-lgpl-v3 AND cc-by-sa-v3.0 13LICENSE= gnu-lgpl-v3 AND cc-by-sa-v3.0
14 14
15WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
16 16
17USE_LANGUAGES= c c++11 17USE_LANGUAGES= c c++11
18USE_CMAKE= yes 18USE_CMAKE= yes
cvs diff -r1.9 -r1.10 pkgsrc/textproc/FlightCrew/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/FlightCrew/distinfo 2021/10/26 11:21:29 1.9
+++ pkgsrc/textproc/FlightCrew/distinfo 2023/01/30 11:46:03 1.10
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.9 2021/10/26 11:21:29 nia Exp $ 1$NetBSD: distinfo,v 1.10 2023/01/30 11:46:03 wiz Exp $
2 2
3BLAKE2s (FlightCrew-0.7.2-Code.zip) = 50b593a716ff0d33052b3fe7b70b85e42a3c404c5fe2beebb3b71d8405575992 3BLAKE2s (FlightCrew-0.7.2-Code.zip) = 50b593a716ff0d33052b3fe7b70b85e42a3c404c5fe2beebb3b71d8405575992
4SHA512 (FlightCrew-0.7.2-Code.zip) = 6933cd85bab0300ee2258106225cbf23474516c4993bc1bcad6736676169eabcaf4a5b31a6cdfc2bf4ff3be8fee9432a8048615112f330d1ac55a04874d094aa 4SHA512 (FlightCrew-0.7.2-Code.zip) = 6933cd85bab0300ee2258106225cbf23474516c4993bc1bcad6736676169eabcaf4a5b31a6cdfc2bf4ff3be8fee9432a8048615112f330d1ac55a04874d094aa
5Size (FlightCrew-0.7.2-Code.zip) = 7794710 bytes 5Size (FlightCrew-0.7.2-Code.zip) = 7794710 bytes
6SHA1 (patch-CMakeLists.txt) = 8423ab7b53fad354e04fdfd159b070a8f8bf61f9 6SHA1 (patch-CMakeLists.txt) = 8423ab7b53fad354e04fdfd159b070a8f8bf61f9
7SHA1 (patch-src_FlightCrew_CMakeLists.txt) = 2c60cb722bb7613f007f2e3a644f1d9f8509f8ba 7SHA1 (patch-src_FlightCrew_CMakeLists.txt) = 2c60cb722bb7613f007f2e3a644f1d9f8509f8ba
8SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293 8SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293
 9SHA1 (patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp) = 65b6fe9e04d4567449dd36039999d14bee1e7e61
9SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = 79b165b1b6c4801a92868d4ad1b6496f3bf0d34a 10SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = 79b165b1b6c4801a92868d4ad1b6496f3bf0d34a
10SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce 11SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce
11SHA1 (patch-src_utf8-cpp_utf8_core.h) = 1ff6b89132f1ff671e48735ca11153d17d38fd17 12SHA1 (patch-src_utf8-cpp_utf8_core.h) = 1ff6b89132f1ff671e48735ca11153d17d38fd17
File Added: pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp
$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 );