[Git][java-team/procyon][master] 2 commits: d/p/04-java25-use-equals.patch: Fix Method instance comparison to resolve Java...

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / procyon


Commits:
492db61c by Vladimir Petko at 2026-02-10T13:44:55+13:00
d/p/04-java25-use-equals.patch: Fix Method instance comparison to resolve Java 25 ftbfs (Closes: #1108588).

- - - - -
739a06f8 by Vladimir Petko at 2026-02-10T13:45:32+13:00
changelog

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/04-java25-use-equals.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+procyon (0.6.0-4) UNRELEASED; urgency=medium
+
+  * d/p/04-java25-use-equals.patch: Fix Method instance comparison
+    to resolve Java 25 ftbfs (Closes: #1108588).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Tue, 10 Feb 2026 13:45:01 +1300
+
 procyon (0.6.0-3) unstable; urgency=medium
 
   [ Vladimir Petko ]


=====================================
debian/patches/04-java25-use-equals.patch
=====================================
@@ -0,0 +1,30 @@
+Description: fix: use equals() instead of == to compare Method
+  Building procyon with Java 25 results in the following failure:
+
+ com.strobel.reflection.SignatureTests > testSignatureOfGenericMethodInGenericDefinition FAILED
+    org.junit.ComparisonFailure: expected:<[<T:Ljava/lang/Object;>]([TT;)[TT;> but was:<[]([TT;)[TT;>
+        at org.junit.Assert.assertEquals(Assert.java:117)
+        at org.junit.Assert.assertEquals(Assert.java:146)
+        at com.strobel.reflection.SignatureTests.testSignatureOfGenericMethodInGenericDefinition(SignatureTests.java:71)
+ This is caused by == used instead of equals() to compare Method instances.
+ java.lang.reflect does not guarantee that Method instances are singletons.
+Author: Vladimir Petko <vladimir.petko at canonical.com>
+Origin: upstream, https://github.com/mstrobel/procyon/pull/84
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108588
+Last-Update: 2026-02-10
+
+diff --git a/Procyon.Reflection/src/main/java/com/strobel/reflection/MethodInfo.java b/Procyon.Reflection/src/main/java/com/strobel/reflection/MethodInfo.java
+index dbe846f5..64755b3d 100644
+--- a/Procyon.Reflection/src/main/java/com/strobel/reflection/MethodInfo.java
++++ b/Procyon.Reflection/src/main/java/com/strobel/reflection/MethodInfo.java
+@@ -727,7 +727,7 @@ class ReflectedMethod extends MethodInfo {
+                 final GenericParameter<?> gp = (GenericParameter<?>) p;
+                 final TypeVariable<?> typeVariable = gp.getRawTypeVariable();
+
+-                if (typeVariable.getGenericDeclaration() == rawMethod) {
++                if (typeVariable.getGenericDeclaration().equals(rawMethod)) {
+                     gp.setDeclaringMethod(this);
+
+                     if (genericParameters == null) {
+--
+2.51.0


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 02-cli-program-name.patch
 03-java21-disable-failing-tests.patch
+04-java25-use-equals.patch



View it on GitLab: https://salsa.debian.org/java-team/procyon/-/compare/c5b8aa18f0bcb7e3c496f493f2744f828520554a...739a06f818dcacd2a61716481ff5fcfb63f91572

-- 
View it on GitLab: https://salsa.debian.org/java-team/procyon/-/compare/c5b8aa18f0bcb7e3c496f493f2744f828520554a...739a06f818dcacd2a61716481ff5fcfb63f91572
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/20260210/60bb8f1e/attachment.htm>