guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.

commit 150c292077773b9b6fce10459f8c5ebe2ba95d4d
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Oct 23 11:57:44 2026 +0900

    gnu: Remove openjdk10.
    
    * gnu/packages/java.scm (openjdk10): Delete variable.
    * gnu/packages/patches/openjdk-10-classlist-reproducibility.patch
    * gnu/packages/patches/openjdk-10-corba-reproducibility.patch
    * gnu/packages/patches/openjdk-10-idlj-reproducibility.patch
    * gnu/packages/patches/openjdk-10-module-reproducibility.patch
    * gnu/packages/patches/openjdk-10-pointer-comparison.patch
    * gnu/local.mk (dist_patch_DATA): De-register above removed files.
---
 gnu/local.mk                                       |   5 -
 gnu/packages/java.scm                              | 100 -------
 .../openjdk-10-classlist-reproducibility.patch     |  27 --
 .../patches/openjdk-10-corba-reproducibility.patch |  12 -
 .../patches/openjdk-10-idlj-reproducibility.patch  |  36 ---
 .../openjdk-10-module-reproducibility.patch        | 305 ---------------------
 .../patches/openjdk-10-pointer-comparison.patch    |  14 -
 7 files changed, 499 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index af30baca657..aae25bfe74a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2119,15 +2119,10 @@ dist_patch_DATA =                                       
        \
   %D%/packages/patches/openjdk-9-module2-reproducibility.patch \
   %D%/packages/patches/openjdk-9-module3-reproducibility.patch \
   %D%/packages/patches/openjdk-10-char-reproducibility.patch   \
-  %D%/packages/patches/openjdk-10-classlist-reproducibility.patch      \
-  %D%/packages/patches/openjdk-10-corba-reproducibility.patch  \
-  %D%/packages/patches/openjdk-10-idlj-reproducibility.patch   \
   %D%/packages/patches/openjdk-10-jar-reproducibility.patch    \
   %D%/packages/patches/openjdk-10-jtask-reproducibility.patch  \
-  %D%/packages/patches/openjdk-10-module-reproducibility.patch \
   %D%/packages/patches/openjdk-10-module3-reproducibility.patch        \
   %D%/packages/patches/openjdk-10-module4-reproducibility.patch        \
-  %D%/packages/patches/openjdk-10-pointer-comparison.patch      \
   %D%/packages/patches/openjdk-10-setsignalhandler.patch        \
   %D%/packages/patches/openjdk-11-classlist-reproducibility.patch      \
   %D%/packages/patches/openjdk-13-classlist-reproducibility.patch      \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 327f6d8f392..740d02a4b30 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1095,106 +1095,6 @@ new Date();"))))
      "This package provides the Java development kit OpenJDK.")
     (license license:gpl2+)))
 
