Package: libprotobuf-java
Version: 3.21.12-3
Severity: important
Tags: patch
Dear Maintainer,
I am in the progress of updating one of my packages, genomicsdb. While doing
so, I stumbled upon an issue in the file
/usr/share/maven-repo/com/google/protobuf/protobuf-java-util/3.21.12/protobuf-java-util-debian.pom
that is shipped by libprotobuf-java. It requires the j2objc-annotations
artifact as one of its dependencies, although this is not available in Debian.
I suggest to enrich a bit the dedicated patch you wrote for src:protobuf in
order to move this dependency out of the way. Right now, the new upstream
version of genomicsdb cannot be built.
The enclosed patch does this.
I will be happy to give more information if needed.
Thanks for considering,
--
Pierre
diff -Nru protobuf-3.21.12/debian/patches/no_j2objc.patch
protobuf-3.21.12/debian/patches/no_j2objc.patch
--- protobuf-3.21.12/debian/patches/no_j2objc.patch 2022-03-11
01:28:07.000000000 +0100
+++ protobuf-3.21.12/debian/patches/no_j2objc.patch 2023-06-26
20:52:50.000000000 +0200
@@ -8,7 +8,7 @@
--- a/java/util/src/main/java/com/google/protobuf/util/Timestamps.java
+++ b/java/util/src/main/java/com/google/protobuf/util/Timestamps.java
-@@ -38,7 +38,7 @@ import static com.google.common.math.Lon
+@@ -38,7 +38,7 @@
//import com.google.errorprone.annotations.CanIgnoreReturnValue;
//import com.google.errorprone.annotations.CompileTimeConstant;
@@ -17,7 +17,7 @@
import com.google.protobuf.Duration;
import com.google.protobuf.Timestamp;
import java.io.Serializable;
-@@ -338,7 +338,6 @@ public final class Timestamps {
+@@ -338,7 +338,6 @@
* @throws IllegalArgumentException if the year is before 1 CE or after
9999 CE
*/
@SuppressWarnings("GoodTime") // this is a legacy conversion API
@@ -25,3 +25,19 @@
public static Timestamp fromDate(Date date) {
if (date instanceof java.sql.Timestamp) {
java.sql.Timestamp sqlTimestamp = (java.sql.Timestamp) date;
+--- a/java/util/pom.xml
++++ b/java/util/pom.xml
+@@ -27,11 +27,11 @@
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+- <dependency>
++ <!--<dependency>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>1.3</version>
+- </dependency>
++ </dependency>-->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
