diff --git a/net/libarcus/Makefile b/net/libarcus/Makefile index 54b2df7681b9..54c8e690379d 100644 --- a/net/libarcus/Makefile +++ b/net/libarcus/Makefile @@ -1,41 +1,40 @@ PORTNAME= libArcus PORTVERSION= 5.3.0 -PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= net cad DIST_SUBDIR= Ultimaker MAINTAINER= db@FreeBSD.org COMMENT= Communication library between internal components for Ultimaker WWW= https://github.com/Ultimaker/libArcus LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} LIB_DEPENDS= libprotobuf.so:devel/protobuf USES= cmake compiler:c++17-lang python pyqt:6 USE_PYQT= pysip USE_GITHUB= yes GH_ACCOUNT= Ultimaker GH_TUPLE= Ultimaker:pyArcus:${PORTVERSION}:pyArcus USE_LDCONFIG= yes CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=OFF \ -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} \ -DPYTHON_INCLUDEDIR:STRING=${PYTHON_INCLUDEDIR} post-extract: @${MKDIR} ${WRKSRC}/cmake @for f in COPYING-CMAKE-SCRIPTS FindSIP.cmake FindSIP.py SIPMacros.cmake; do \ ${CP} ${FILESDIR}/$$f ${WRKSRC}/cmake; \ done @for f in CMakeLists.txt CPackConfig.cmake ArcusConfig.cmake.in; do \ ${CP} ${FILESDIR}/$$f ${WRKSRC}; \ done @${MV} ${WRKSRC_pyArcus}/python ${WRKSRC} @${MV} ${WRKSRC_pyArcus}/include/pyArcus ${WRKSRC}/include @${MV} ${WRKSRC_pyArcus}/src/PythonMessage.cpp ${WRKSRC}/python .include diff --git a/net/libarcus/files/patch-src_MessageTypeStore.cpp b/net/libarcus/files/patch-src_MessageTypeStore.cpp index c561beca5bd6..8e8dd8b90371 100644 --- a/net/libarcus/files/patch-src_MessageTypeStore.cpp +++ b/net/libarcus/files/patch-src_MessageTypeStore.cpp @@ -1,22 +1,22 @@ ---- src/MessageTypeStore.cpp.orig 2024-08-19 14:31:10.714537000 +0200 -+++ src/MessageTypeStore.cpp 2024-08-19 15:30:50.769879000 +0200 -@@ -39,7 +39,7 @@ +--- src/MessageTypeStore.cpp.orig 2023-05-19 06:44:12 UTC ++++ src/MessageTypeStore.cpp +@@ -39,7 +39,7 @@ class ErrorCollector : public google::protobuf::compil { } - void AddError(const std::string& filename, int line, int column, const std::string& message) override + void AddError(const std::string& filename, int line, int column, const std::string& message) { _stream << "[" << filename << " (" << line << "," << column << ")] " << message << std::endl; _error_count++; -@@ -53,6 +53,10 @@ +@@ -53,6 +53,10 @@ class ErrorCollector : public google::protobuf::compil int getErrorCount() { return _error_count; + } + + void RecordError(absl::string_view filename, int line, int column, absl::string_view message) + { } private: