From b1bfc9b622ea454936aad8bfbbe3873a0ee04841 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code@musicinmybrain.net>
Date: Mar 04 2023 15:24:39 +0000
Subject: Update to 23.3.3 (close RHBZ#2175405)


---

diff --git a/.gitignore b/.gitignore
index d31b4c9..e00c458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /flatbuffers-22.12.06.tar.gz
 /flatbuffers-23.1.4.tar.gz
 /flatbuffers-23.1.21.tar.gz
+/flatbuffers-23.3.3.tar.gz
diff --git a/7854.patch b/7854.patch
new file mode 100644
index 0000000..355f380
--- /dev/null
+++ b/7854.patch
@@ -0,0 +1,22 @@
+From 3ea1967505b4935e3de5ade53ff8f7bd481a15e6 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Sat, 4 Mar 2023 10:11:21 -0500
+Subject: [PATCH] Fix help output for --java-checkerframework
+
+---
+ src/flatc.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/flatc.cpp b/src/flatc.cpp
+index 31291a2544e..1cdfc3c16a5 100644
+--- a/src/flatc.cpp
++++ b/src/flatc.cpp
+@@ -117,7 +117,7 @@ const static FlatCOption flatc_options[] = {
+     "Add Clang _Nullable for C++ pointer. or @Nullable for Java" },
+   { "", "java-package-prefix", "",
+     "Add a prefix to the generated package name for Java." },
+-  { "", "java-checkerframe", "", "Add @Pure for Java." },
++  { "", "java-checkerframework", "", "Add @Pure for Java." },
+   { "", "gen-generated", "", "Add @Generated annotation for Java." },
+   { "", "gen-jvmstatic", "",
+     "Add @JvmStatic annotation for Kotlin methods in companion object for "
diff --git a/flatbuffers.spec b/flatbuffers.spec
index e225e8a..6cdb09d 100644
--- a/flatbuffers.spec
+++ b/flatbuffers.spec
@@ -12,12 +12,12 @@
 %bcond_with doc_pdf
 
 Name:           flatbuffers
-Version:        23.1.21
+Version:        23.3.3
 # The .so version is equal to the project version since upstream offers no ABI
 # stability guarantees. We manually repeat it here and and use the macro in the
 # file lists as a reminder to avoid undetected .so version bumps. See
 # https://github.com/google/flatbuffers/issues/7759.
-%global so_version 23.1.21
+%global so_version 23.3.3
 Release:        %autorelease
 Summary:        FlatBuffers: Memory Efficient Serialization Library
 
@@ -31,6 +31,10 @@ Source0:        https://github.com/google/flatbuffers/archive/v%{version}/%{name
 # Hand-written for Fedora in groff_man(7) format based on --help output
 Source1:        flatc.1
 
+# Fix help output for --java-checkerframework
+# https://github.com/google/flatbuffers/pull/7854
+Patch:          https://github.com/google/flatbuffers/pull/7854.patch
+
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
@@ -225,7 +229,7 @@ cp -p %SOURCE1 %{buildroot}%{_mandir}/man1/flatc.1
 
 
 %files
-%license LICENSE.txt
+%license LICENSE
 
 %{_libdir}/libflatbuffers.so.%{so_version}
 
@@ -245,7 +249,7 @@ cp -p %SOURCE1 %{buildroot}%{_mandir}/man1/flatc.1
 
 
 %files doc
-%license LICENSE.txt
+%license LICENSE
 %doc CHANGELOG.md
 %doc SECURITY.md
 %doc readme.md
@@ -259,7 +263,7 @@ cp -p %SOURCE1 %{buildroot}%{_mandir}/man1/flatc.1
 
 
 %files -n python3-flatbuffers -f %{pyproject_files}
-%license LICENSE.txt
+%license LICENSE
 
 
 %changelog
diff --git a/flatc.1 b/flatc.1
index 2570524..0e9fa90 100644
--- a/flatc.1
+++ b/flatc.1
@@ -165,6 +165,9 @@ or
 .B @Nullable
 for Java
 .TP
+.B \-\-java\-package\-prefix
+Add a prefix to the generated package name for Java.
+.TP
 .B \-\-java\-checkerframework
 Add
 .B @Pure
@@ -279,12 +282,6 @@ given a mismatched schema.
 .B \-\-size\-prefixed
 Input binaries are size prefixed buffers.
 .TP
-.B \-\-proto
-Input is a
-.BR .proto ,
-translate to
-.BR .fbs .
-.TP
 .B \-\-proto\-namespace\-suffix\ \fISUFFIX
 Add this namespace to any flatbuffers generated from protobufs.
 .TP
@@ -293,6 +290,26 @@ Translate
 .B .proto
 oneofs to flatbuffer unions.
 .TP
+.B \-\-keep\-proto\-id
+Keep protobuf field ids in generated fbs file.
+.TP
+.B \-\-proto\-id\-gap
+Action that should be taken when a gap between protobuf ids found.
+.IP
+.B Supported values:
+.RS +7n
+.IP \(bu 2n
+.B nop
+\(en do not care about gap
+.IP \(bu 2n
+.B warn
+\(en A warning message will be shown about the gap in protobuf ids
+.RI ( default )
+.IP \(bu 2n
+.B error
+\(en An error message will be shown and the fbs generation will be interrupted.
+.RE
+.TP
 .B \-\-grpc
 Generate GRPC interfaces for the specified languages.
 .TP
@@ -410,6 +427,9 @@ Generate entry point typescript per namespace.
 Implies
 .BR \-\-gen\-all .
 .TP
+.B \-\-annotate\-sparse\-vectors\ \fISCHEMA
+Don\(cqt annotate every vector element.
+.TP
 .B \-\-annotate\ \fISCHEMA
 Annotate the provided
 .I BINARY_FILE
diff --git a/sources b/sources
index eb8a5c0..3a10a18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flatbuffers-23.1.21.tar.gz) = fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
+SHA512 (flatbuffers-23.3.3.tar.gz) = 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0