[Git][java-team/grpc-java][master] 2 commits: Add patch to enable build with protobuf 3.21

[Olek Wojnar (@olek)]

Olek Wojnar pushed to branch master at Debian Java Maintainers / grpc-java


Commits:
b8e9c19b by Olek Wojnar at 2022-11-23T19:13:16-05:00
Add patch to enable build with protobuf 3.21

- - - - -
48afc243 by Olek Wojnar at 2022-11-23T19:18:40-05:00
Refresh packaging

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/grpc-java_protobuf.patch
- debian/patches/series
- debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+grpc-java (1.26.0+ds-2) unstable; urgency=high
+
+  * Add patch to enable build with protobuf 3.21 (Closes: #1023500)
+    - Thanks to László Böszörményi
+  * Update d/watch for GitHub URL changes
+  * Update standards to 4.6.1 (no changes)
+
+ -- Olek Wojnar <olek at debian.org>  Wed, 23 Nov 2022 19:17:29 -0500
+
 grpc-java (1.26.0+ds-1) unstable; urgency=high
 
   * New upstream version (Closes: #976487)


=====================================
debian/control
=====================================
@@ -43,7 +43,7 @@ Build-Depends: debhelper-compat (= 13),
                ruby-rspec,
                ruby-simplecov,
                zlib1g-dev,
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/java-team/grpc-java
 Vcs-Git: https://salsa.debian.org/java-team/grpc-java.git


=====================================
debian/copyright
=====================================
@@ -21,7 +21,7 @@ Copyright: 2016-2018 Envoy Project Authors
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2020 Olek Wojnar <olek at debian.org>
+Copyright: 2020-2022 Olek Wojnar <olek at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/patches/grpc-java_protobuf.patch
=====================================
@@ -0,0 +1,19 @@
+Description: protobuf header rename
+ Use the new header name for ProtoBuf 3.26+ (cherry-picked from upstream)
+Author: Laszlo Boszormenyi (GCS) <gcs at debian.org>
+Forwarded: not-needed
+Last-Update: 2022-10-04
+
+---
+
+--- a/compiler/src/java_plugin/cpp/java_generator.cpp
++++ b/compiler/src/java_plugin/cpp/java_generator.cpp
+@@ -22,7 +22,7 @@
+ #include <map>
+ #include <set>
+ #include <vector>
+-#include <google/protobuf/compiler/java/java_names.h>
++#include <google/protobuf/compiler/java/names.h>
+ #include <google/protobuf/descriptor.h>
+ #include <google/protobuf/descriptor.pb.h>
+ #include <google/protobuf/io/printer.h>


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ python3.patch
 fix-gradle-build.patch
 build-plugin.patch
 remove-android-annotations.patch
+grpc-java_protobuf.patch


=====================================
debian/upstream/metadata
=====================================
@@ -1,6 +1,5 @@
 Bug-Database: https://github.com/grpc/grpc-java/issues
 Bug-Submit: https://github.com/grpc/grpc-java/issues/new
 Documentation: https://grpc.io/docs/
-Homepage: https://grpc.io
 Repository: https://github.com/grpc/grpc-java
 Repository-Browse: https://github.com/grpc/grpc-java


=====================================
debian/watch
=====================================
@@ -1,5 +1,5 @@
 version=4
 
 opts="repack, repacksuffix=+ds, dversionmangle=s/\+ds\d*$//" \
-  https://github.com/grpc/grpc-java/releases?after=v1.30.1 \
-  .*/grpc-java/archive/v(\d[\d\.]*)\.tar\.gz debian uupdate
+  https://github.com/grpc/grpc-java/tags?after=v1.29.0 \
+  .*/v(\d[\d\.]*)\.tar\.gz debian



View it on GitLab: https://salsa.debian.org/java-team/grpc-java/-/compare/f11f2ad2a7f51517c20e65402858bdf3db3458bb...48afc243343f16db8313aaf0aaadb586ecba83fd

-- 
View it on GitLab: https://salsa.debian.org/java-team/grpc-java/-/compare/f11f2ad2a7f51517c20e65402858bdf3db3458bb...48afc243343f16db8313aaf0aaadb586ecba83fd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20221124/3f842ded/attachment.htm>