CVS commit: pkgsrc/devel/protobuf-c

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul  7 15:54:15 UTC 2024

Modified Files:
        pkgsrc/devel/protobuf-c: distinfo
        pkgsrc/devel/protobuf-c/patches: patch-protoc-c_c__generator.h

Log Message:
iprotobuf-c: reduce patch to upstream

GetSupportedFeatures prototype doesn't seem needed.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/protobuf-c/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.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/distinfo
diff -u pkgsrc/devel/protobuf-c/distinfo:1.16 pkgsrc/devel/protobuf-c/distinfo:1.17
--- pkgsrc/devel/protobuf-c/distinfo:1.16       Sun Apr 14 09:35:46 2024
+++ pkgsrc/devel/protobuf-c/distinfo    Sun Jul  7 15:54:15 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2024/04/14 09:35:46 wiz Exp $
+$NetBSD: distinfo,v 1.17 2024/07/07 15:54:15 wiz Exp $
 
 BLAKE2s (protobuf-c-1.5.0.tar.gz) = 7f89b0a27fe78e2bd91b67013315845a236dd9787121a7c5f1989850639e9573
 SHA512 (protobuf-c-1.5.0.tar.gz) = 175c9fc901cab88308730eea982dd62b1e0decdceb80aa53be163f17a440b4acecb834a784beab5cd71186413a322a323f4539758a8727ca51801cf92f9bd3da
 Size (protobuf-c-1.5.0.tar.gz) = 507251 bytes
 SHA1 (patch-protoc-c_c__file.cc) = fc3343b738a546f0c9bb6bb15c97b1dc45e19d49
-SHA1 (patch-protoc-c_c__generator.h) = 0ea8cbc701b9725747adb705068df1b2574461a9
+SHA1 (patch-protoc-c_c__generator.h) = 47310ce5f3f75558b7a1ec0a9d89bdd370068973
 SHA1 (patch-protoc-c_c__helpers.h) = 69ecf6cdf3f76bab88b6509ba82ac1733131b679

Index: pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h
diff -u pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h:1.4 pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h:1.5
--- pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h:1.4   Sun Apr 14 09:35:46 2024
+++ pkgsrc/devel/protobuf-c/patches/patch-protoc-c_c__generator.h       Sun Jul  7 15:54:15 2024
@@ -1,17 +1,16 @@
-$NetBSD: patch-protoc-c_c__generator.h,v 1.4 2024/04/14 09:35:46 wiz Exp $
+$NetBSD: patch-protoc-c_c__generator.h,v 1.5 2024/07/07 15:54:15 wiz Exp $
 
 Chase compatibility issues with Google protobuf 26.0
 https://github.com/protobuf-c/protobuf-c/pull/711
 
 --- protoc-c/c_generator.h.orig        2024-04-07 20:33:52.951908700 +0000
 +++ protoc-c/c_generator.h
-@@ -93,6 +93,12 @@ class PROTOC_C_EXPORT CGenerator : publi
+@@ -93,6 +93,11 @@ class PROTOC_C_EXPORT CGenerator : publi
                  const std::string& parameter,
                  OutputDirectory* output_directory,
                  std::string* error) const;
 +
 +#if GOOGLE_PROTOBUF_VERSION >= 5026000
-+  uint64_t GetSupportedFeatures() const { return 0; }
 +  Edition GetMinimumEdition() const { return Edition::EDITION_PROTO2; }
 +  Edition GetMaximumEdition() const { return Edition::EDITION_PROTO3; }
 +#endif