PR#3: DO NOT MERGE: Update to 22.10.26 (.so version 2→22) - rpms/flatbuffers

		`@@ -10,3 +10,7 @@`
		`/flatbuffers-2.0.6.tar.gz`
		`/flatbuffers-2.0.7.tar.gz`
		`/flatbuffers-2.0.8.tar.gz`
		`+ /flatbuffers-22.9.24.tar.gz`
		`+ /flatbuffers-22.9.29.tar.gz`
		`+ /flatbuffers-22.10.25.tar.gz`
		`+ /flatbuffers-22.10.26.tar.gz`

7611.patch

file added

+24

		`@@ -0,0 +1,24 @@`
		`+ From 737ecea521f35549504effbab3dceb1cd9787e2e Mon Sep 17 00:00:00 2001`
		`+ From: "Benjamin A. Beasley" <code@musicinmybrain.net>`
		`+ Date: Sat, 29 Oct 2022 13:09:08 -0400`
		`+ Subject: [PATCH] Fix help output for --gen-includes`
		`+`
		`+ Fixes the --help output documenting the deprecated --gen-includes`
		`+ option, in which the option name contained a typo (--gen-inclues).`
		`+ ---`
		`+ src/flatc.cpp \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/src/flatc.cpp b/src/flatc.cpp`
		`+ index 1d12a1769c7..2ed5da0a8e0 100644`
		`+ --- a/src/flatc.cpp`
		`+ +++ b/src/flatc.cpp`
		`+ @@ -88,7 +88,7 @@ const static FlatCOption options[] = {`
		`+ "--no-prefix." },`
		`+ { "", "swift-implementation-only", "",`
		`+ "Adds a @_implementationOnly to swift imports" },`
		`+ - { "", "gen-inclues", "",`
		`+ + { "", "gen-includes", "",`
		`+ "(deprecated), this is the default behavior. If the original behavior is "`
		`+ "required (no include statements) use --no-includes." },`
		`+ { "", "no-includes", "",`

7612.patch

file added

+50

		`@@ -0,0 +1,50 @@`
		`+ From 20103b9c857a16e56d1c0de9b7c8a633de12df8c Mon Sep 17 00:00:00 2001`
		`+ From: "Benjamin A. Beasley" <code@musicinmybrain.net>`
		`+ Date: Sat, 29 Oct 2022 15:33:14 -0400`
		`+ Subject: [PATCH 1/2] Fix error in --json-nested-bytes help text`
		`+ MIME-Version: 1.0`
		`+ Content-Type: text/plain; charset=UTF-8`
		`+ Content-Transfer-Encoding: 8bit`
		`+`
		`+ Correct “bytesin” to “bytes in”`
		`+ ---`
		`+ src/flatc.cpp \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/src/flatc.cpp b/src/flatc.cpp`
		`+ index 1d12a1769c7..df5088e3e34 100644`
		`+ --- a/src/flatc.cpp`
		`+ +++ b/src/flatc.cpp`
		`+ @@ -215,7 +215,7 @@ const static FlatCOption options[] = {`
		`+ "Allows (de)serialization of JSON text in the Object API. (requires "`
		`+ "--gen-object-api)." },`
		`+ { "", "json-nested-bytes", "",`
		`+ - "Allow a nested_flatbuffer field to be parsed as a vector of bytes"`
		`+ + "Allow a nested_flatbuffer field to be parsed as a vector of bytes "`
		`+ "in JSON, which is unsafe unless checked by a verifier afterwards." },`
		`+ { "", "ts-flat-files", "",`
		`+ "Only generated one typescript file per .fbs file." },`
		`+`
		`+ From c2c05709219db103836498110c06a070d92ab45d Mon Sep 17 00:00:00 2001`
		`+ From: "Benjamin A. Beasley" <code@musicinmybrain.net>`
		`+ Date: Sat, 29 Oct 2022 16:36:44 -0400`
		`+ Subject: [PATCH 2/2] Fix missing space in --no-leak-private-annotation help`
		`+ text`
		`+`
		`+ ---`
		`+ src/flatc.cpp \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/src/flatc.cpp b/src/flatc.cpp`
		`+ index df5088e3e34..ca04d0e41e7 100644`
		`+ --- a/src/flatc.cpp`
		`+ +++ b/src/flatc.cpp`
		`+ @@ -222,7 +222,7 @@ const static FlatCOption options[] = {`
		`+ { "", "annotate", "SCHEMA",`
		`+ "Annotate the provided BINARY_FILE with the specified SCHEMA file." },`
		`+ { "", "no-leak-private-annotation", "",`
		`+ - "Prevents multiple type of annotations within a Fbs SCHEMA file."`
		`+ + "Prevents multiple type of annotations within a Fbs SCHEMA file. "`
		`+ "Currently this is required to generate private types in Rust" },`
		`+ };`
		`+`