-(define-public openjdk10
-  (package
-    (inherit openjdk9)
-    (name "openjdk")
-    (version "10.46")
-    (source (origin
-              (method hg-fetch)
-              (uri (hg-reference (url "https://hg.openjdk.org/jdk/jdk";)
-                                 (changeset "jdk-10+46")))
-              (file-name (hg-file-name name version))
-              (modules '((guix build utils)))
-              (snippet `(begin
-                          (for-each delete-file
-                                    (find-files "." ".*.(bin|exe|jar)$"))))
-              (sha256
-               (base32
-                "0i47ar8lxzjrkkiwbzybfxs473390h4jq9ahm3xqdvy5zpchxy3y"))
-              (patches (search-patches
-                        "openjdk-10-char-reproducibility.patch"
-                        "openjdk-10-classlist-reproducibility.patch"
-                        "openjdk-10-corba-reproducibility.patch"
-                        "openjdk-10-idlj-reproducibility.patch"
-                        "openjdk-10-module-reproducibility.patch"
-                        "openjdk-10-module3-reproducibility.patch"
-                        "openjdk-10-module4-reproducibility.patch"
-                        "openjdk-10-jar-reproducibility.patch"
-                        "openjdk-10-jtask-reproducibility.patch"
-                        "openjdk-10-pointer-comparison.patch"
-                        "openjdk-10-setsignalhandler.patch"
-                        "openjdk-currency-time-bomb2.patch"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments openjdk9)
-       ((#:phases phases '%standard-phases)
-        #~(modify-phases #$phases
-            #$@(if (target-aarch64?)
-                   #~((replace 'patch-for-aarch64
-                        (lambda _
-                          (substitute* 
"src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp"
-                            ;; This line is duplicated, so remove both 
occurrences,
-                            ;; then add back one occurrence by substituting a
-                            ;; comment that occurs once.
-                            (("using MacroAssembler::call_VM_leaf_base;") "")
-                            (("Interpreter specific version of call_VM_base")
-                             (string-append "Interpreter specific version of 
call_VM_base\n"
-                                            "  using 
MacroAssembler::call_VM_leaf_base;"))))))
-                   #~())
-            (replace 'fix-java-shebangs
-              (lambda _
-                ;; This file was "fixed" by patch-source-shebangs, but it 
requires
-                ;; this exact first line.
-                (substitute* 
"make/data/blacklistedcertsconverter/blacklisted.certs.pem"
-                  (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n"))))
-            (add-after 'unpack 'remove-timestamping
-              (lambda _
-                (substitute* "./src/hotspot/share/runtime/vm_version.cpp"
-                  (("__DATE__") "")
-                  (("__TIME__") ""))))
-            (replace 'configure
-              (lambda* (#:key inputs #:allow-other-keys)
-                (invoke "bash" "./configure"
-                        ;; Add flags for compilation with gcc >= 10
-                        (string-append "--with-extra-cflags=-fcommon"
-                                       " -fno-delete-null-pointer-checks"
-                                       " -fno-lifetime-dse"
-                                       ;; flags for compilation with gcc >= 14.
-                                       " -Wno-error=int-conversion")
-                        (string-append "--with-freetype="
-                                       (assoc-ref inputs "freetype"))
-                        "--disable-freetype-bundling"
-                        "--disable-warnings-as-errors"
-                        "--disable-hotspot-gtest"
-                        "--with-giflib=system"
-                        "--with-libjpeg=system"
-                        "--with-native-debug-symbols=zipped"
-                        (string-append "--prefix=" #$output))))
-            (add-after 'unpack 'disable-warnings-as-errors
-              (lambda _
-                ;; It looks like the "--disable-warnings-as-errors" option of
-                ;; the 'configure' phase is not working.
-                (substitute* "make/autoconf/generated-configure.sh"
-                  (("-Werror") ""))))
-            #$@(if (target-x86-32?)
-                   ;; On i686 the C2 compiler sometimes crashes when importing
-                   ;; certificates.
-                   #~((add-before 'install-keystore 'disable-C2-compiler
-                        (lambda _ (setenv "_JAVA_OPTIONS" 
"-XX:TieredStopAtLevel=1"))))
-                   #~())))
-       ((#:disallowed-references refs '())
-        (cons* (this-package-native-input "openjdk")
-               (gexp-input (this-package-native-input "openjdk") "jdk")
-               refs))))
-    (native-inputs
-     (list gnu-make-4.2
-           openjdk9
-           `(,openjdk9 "jdk")
-           nss-certs
-           unzip
-           which
-           zip))))
-
 ;;; Note: The build of openjdk11 fails half of the time with a
 ;;; ConcurrentModificationException error, whether building in parallel or not
 ;;; (see: <https://codeberg.org/guix/guix/issues/10850>).
diff --git a/gnu/packages/patches/openjdk-10-classlist-reproducibility.patch 
b/gnu/packages/patches/openjdk-10-classlist-reproducibility.patch
deleted file mode 100644
index e1292ba82dc..00000000000
--- a/gnu/packages/patches/openjdk-10-classlist-reproducibility.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- orig/jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk 2022-04-04 
17:16:29.365930149 +0200
-+++ jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk      2022-04-04 
17:16:54.954624358 +0200
-@@ -61,11 +61,12 @@
-       $(call MakeDir, $(LINK_OPT_DIR))
-       $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
-       $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, 
$(JLI_TRACE_FILE)))
--      $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@ \
-+      $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:[email protected] 
\
-           -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
-           -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-           build.tools.classlist.HelloClasslist \
-           $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
-+      sort [email protected] > $@
- 
- # The jli trace is created by the same recipe as classlist. By declaring these
- # dependencies, make will correctly rebuild both jli trace and classlist
---- orig/jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk        
2022-04-13 19:24:10.191682716 +0200
-+++ jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk     2022-04-13 
20:58:57.891368216 +0200
-@@ -83,6 +83,8 @@
-           $(CT_MODULESOURCEPATH) \
-           $(CT_MODULES) \
-           >$(@D)/A/system-modules
-+      # Make files reproducible
-+      find $(@D) -exec $(TOUCH) -h -c -t 197001010000.01 {} \;
-       $(TOUCH) $@
- 
- # Can't generate ct.sym directly into modules libs as the SetupJarArchive 
macro
diff --git a/gnu/packages/patches/openjdk-10-corba-reproducibility.patch 
b/gnu/packages/patches/openjdk-10-corba-reproducibility.patch
deleted file mode 100644
index bd5ce1fd2bd..00000000000
--- a/gnu/packages/patches/openjdk-10-corba-reproducibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Danny
---- orig/jdk-6fa770f9f8ab/make/corba/src/classes/build/tools/logutil/MC.java   
2022-04-13 19:24:10.111680549 +0200
-+++ jdk-6fa770f9f8ab/make/corba/src/classes/build/tools/logutil/MC.java        
2022-04-13 22:51:13.399462259 +0200
-@@ -154,7 +154,7 @@
-                   groupName);
-     pw.println("//");
-     pw.printMsg("// Generated by MC.java version @, DO NOT EDIT BY HAND!", 
VERSION);
--    pw.printMsg("// Generated from input file @ on @", inFile, new Date());
-+    pw.printMsg("// Generated from input file @ on @", inFile, 
System.getenv("SOURCE_DATE_EPOCH") == null ? new Date() : new Date(1000 * 
Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))));
-     pw.println();
-   }
- 
diff --git a/gnu/packages/patches/openjdk-10-idlj-reproducibility.patch 
b/gnu/packages/patches/openjdk-10-idlj-reproducibility.patch
deleted file mode 100644
index b29a06f2724..00000000000
--- a/gnu/packages/patches/openjdk-10-idlj-reproducibility.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a0a0c6a43b88d946f2b5484892cf0209bd7c0e68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <[email protected]>
-Date: Sat, 8 Dec 2018 21:25:31 +0100
-Subject: [PATCH] Make idlj respect SOURCE_DATE_EPOCH.
-
----
- .../sun/tools/corba/se/idl/toJavaPortable/Util.java | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git 
a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
 
