pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/protobuf-c
Module Name: pkgsrc
Committed By: wiz
Date: Fri Nov 3 13:11:26 UTC 2023
Modified Files:
pkgsrc/devel/protobuf-c: Makefile distinfo
Added Files:
pkgsrc/devel/protobuf-c/patches: patch-build-cmake_CMakeLists.txt
patch-configure.ac patch-protoc-c_c__bytes__field.h
patch-protoc-c_c__enum.h patch-protoc-c_c__enum__field.h
patch-protoc-c_c__extension.h patch-protoc-c_c__field.h
patch-protoc-c_c__file.cc patch-protoc-c_c__file.h
patch-protoc-c_c__generator.h patch-protoc-c_c__helpers.h
patch-protoc-c_c__message.cc patch-protoc-c_c__message.h
patch-protoc-c_c__message__field.h
patch-protoc-c_c__primitive__field.cc
patch-protoc-c_c__primitive__field.h patch-protoc-c_c__service.h
patch-protoc-c_c__string__field.h
Log Message:
protobuf-c: fix build with latest protobuf
>From upstream, who should really make a new release.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/protobuf-c/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/protobuf-c/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/protobuf-c/patches/patch-build-cmake_CMakeLists.txt \
pkgsrc/devel/protobuf-c/patches/patch-configure.ac \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__bytes__field.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum__field.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__extension.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__helpers.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message__field.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.cc \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__service.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__string__field.h
cvs rdiff -u -r0 -r1.3 \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__field.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.cc \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.h \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.cc \
pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/protobuf-c/Makefile
diff -u pkgsrc/devel/protobuf-c/Makefile:1.15 pkgsrc/devel/protobuf-c/Makefile:1.16
--- pkgsrc/devel/protobuf-c/Makefile:1.15 Thu Nov 2 12:20:03 2023
+++ pkgsrc/devel/protobuf-c/Makefile Fri Nov 3 13:11:25 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2023/11/02 12:20:03 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2023/11/03 13:11:25 wiz Exp $
DISTNAME= protobuf-c-1.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=protobuf-c/}
GITHUB_RELEASE= v${PKGVERSION_NOREV}
@@ -11,15 +11,16 @@ HOMEPAGE= https://github.com/protobuf-c/
COMMENT= Protocol Buffers implementation in C
LICENSE= modified-bsd
-USE_LANGUAGES= c99 c++11
+USE_LANGUAGES= c c++14
USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config autoconf automake autoreconf
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= protobuf-c/libprotobuf-c.pc.in
TEST_TARGET= check
pre-configure:
${LN} -s ${BUILDLINK_DIR}/include/google ${WRKSRC}/google
+ cd ${WRKSRC} && autoreconf -fiv
.include "../../devel/protobuf/buildlink3.mk"
.include "../../mk/atomic64.mk"
Index: pkgsrc/devel/protobuf-c/distinfo
diff -u pkgsrc/devel/protobuf-c/distinfo:1.12 pkgsrc/devel/protobuf-c/distinfo:1.13
--- pkgsrc/devel/protobuf-c/distinfo:1.12 Thu Aug 18 19:24:09 2022
+++ pkgsrc/devel/protobuf-c/distinfo Fri Nov 3 13:11:25 2023
@@ -1,5 +1,23 @@
-$NetBSD: distinfo,v 1.12 2022/08/18 19:24:09 wiz Exp $
+$NetBSD: distinfo,v 1.13 2023/11/03 13:11:25 wiz Exp $
BLAKE2s (protobuf-c-1.4.1.tar.gz) = 3585955198453b1e7a80392379219df5338b8e63e0f7756fa02264ab0bcc7d0b
SHA512 (protobuf-c-1.4.1.tar.gz) = 190a4aa5c607853e6bf860b0974deb21e4f7f6209e810251eaca9612b59ea676779b0ca217fb1572914ffb8de3315a7d24f162b14d447ee671a9adc5b1271e41
Size (protobuf-c-1.4.1.tar.gz) = 513596 bytes
+SHA1 (patch-build-cmake_CMakeLists.txt) = fedaf0ceb1c2b0736d1e614af343ecbf30000107
+SHA1 (patch-configure.ac) = 24b08254e94502c85948a7c984fa36dcd9ea6aa4
+SHA1 (patch-protoc-c_c__bytes__field.h) = 902f4dddb997240d93f3dcc529f9022f1b43d093
+SHA1 (patch-protoc-c_c__enum.h) = 0508bf6c0335731446aebf45d6b9b95c5891023e
+SHA1 (patch-protoc-c_c__enum__field.h) = 9e3d5a18d546c31f06cc889204a37cc5e1035fbc
+SHA1 (patch-protoc-c_c__extension.h) = 22135ae90c6a83572ab128f90c0c833528f33e97
+SHA1 (patch-protoc-c_c__field.h) = 8a36dd7ad664ddca6a3b1278ac8bf26c22cd6ab5
+SHA1 (patch-protoc-c_c__file.cc) = 21bae3e4ca0932bc77ec82e4b06850e2e879e3bf
+SHA1 (patch-protoc-c_c__file.h) = 4fdde8e54fa980065b2c4577fd735cbdfb31df0a
+SHA1 (patch-protoc-c_c__generator.h) = 9666ea994c2a80dc4469cfa3258120943eabd0b3
+SHA1 (patch-protoc-c_c__helpers.h) = 6eabefa37418bae0ad5dbd618381ecc2b5eb1a4d
+SHA1 (patch-protoc-c_c__message.cc) = 8fd07301ef5115568928dd82ac14f8b0c98157ed
+SHA1 (patch-protoc-c_c__message.h) = 1532a8f82cbccecfaff50d47418316dca8bfa3ad
+SHA1 (patch-protoc-c_c__message__field.h) = 99effa3dd97a7b5c18606c055bd07ecd7f1cacea
+SHA1 (patch-protoc-c_c__primitive__field.cc) = fc911511a33c1052df7e44eca395388ad5f57342
+SHA1 (patch-protoc-c_c__primitive__field.h) = 884876a9224f1eb1be9e31dbaac0ea1b4e1e6ba1
+SHA1 (patch-protoc-c_c__service.h) = 1d75f64e5dc7bf3b26425871d89088a4b8cf5362
+SHA1 (patch-protoc-c_c__string__field.h) = 224972b17f1c959a6dc991e4852c401d8419a459
Added files:
Index: pkgsrc/devel/protobuf-c/patches/patch-build-cmake_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-build-cmake_CMakeLists.txt:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-build-cmake_CMakeLists.txt Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-build-cmake_CMakeLists.txt,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- build-cmake/CMakeLists.txt.orig 2022-07-11 01:33:12.000000000 +0000
++++ build-cmake/CMakeLists.txt
+@@ -88,7 +88,7 @@ if (MSVC AND NOT BUILD_SHARED_LIBS)
+ endif (MSVC AND NOT BUILD_SHARED_LIBS)
+
+ IF(BUILD_PROTOC)
+-SET(CMAKE_CXX_STANDARD 11)
++SET(CMAKE_CXX_STANDARD 17)
+ SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+ SET(CMAKE_CXX_EXTENSIONS OFF)
+ ADD_CUSTOM_COMMAND(OUTPUT protobuf-c/protobuf-c.pb.cc protobuf-c/protobuf-c.pb.h
Index: pkgsrc/devel/protobuf-c/patches/patch-configure.ac
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-configure.ac:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-configure.ac Fri Nov 3 13:11:26 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure.ac,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- configure.ac.orig 2022-07-11 01:33:59.000000000 +0000
++++ configure.ac
+@@ -75,13 +75,8 @@ AC_ARG_ENABLE([protoc],
+ AS_HELP_STRING([--disable-protoc], [Disable building protoc_c (also disables tests)]))
+ if test "x$enable_protoc" != "xno"; then
+ AC_LANG_PUSH([C++])
+-
+- AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
+-
+- PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0],
+- [proto3_supported=yes],
+- [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])]
+- )
++ AX_CXX_COMPILE_STDCXX(17, noext, mandatory)
++ PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], [proto3_supported=yes])
+
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$save_CPPFLAGS $protobuf_CFLAGS"
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__bytes__field.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__bytes__field.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__bytes__field.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__bytes__field.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_bytes_field.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_bytes_field.h
+@@ -87,8 +87,6 @@ class BytesFieldGenerator : public Field
+
+ private:
+ std::map<std::string, std::string> variables_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(BytesFieldGenerator);
+ };
+
+
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__enum.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_enum.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_enum.h
+@@ -106,8 +106,6 @@ class EnumGenerator {
+ private:
+ const EnumDescriptor* descriptor_;
+ std::string dllexport_decl_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
+ };
+
+ } // namespace c
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum__field.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum__field.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__enum__field.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__enum__field.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_enum_field.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_enum_field.h
+@@ -85,8 +85,6 @@ class EnumFieldGenerator : public FieldG
+
+ private:
+ std::map<std::string, std::string> variables_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator);
+ };
+
+
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__extension.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__extension.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__extension.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__extension.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_extension.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_extension.h
+@@ -98,8 +98,6 @@ class ExtensionGenerator {
+ const FieldDescriptor* descriptor_;
+ std::string type_traits_;
+ std::string dllexport_decl_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator);
+ };
+
+ } // namespace c
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-protoc-c_c__generator.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_generator.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_generator.h
+@@ -93,9 +93,6 @@ class PROTOC_C_EXPORT CGenerator : publi
+ const std::string& parameter,
+ OutputDirectory* output_directory,
+ std::string* error) const;
+-
+- private:
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CGenerator);
+ };
+
+ } // namespace c
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__helpers.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__helpers.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__helpers.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,45 @@
+$NetBSD: patch-protoc-c_c__helpers.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_helpers.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_helpers.h
+@@ -70,6 +70,10 @@
+ #include <protobuf-c/protobuf-c.pb.h>
+ #include <google/protobuf/io/printer.h>
+
++#if GOOGLE_PROTOBUF_VERSION >= 4023000
++# include <google/protobuf/descriptor_legacy.h>
++#endif
++
+ namespace google {
+ namespace protobuf {
+ namespace compiler {
+@@ -172,12 +176,26 @@ int compare_name_indices_by_name(const v
+ // This wrapper is needed to be able to compile against protobuf2.
+ inline int FieldSyntax(const FieldDescriptor* field) {
+ #ifdef HAVE_PROTO3
++# if GOOGLE_PROTOBUF_VERSION >= 4023000
++ return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2;
++# else
+ return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? 3 : 2;
++# endif
+ #else
+ return 2;
+ #endif
+ }
+
++// Work around changes in protobuf >= 22.x without breaking compilation against
++// older protobuf versions.
++#if GOOGLE_PROTOBUF_VERSION >= 4022000
++# define GOOGLE_ARRAYSIZE ABSL_ARRAYSIZE
++# define GOOGLE_CHECK_EQ ABSL_CHECK_EQ
++# define GOOGLE_CHECK_EQ ABSL_CHECK_EQ
++# define GOOGLE_DCHECK_GE ABSL_DCHECK_GE
++# define GOOGLE_LOG ABSL_LOG
++#endif
++
+ } // namespace c
+ } // namespace compiler
+ } // namespace protobuf
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message__field.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message__field.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message__field.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-protoc-c_c__message__field.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_message_field.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_message_field.h
+@@ -82,10 +82,6 @@ class MessageFieldGenerator : public Fie
+ void GenerateDescriptorInitializer(io::Printer* printer) const;
+ std::string GetDefaultValue(void) const;
+ void GenerateStaticInit(io::Printer* printer) const;
+-
+- private:
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator);
+ };
+
+
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.cc
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.cc:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.cc Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__primitive__field.cc,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_primitive_field.cc.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_primitive_field.cc
+@@ -143,7 +143,7 @@ std::string PrimitiveFieldGenerator::Get
+ case FieldDescriptor::CPPTYPE_BOOL:
+ return descriptor_->default_value_bool() ? "1" : "0";
+ default:
+- GOOGLE_LOG(DFATAL) << "unexpected CPPTYPE in c_primitive_field";
++ GOOGLE_LOG(FATAL) << "unexpected CPPTYPE in c_primitive_field";
+ return "UNEXPECTED_CPPTYPE";
+ }
+ }
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__primitive__field.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-protoc-c_c__primitive__field.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_primitive_field.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_primitive_field.h
+@@ -82,10 +82,6 @@ class PrimitiveFieldGenerator : public F
+ void GenerateDescriptorInitializer(io::Printer* printer) const;
+ std::string GetDefaultValue(void) const;
+ void GenerateStaticInit(io::Printer* printer) const;
+-
+- private:
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveFieldGenerator);
+ };
+
+ } // namespace c
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__service.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__service.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__service.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__service.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_service.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_service.h
+@@ -100,8 +100,6 @@ class ServiceGenerator {
+
+ const ServiceDescriptor* descriptor_;
+ std::map<std::string, std::string> vars_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator);
+ };
+
+ } // namespace c
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__string__field.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__string__field.h:1.1
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__string__field.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__string__field.h,v 1.1 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_string_field.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_string_field.h
+@@ -87,8 +87,6 @@ class StringFieldGenerator : public Fiel
+
+ private:
+ std::map<std::string, std::string> variables_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator);
+ };
+
+
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__field.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__field.h:1.3
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__field.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-protoc-c_c__field.h,v 1.3 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_field.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_field.h
+@@ -103,9 +103,6 @@ class FieldGenerator {
+ const std::string &type_macro,
+ const std::string &descriptor_addr) const;
+ const FieldDescriptor *descriptor_;
+-
+- private:
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator);
+ };
+
+ // Convenience class which constructs FieldGenerators for a Descriptor.
+@@ -121,8 +118,6 @@ class FieldGeneratorMap {
+ std::unique_ptr<std::unique_ptr<FieldGenerator>[]> field_generators_;
+
+ static FieldGenerator* MakeGenerator(const FieldDescriptor* field);
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap);
+ };
+
+ } // namespace c
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.cc
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.cc:1.3
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.cc Fri Nov 3 13:11:26 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-protoc-c_c__file.cc,v 1.3 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_file.cc.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_file.cc
+@@ -119,7 +119,11 @@ void FileGenerator::GenerateHeader(io::P
+
+ int min_header_version = 1000000;
+ #if defined(HAVE_PROTO3)
++# if GOOGLE_PROTOBUF_VERSION >= 4023000
++ if (FileDescriptorLegacy(file_).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3) {
++# else
+ if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) {
++#endif
+ min_header_version = 1003000;
+ }
+ #endif
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.h:1.3
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__file.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__file.h,v 1.3 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_file.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_file.h
+@@ -103,8 +103,6 @@ class FileGenerator {
+ std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_;
+ std::unique_ptr<std::unique_ptr<ServiceGenerator>[]> service_generators_;
+ std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
+ };
+
+ } // namespace c
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.cc
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.cc:1.3
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.cc Fri Nov 3 13:11:26 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-protoc-c_c__message.cc,v 1.3 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_message.cc.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_message.cc
+@@ -499,7 +499,7 @@ GenerateMessageDescriptor(io::Printer* p
+ // NOTE: not supported by protobuf
+ vars["maybe_static"] = "";
+ vars["field_dv_ctype"] = "{ ... }";
+- GOOGLE_LOG(DFATAL) << "Messages can't have default values!";
++ GOOGLE_LOG(FATAL) << "Messages can't have default values!";
+ break;
+ case FieldDescriptor::CPPTYPE_STRING:
+ if (fd->type() == FieldDescriptor::TYPE_BYTES || opt.string_as_bytes())
+@@ -521,7 +521,7 @@ GenerateMessageDescriptor(io::Printer* p
+ break;
+ }
+ default:
+- GOOGLE_LOG(DFATAL) << "Unknown CPPTYPE";
++ GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
+ break;
+ }
+ if (!already_defined)
Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.h
diff -u /dev/null pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.h:1.3
--- /dev/null Fri Nov 3 13:11:26 2023
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__message.h Fri Nov 3 13:11:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-protoc-c_c__message.h,v 1.3 2023/11/03 13:11:26 wiz Exp $
+
+Support for new Google protobuf 22.x, 23.x releases
+https://github.com/protobuf-c/protobuf-c/pull/673
+
+--- protoc-c/c_message.h.orig 2021-05-19 01:51:00.000000000 +0000
++++ protoc-c/c_message.h
+@@ -136,8 +136,6 @@ class MessageGenerator {
+ std::unique_ptr<std::unique_ptr<MessageGenerator>[]> nested_generators_;
+ std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_;
+ std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
+-
+- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator);
+ };
+
+ } // namespace c
Home |
Main Index |
Thread Index |
Old Index