flatbuffers.spec

file modified

+14 -5

		`@@ -10,13 +10,13 @@`
		`%bcond_with doc_pdf`

		`Name: flatbuffers`
		`- Version: 2.0.8`
		`+ Version: 22.10.26`
		`# The .so version is explicitly constructed from project version—search`
		`# CMakeLists.txt for FlatBuffers_Library_SONAME_MAJOR and`
		`# FlatBuffers_Library_SONAME_FULL—but we manually repeat the SOVERSION here,`
		`# and use the macro in the file lists, as a reminder to avoid undetected .so`
		`# version bumps.`
		`- %global so_version 2`
		`+ %global so_version 22`
		`Release: %autorelease`
		`Summary: Memory efficient serialization library`

		`@@ -30,6 +30,13 @@`
		`# Hand-written for Fedora in groff_man(7) format based on --help output`
		`Source1: flatc.1`

		`+ # Fix help output for --gen-includes`
		`+ # https://github.com/google/flatbuffers/pull/7611`
		`+ Patch: https://github.com/google/flatbuffers/pull/7611.patch`
		`+ # Fix missing spaces in flatc help text`
		`+ # https://github.com/google/flatbuffers/pull/7612`
		`+ Patch: https://github.com/google/flatbuffers/pull/7612.patch`
		`+`
		`BuildRequires: gcc-c++`
		`BuildRequires: cmake`
		`# The ninja backend should be slightly faster than make, with no disadvantages.`
		`@@ -50,10 +57,12 @@`
		`# generator.`
		`#`
		`# It’s not clearly documented which GPRC version is excerpted, but see`
		`- # https://github.com/google/flatbuffers/pull/4305 for more details.`
		`+ # https://github.com/google/flatbuffers/pull/4305 for more details. We use`
		`+ # _GRPC_VERSION from the WORKSPACE file as the bundled GRPC version, but we are`
		`+ # not 100% certain that this is entirely correct.`
		`#`
		`# It is not possible to unbundle this because private/internal APIs are used.`
		`- Provides: bundled(grpc)`
		`+ Provides: bundled(grpc) = 1.49.0`

		`%global common_description %{expand:`
		`FlatBuffers is a cross platform serialization library architected for maximum`
		`@@ -120,7 +129,7 @@`


		`%prep`
		`- %autosetup`
		`+ %autosetup -p1`
		`# Remove unused directories that contain pre-compiled .jar files:`
		`rm -rvf android/ kotlin/`

flatc.1

file modified

