Juan Manuel Méndez Rey pushed to branch debian/latest at Debian Java Maintainers / scala3
Commits: f6ca74b4 by Juan Manuel Méndez Rey at 2026-10-29T17:30:09+01:00 d/patches: use upstream's comment in the sbt bridge patch - - - - - 1 changed file: - debian/patches/0007-sbt-bridge-compiler-interface-2.patch Changes: ===================================== debian/patches/0007-sbt-bridge-compiler-interface-2.patch ===================================== @@ -2,20 +2,22 @@ Description: sbt bridge: build against compiler-interface 2.x In compiler-interface 2.x, xsbti.VirtualFile extends HashedVirtualFileRef, which adds contentHashStr() and sizeBytes(). Implement them in the fallback virtual file; with 1.x they are plain methods. + Upstream's sizeBytes() uses SourceFile.textContent(), not in 3.9.0. Author: Juan Manuel Méndez Rey <[email protected]> Forwarded: https://github.com/scala/scala3/pull/27445 Applied-Upstream: https://github.com/scala/scala3/commit/80d19a8971a91ffd218c12d5e1cdbd36a075de27 Last-Update: 2026-10-29 --- diff --git a/sbt-bridge/src/dotty/tools/xsbt/FallbackVirtualFile.java b/sbt-bridge/src/dotty/tools/xsbt/FallbackVirtualFile.java -index 6fcb6ef7..3e77405e 100644 +index 6fcb6ef..bd200eb 100644 --- a/sbt-bridge/src/dotty/tools/xsbt/FallbackVirtualFile.java +++ b/sbt-bridge/src/dotty/tools/xsbt/FallbackVirtualFile.java -@@ -33,4 +33,13 @@ public class FallbackVirtualFile extends xsbti.BasicVirtualFileRef implements xs +@@ -33,4 +33,14 @@ public class FallbackVirtualFile extends xsbti.BasicVirtualFileRef implements xs return (long) murmurHash3; } -+ // xsbti.HashedVirtualFileRef (compiler-interface 2.x); plain methods for 1.x. ++ // Required by xsbti.HashedVirtualFileRef in compiler-interface 2.x. ++ // No @Override, so this still compiles against 1.x. + public String contentHashStr() { + return "murmur3-" + Long.toHexString(contentHash()); + } View it on GitLab: https://salsa.debian.org/java-team/scala3/-/commit/f6ca74b48e3c3f379a4b821f27b9739c567d28d4 -- View it on GitLab: https://salsa.debian.org/java-team/scala3/-/commit/f6ca74b48e3c3f379a4b821f27b9739c567d28d4 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

