Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java-gnome


Commits:
7053c11e by Emmanuel Bourg at 2026-10-20T12:08:32+02:00
Write typeMapping.properties in a reproducible order

- - - - -
2aabe674 by Emmanuel Bourg at 2026-10-20T12:08:32+02:00
Link the JNI library in a reproducible order

- - - - -
567c41df by Emmanuel Bourg at 2026-10-20T12:10:04+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/reproducible-link-order.patch
- + debian/patches/reproducible-type-mapping.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+java-gnome (4.1.3-12) unstable; urgency=medium
+
+  * Team upload.
+  * Write typeMapping.properties in a reproducible order
+  * Link the JNI library in a reproducible order
+
+ -- Emmanuel Bourg <[email protected]>  Tue, 20 Oct 2026 12:09:44 +0200
+
 java-gnome (4.1.3-11) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/reproducible-link-order.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Link the JNI library in a reproducible order
+ findFiles() returns the files in the directory order of os.walk(), which
+ varies from one build to the next and decides the order of the object files
+ on the link command line.
+Author: Emmanuel Bourg <[email protected]>
+Forwarded: no
+--- a/build/faster
++++ b/build/faster
+@@ -191,7 +191,8 @@
+ def findFiles(baseDir, ext):
+       result = []
+       for (root, dirs, files) in os.walk(baseDir):
+-              for file in files:
++              dirs.sort()
++              for file in sorted(files):
+                       if file.endswith(ext):
+                               result.append(join(root, file))
+       return result


=====================================
debian/patches/reproducible-type-mapping.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Write typeMapping.properties in a reproducible order
+ The .defs files are read in the directory order returned by File.listFiles(),
+ which varies from one build to the next.
+Author: Emmanuel Bourg <[email protected]>
+Forwarded: no
+--- a/src/generator/BindingsGenerator.java
++++ b/src/generator/BindingsGenerator.java
+@@ -25,6 +25,7 @@
+ import java.io.IOException;
+ import java.io.PrintWriter;
+ import java.util.ArrayList;
++import java.util.Arrays;
+ import java.util.Iterator;
+ import java.util.List;
+ 
+@@ -136,6 +137,7 @@
+                 }
+             }
+         });
++        Arrays.sort(files);
+ 
+         all = new ArrayList<DefsFile>(files.length);
+ 


=====================================
debian/patches/series
=====================================
@@ -8,3 +8,5 @@
 enchant_2.patch
 09_java17_compatibility.patch
 incompatible-pointer-types.patch
+reproducible-type-mapping.patch
+reproducible-link-order.patch



View it on GitLab: 
https://salsa.debian.org/java-team/java-gnome/-/compare/0eded99f0d761de05d7d316a6600b9295f1aefd4...567c41df8e68b7b40d2000896a1604eb89fd0b64

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/java-gnome/-/compare/0eded99f0d761de05d7d316a6600b9295f1aefd4...567c41df8e68b7b40d2000896a1604eb89fd0b64
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

Reply via email to