+60 -8

		`@@ -1,4 +1,4 @@`
		`- .TH FLATC "1" "June 2022" "" "User Commands"`
		`+ .TH FLATC "1" "October 2022" "" "User Commands"`
		`.SH NAME`
		`.B flatc`
		`\(en FlatBuffers compiler`
		`@@ -6,7 +6,7 @@`
		`.B flatc`
		`.RI [ OPTION ]...\:`
		`.IR FILE ...\:`
		`- .RI [\-\-\ FILE ...]`
		`+ .RI [\-\-\ BINARY_FILE ...]`
		`.SH OPTIONS`
		`.IR FILE s`
		`may be schemas (must end in`
		`@@ -14,7 +14,7 @@`
		`binary schemas (must end in`
		`.BR .bfbs ),`
		`or JSON files (conforming to preceding schema).`
		`- .IR FILE s`
		`+ .IR BINARY_FILE s`
		`after the`
		`.B \-\-`
		`must be binary flatbuffer format files.`
		`@@ -71,6 +71,9 @@`
		`.B \-\-swift`
		`Generate Swift files for tables/structs.`
		`.TP`
		`+ .B \-\-nim`
		`+ Generate Nim files for tables/structs.`
		`+ .TP`
		`.B \-o\ \fIPATH`
		`Prefix`
		`.I PATH`
		`@@ -106,7 +109,7 @@`
		`escapes.`
		`.TP`
		`.B \-\-defaults\-json`
		`- Output fields whose value is the default when writing JSON`
		`+ Output fields whose value is the default when writing JSON.`
		`.TP`
		`.B \-\-unknown\-json`
		`Allow fields in JSON that are not defined in the schema.`
		`@@ -150,7 +153,8 @@`
		`.B \-\-gen\-nullable`
		`Add Clang`
		`.B _Nullable`
		`- for C++ pointer. or`
		`+ for C++ pointer.`
		`+ or`
		`.B @Nullable`
		`for Java`
		`.TP`
		`@@ -176,6 +180,9 @@`
		`If the language uses a single file for output (by default`
		`the case for C++ and JS), all code will end up in this one file.`
		`.TP`
		`+ .B \-\-gen\-json\-emit`
		`+ Generates encoding code which emits Flatbuffers into JSON.`
		`+ .TP`
		`.B \-\-cpp\-include`
		`Adds an`
		`.B #include`
		`@@ -300,7 +307,7 @@`
		`.TP`
		`.B \-\-conform\-includes`
		`Include path for the schema given with`
		`- .B \-\-conform\ \fIPATH`
		`+ .BR \-\-conform\ \fIPATH .`
		`.TP`
		`.B \-\-filename\-suffix`
		`The suffix appended to the generated file names.`
		`@@ -325,15 +332,23 @@`
		`.B \-\-reflect\-names`
		`Add minimal type/name reflection.`
		`.TP`
		`+ .B \-\-rust\-serialize`
		`+ Implement`
		`+ .B serde::Serialize`
		`+ on generated Rust types.`
		`+ .TP`
		`+ .B \-\-rust\-module\-root\-file`
		`+ Generate rust code in individual files with a module root file.`
		`+ .TP`
		`.B \-\-root\-type\ \fIT`
		`- Select or override the default root_type`
		`+ Select or override the default root_type.`
		`.TP`
		`.B \-\-require\-explicit\-ids`
		`When parsing schemas, require explicit ids`
		`.RB ( id:\ \fIx ).`
		`.TP`
		`.B \-\-force\-defaults`
		`- Emit default values in binary output from JSON`
		`+ Emit default values in binary output from JSON.`
		`.TP`
		`.B \-\-force\-empty`
		`When serializing from object API representation,`
		`@@ -353,6 +368,43 @@`
		`.TP`
		`.B \-\-no\-warnings`
		`Inhibit all warning messages.`
		`+ .TP`
		`+ .B \-\-warnings\-as-errors`
		`+ Treat all warnings as errors.`
		`+ .TP`
		`+ .B \-\-cs\-global\-alias`
		`+ Prepend`
		`+ .RB \(lq global:: \(rq`
		`+ to all user generated csharp classes and structs.`
		`+ .TP`
		`+ .B \-\-cs\-gen\-json\-serializer`
		`+ Allows (de)serialization of JSON text in the Object API.`
		`+ (requires`
		`+ .BR \-\-gen\-object\-api ).`
		`+ .TP`
		`+ .B \-\-json\-nested\-bytes`
		`+ Allow a`
		`+ .B nested_flatbuffer`
		`+ field to be parsed as a vector of bytes in JSON,`
		`+ which is unsafe unless checked by a verifier afterwards.`
		`+ .TP`
		`+ .B \-\-ts\-flat\-files`
		`+ Only generated one typescript file per`
		`+ .B .fbs`
		`+ file.`
		`+ .TP`
		`+ .B \-\-annotate\ \fISCHEMA`
		`+ Annotate the provided`
		`+ .I BINARY_FILE`
		`+ with the specified`
		`+ .I SCHEMA`
		`+ file.`
		`+ .TP`
		`+ .B \-\-no\-leak\-private\-annotation`
		`+ Prevents multiple type of annotations within a Fbs`
		`+ .I SCHEMA`
		`+ file.`
		`+ Currently this is required to generate private types in Rust.`
		`.SH EXAMPLES`
		`.EX`
		`.B flatc\ \-c\ \-b\ schema1.fbs\ schema2.fbs\ data.json`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (flatbuffers-2.0.8.tar.gz) = 005066ec08691fcc49e398ce29e07b3a92f12482d79933e027ab343ca44bc2ea9a0fd69690e98414363c1290640fe97c2a64fd98611464ac3fb62912fb91ce1b`
		`+ SHA512 (flatbuffers-22.10.26.tar.gz) = c0984fc4738516d0e4a1ddc66daf276b906d39239c4b70b14e194545d7fdeb3ce5ab34397309c16e916ff908a5483ab85283445394e5e14477259193c99ddf38`

music commented a year ago

The .so version changes due to the new versioning scheme, so this needs a devel list announcement with one week’s notice. There are no dependent packages.

1 new commit added