b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
-index 7397619f2..583d6b8e4 100644
---- 
a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
-+++ 
b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
-@@ -1146,7 +1146,18 @@ public class Util extends 
com.sun.tools.corba.se.idl.Util
-     else
-       formatter.setTimeZone (java.util.TimeZone.getDefault ());
- 
--    stream.println ("* " + formatter.format (new Date ()));
-+    try {
-+      String epoch = System.getenv("SOURCE_DATE_EPOCH");
-+      if(epoch != null) {
-+          long unixTime = Long.parseLong(epoch);
-+          stream.println ("* " + formatter.format (new Date 
(unixTime*1000L)));
-+      } else {
-+          stream.println ("* " + formatter.format (new Date ()));
-+      }
-+    } catch (Exception e) {
-+      //in case of error fall back to default
-+      stream.println ("* " + formatter.format (new Date ()));
-+    }
- 
-     // <daz>
-     ///////////////
--- 
-2.19.2
-
diff --git a/gnu/packages/patches/openjdk-10-module-reproducibility.patch 
b/gnu/packages/patches/openjdk-10-module-reproducibility.patch
deleted file mode 100644
index 165edd3b4a9..00000000000
--- a/gnu/packages/patches/openjdk-10-module-reproducibility.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-From a52c4ef44c0553a399a8a47e528db92e3bf51c6c Mon Sep 17 00:00:00 2001
-From: Alan Bateman <[email protected]>
-Date: Wed, 29 Apr 2020 08:38:28 +0100
-Subject: [PATCH] 8243666: ModuleHashes attribute generated for JMOD and JAR
- files depends on timestamps
-
-Reviewed-by: mchung
----
-
---- 
orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
     2022-04-13 19:24:10.655695284 +0200
-+++ 
jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
  2022-04-14 02:43:48.610326492 +0200
