libArcus: Migration to protobuf v22

[Atsushi Toyokura <asteria.at%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Mon Aug 26 23:40:15 2024 +0900
Changeset:	ff13f1cd1e3e245107c0e232707524f2c0b22b0c

Modified Files:
	libArcus/Makefile
	libArcus/buildlink3.mk
	libArcus/distinfo
Added Files:
	libArcus/patches/patch-CMakeLists.txt
	libArcus/patches/patch-src_MessageTypeStore.cpp

Log Message:
libArcus: Migration to protobuf v22

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ff13f1cd1e3e245107c0e232707524f2c0b22b0c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libArcus/Makefile                               |  4 ++++
 libArcus/buildlink3.mk                          |  2 ++
 libArcus/distinfo                               |  2 ++
 libArcus/patches/patch-CMakeLists.txt           | 20 ++++++++++++++++++++
 libArcus/patches/patch-src_MessageTypeStore.cpp | 15 +++++++++++++++
 5 files changed, 43 insertions(+)

diffs:
diff --git a/libArcus/Makefile b/libArcus/Makefile
index bc5720b5ec..1c930212fd 100644
--- a/libArcus/Makefile
+++ b/libArcus/Makefile
@@ -25,6 +25,10 @@ SUBST_SED.sip=		-e 's|\(SIP_EXECUTABLE sip\)|\1${PYVERSSUFFIX}|'
 
 PY_PATCHPLIST=	YES
 
+PYTHON_VERSIONS_ACCEPTED=	311 310
+
+BUILDLINK_DEPMETHOD.py-sip4?=	build
+
 .include "../../lang/python/extension.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../wip/py-sip4/buildlink3.mk"
diff --git a/libArcus/buildlink3.mk b/libArcus/buildlink3.mk
index 89e172a757..51341ea564 100644
--- a/libArcus/buildlink3.mk
+++ b/libArcus/buildlink3.mk
@@ -8,6 +8,8 @@ LIBARCUS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libArcus+=	libArcus>=4.11.0
 BUILDLINK_PKGSRCDIR.libArcus?=		../../wip/libArcus
 
+BUILDLINK_DEPMETHOD.py-sip4?=	build
+
 .include "../../lang/python/extension.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../wip/py-sip4/buildlink3.mk"
diff --git a/libArcus/distinfo b/libArcus/distinfo
index 8293dd4d8d..969638fc58 100644
--- a/libArcus/distinfo
+++ b/libArcus/distinfo
@@ -3,4 +3,6 @@ $NetBSD$
 BLAKE2s (libArcus/4.13.0.tar.gz) = effa6edbb0f4a10e1957a3f735cbd2e71fd3b3ab0a763e37a0515dbdf52b88db
 SHA512 (libArcus/4.13.0.tar.gz) = a48ab1cb286c13b817363e113707499f2619724c8d2f7672309f9aad78123a89f60e60e92932d8761af87ec5f868f8c319717457532d45e3f2d8e5c3cc010db5
 Size (libArcus/4.13.0.tar.gz) = 32079 bytes
+SHA1 (patch-CMakeLists.txt) = f2d9c078cab1fe741c18d749ad7cac265624335e
+SHA1 (patch-src_MessageTypeStore.cpp) = f8a5b7d07c276167969330ad6a5a2bfd4be3406e
 SHA1 (patch-src_Socket__p.h) = c7933e7fe5e6c7a4ebf913bade8b99fdc3fe1395
diff --git a/libArcus/patches/patch-CMakeLists.txt b/libArcus/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..7d04002ab6
--- /dev/null
+++ b/libArcus/patches/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2021-11-26 15:37:16.000000000 +0000
++++ CMakeLists.txt
+@@ -100,12 +100,13 @@ if(BUILD_PYTHON)
+     add_sip_python_module(Arcus python/Socket.sip Arcus)
+ endif()
+ 
++include_directories(${PROTOBUF_INCLUDE_DIR})
++
+ target_include_directories(Arcus PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+-    ${PROTOBUF_INCLUDE_DIR}
+ )
+-target_link_libraries(Arcus PUBLIC ${PROTOBUF_LIBRARIES})
++target_link_libraries(Arcus PUBLIC protobuf::libprotobuf)
+ 
+ if(WIN32)
+     add_definitions(-D_WIN32_WINNT=0x0600) # Declare we require Vista or higher, this allows us to use IPv6 functions.
diff --git a/libArcus/patches/patch-src_MessageTypeStore.cpp b/libArcus/patches/patch-src_MessageTypeStore.cpp
new file mode 100644
index 0000000000..ac9bae1786
--- /dev/null
+++ b/libArcus/patches/patch-src_MessageTypeStore.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Migration to protobuf v22
+
+--- src/MessageTypeStore.cpp.orig	2024-08-19 13:43:12.527078688 +0000
++++ src/MessageTypeStore.cpp
+@@ -52,7 +52,7 @@ class ErrorCollector : public google::pr
+ public:
+     ErrorCollector() : _error_count(0) { }
+ 
+-    void AddError(const std::string& filename, int line, int column, const std::string& message) override
++    void RecordError(absl::string_view filename, int line, int column, absl::string_view message) override
+     {
+         _stream << "[" << filename << " (" << line << "," << column << ")] " << message << std::endl;
+         _error_count++;