-@@ -27,9 +27,8 @@
- 
- import java.io.PrintStream;
- import java.lang.module.Configuration;
-+import java.lang.module.ModuleReference;
- import java.lang.module.ResolvedModule;
--import java.net.URI;
--import java.nio.file.Path;
- import java.nio.file.Paths;
- import java.util.ArrayDeque;
- import java.util.Collections;
-@@ -39,8 +38,8 @@
- import java.util.LinkedList;
- import java.util.Map;
- import java.util.Set;
-+import java.util.TreeMap;
- import java.util.function.Consumer;
--import java.util.function.Function;
- import java.util.stream.Stream;
- import static java.util.stream.Collectors.*;
- 
-@@ -101,7 +100,7 @@
-         // the modules to record the hashes - it is the first matching
-         // module and has not been hashed during the traversal.
-         Set<String> mods = new HashSet<>();
--        Map<String, ModuleHashes> hashes = new HashMap<>();
-+        Map<String, ModuleHashes> hashes = new TreeMap<>();
-         builder.build()
-                .orderedNodes()
-                .filter(mn -> roots.contains(mn) && !mods.contains(mn))
-@@ -116,27 +115,17 @@
-                    mods.addAll(ns);
- 
-                    if (!ns.isEmpty()) {
--                       Map<String, Path> moduleToPath = ns.stream()
--                           .collect(toMap(Function.identity(), 
this::moduleToPath));
--                       hashes.put(mn, ModuleHashes.generate(moduleToPath, 
"SHA-256"));
-+                       Set<ModuleReference> mrefs = ns.stream()
-+                               .map(name -> configuration.findModule(name)
-+                                                         
.orElseThrow(InternalError::new))
-+                               .map(ResolvedModule::reference)
-+                               .collect(toSet());
-+                       hashes.put(mn, ModuleHashes.generate(mrefs, 
"SHA-256"));
-                    }
-                });
-         return hashes;
-     }
- 
--    private Path moduleToPath(String name) {
--        ResolvedModule rm = configuration.findModule(name).orElseThrow(
--            () -> new InternalError("Selected module " + name + " not on 
module path"));
--
--        URI uri = rm.reference().location().get();
--        Path path = Paths.get(uri);
--        String fn = path.getFileName().toString();
--        if (!fn.endsWith(".jar") && !fn.endsWith(".jmod")) {
--            throw new UnsupportedOperationException(path + " is not a modular 
JAR or jmod file");
--        }
--        return path;
--    }
--
-     /*
-      * Utility class
-      */diff -ru 
orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java
 
jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java
---- 
orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java
    1970-01-01 01:00:01.000000000 +0100
-+++ 
jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java
 2022-04-12 16:58:05.639985936 +0200
-@@ -26,17 +26,21 @@
- package jdk.internal.module;
- 
- import java.io.IOException;
-+import java.io.InputStream;
- import java.io.UncheckedIOException;
--import java.nio.ByteBuffer;
--import java.nio.channels.FileChannel;
--import java.nio.file.Path;
-+import java.lang.module.ModuleReader;
-+import java.lang.module.ModuleReference;
-+import java.nio.charset.StandardCharsets;
- import java.security.MessageDigest;
- import java.security.NoSuchAlgorithmException;
-+import java.util.Arrays;
- import java.util.Collections;
- import java.util.HashMap;
- import java.util.Map;
- import java.util.Objects;
- import java.util.Set;
-+import java.util.TreeMap;
-+import java.util.function.Supplier;
- 
- /**
-  * The result of hashing the contents of a number of module artifacts.
-@@ -60,8 +64,8 @@
-      * @param algorithm   the algorithm used to create the hashes
-      * @param nameToHash  the map of module name to hash value
-      */
--    public ModuleHashes(String algorithm, Map<String, byte[]> nameToHash) {
--        this.algorithm = algorithm;
-+    ModuleHashes(String algorithm, Map<String, byte[]> nameToHash) {
-+        this.algorithm = Objects.requireNonNull(algorithm);
-         this.nameToHash = Collections.unmodifiableMap(nameToHash);
-     }
- 
-@@ -95,54 +99,125 @@
-     }
- 
-     /**
--     * Computes the hash for the given file with the given message digest
--     * algorithm.
-+     * Computes a hash from the names and content of a module.
-      *
-+     * @param reader the module reader to access the module content
-+     * @param algorithm the name of the message digest algorithm to use
-+     * @return the hash
-+     * @throws IllegalArgumentException if digest algorithm is not supported
-      * @throws UncheckedIOException if an I/O error occurs
-      * @throws RuntimeException if the algorithm is not available
-      */
--    public static byte[] computeHash(Path file, String algorithm) {
-+    private static byte[] computeHash(ModuleReader reader, String algorithm) {
-+        MessageDigest md;
-         try {
--            MessageDigest md = MessageDigest.getInstance(algorithm);
--
--            // Ideally we would just mmap the file but this consumes too much
--            // memory when jlink is running concurrently on very large jmods
--            try (FileChannel fc = FileChannel.open(file)) {
--                ByteBuffer bb = ByteBuffer.allocate(32*1024);
--                while (fc.read(bb) > 0) {
--                    bb.flip();
--                    md.update(bb);
--                    assert bb.remaining() == 0;
--                    bb.clear();
--                }
--            }
--
--            return md.digest();
-+            md = MessageDigest.getInstance(algorithm);
-         } catch (NoSuchAlgorithmException e) {
--            throw new RuntimeException(e);
-+            throw new IllegalArgumentException(e);
-+        }
-+        try {
-+            byte[] buf = new byte[32*1024];
-+            reader.list().sorted().forEach(rn -> {
-+                md.update(rn.getBytes(StandardCharsets.UTF_8));
-+                try (InputStream in = 
reader.open(rn).orElseThrow(java.util.NoSuchElementException::new)) {
-+                    int n;
-+                    while ((n = in.read(buf)) > 0) {
-+                        md.update(buf, 0, n);
-+                    }
-+                } catch (IOException ioe) {
-+                    throw new UncheckedIOException(ioe);
-+                }
-+            });
-         } catch (IOException ioe) {
-             throw new UncheckedIOException(ioe);
-         }
-+        return md.digest();
-     }
- 
-     /**
--     * Computes the hash for every entry in the given map, returning a
--     * {@code ModuleHashes} to encapsulate the result. The map key is
--     * the entry name, typically the module name. The map value is the file
--     * path to the entry (module artifact).
-+     * Computes a hash from the names and content of a module.
-      *
-+     * @param supplier supplies the module reader to access the module content
-+     * @param algorithm the name of the message digest algorithm to use
-+     * @return the hash
-+     * @throws IllegalArgumentException if digest algorithm is not supported
-+     * @throws UncheckedIOException if an I/O error occurs
-+     */
-+    static byte[] computeHash(Supplier<ModuleReader> supplier, String 
algorithm) {
-+        try (ModuleReader reader = supplier.get()) {
-+            return computeHash(reader, algorithm);
-+        } catch (IOException ioe) {
-+            throw new UncheckedIOException(ioe);
-+        }
-+    }
-+
-+    /**
-+     * Computes the hash from the names and content of a set of modules. 
Returns
-+     * a {@code ModuleHashes} to encapsulate the result.
-+     * @param mrefs the set of modules
-+     * @param algorithm the name of the message digest algorithm to use
-      * @return ModuleHashes that encapsulates the hashes
-+     * @throws IllegalArgumentException if digest algorithm is not supported
-+     * @throws UncheckedIOException if an I/O error occurs
-      */
--    public static ModuleHashes generate(Map<String, Path> map, String 
algorithm) {
-+    static ModuleHashes generate(Set<ModuleReference> mrefs, String 
algorithm) {
-         Map<String, byte[]> nameToHash = new HashMap<>();
--        for (Map.Entry<String, Path> entry: map.entrySet()) {
--            String name = entry.getKey();
--            Path path = entry.getValue();
--            nameToHash.put(name, computeHash(path, algorithm));
-+        for (ModuleReference mref : mrefs) {
-+            try (ModuleReader reader = mref.open()) {
-+                byte[] hash = computeHash(reader, algorithm);
-+                nameToHash.put(mref.descriptor().name(), hash);
-+            } catch (IOException ioe) {
-+                throw new UncheckedIOException(ioe);
-+            }
-         }
-         return new ModuleHashes(algorithm, nameToHash);
-     }
- 
-+    @Override
-+    public int hashCode() {
-+        int h = algorithm.hashCode();
-+        for (Map.Entry<String, byte[]> e : nameToHash.entrySet()) {
-+            h = h * 31 + e.getKey().hashCode();
-+            h = h * 31 + Arrays.hashCode(e.getValue());
-+        }
-+        return h;
-+    }
-+
-+    @Override
-+    public boolean equals(Object obj) {
-+        if (!(obj instanceof ModuleHashes))
-+            return false;
-+        ModuleHashes other = (ModuleHashes) obj;
-+        if (!algorithm.equals(other.algorithm)
-+                || nameToHash.size() != other.nameToHash.size())
-+            return false;
-+        for (Map.Entry<String, byte[]> e : nameToHash.entrySet()) {
-+            String name = e.getKey();
-+            byte[] hash = e.getValue();
-+            if (!Arrays.equals(hash, other.nameToHash.get(name)))
-+                return false;
-+        }
-+        return true;
-+    }
-+
-+    @Override
-+    public String toString() {
-+        StringBuilder sb = new StringBuilder(algorithm);
-+        sb.append(" ");
-+        nameToHash.entrySet()
-+                .stream()
-+                .sorted(Map.Entry.comparingByKey())
-+                .forEach(e -> {
-+                    sb.append(e.getKey());
-+                    sb.append("=");
-+                    byte[] ba = e.getValue();
-+                    for (byte b : ba) {
-+                        sb.append(String.format("%02x", b & 0xff));
-+                    }
-+                });
-+        return sb.toString();
-+    }
-+
-     /**
-      * This is used by jdk.internal.module.SystemModules class
-      * generated at link time.
-diff -ru 
orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
 
jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
---- 
orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
      1970-01-01 01:00:01.000000000 +0100
-+++ 
jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
   2022-04-12 16:43:12.967868689 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights 
reserved.
-+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights 
reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-diff -ru 
orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java
 
jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java
---- 
orig/jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java
        1970-01-01 01:00:01.000000000 +0100
-+++ 
jdk-3cc80be736f2/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java
     2022-04-12 16:43:12.971868797 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights 
reserved.
-+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights 
reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -95,7 +95,7 @@
-                                         Path file) {
-         URI uri = file.toUri();
-         Supplier<ModuleReader> supplier = () -> new JarModuleReader(file, 
uri);
--        HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a);
-+        HashSupplier hasher = (a) -> ModuleHashes.computeHash(supplier, a);
-         return newModule(attrs, uri, supplier, patcher, hasher);
-     }
- 
-@@ -105,7 +105,7 @@
-     static ModuleReference newJModModule(ModuleInfo.Attributes attrs, Path 
file) {
-         URI uri = file.toUri();
-         Supplier<ModuleReader> supplier = () -> new JModModuleReader(file, 
uri);
--        HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a);
-+        HashSupplier hasher = (a) -> ModuleHashes.computeHash(supplier, a);
-         return newModule(attrs, uri, supplier, null, hasher);
-     }
- 
diff --git a/gnu/packages/patches/openjdk-10-pointer-comparison.patch 
b/gnu/packages/patches/openjdk-10-pointer-comparison.patch
deleted file mode 100644
index 9c09f8e3914..00000000000
--- a/gnu/packages/patches/openjdk-10-pointer-comparison.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Patch inspired by file comparison with openjdk@19.
-
-diff -u -r openjdk-10.alt/src/hotspot/os/linux/os_linux.cpp 
openjdk-10/src/hotspot/os/linux/os_linux.cpp
---- openjdk-10.alt/src/hotspot/os/linux/os_linux.cpp   2023-04-05 
15:02:56.994779480 +0200
-+++ openjdk-10/src/hotspot/os/linux/os_linux.cpp       2023-04-05 
15:07:47.267537301 +0200
-@@ -2155,7 +2155,7 @@
-     }
- 
-     p = OSContainer::cpu_cpuset_memory_nodes();
--    if (p < 0)
-+    if (p == NULL)
-       st->print("cpu_memory_nodes() failed\n");
-     else {
-       st->print("cpu_memory_nodes: %s\n", p);

Reply via email to