diff mbox series

[bug#63195] gnu: openjdk: Re-add "openjdk-15-xcursor-no-dynamic.patch".

Message ID 20230501011902.16708-1-dannym@scratchpost.org
State New
Headers show
Series [bug#63195] gnu: openjdk: Re-add "openjdk-15-xcursor-no-dynamic.patch". | expand

Commit Message

Danny Milosavljevic May 1, 2023, 1:19 a.m. UTC 
* gnu/packages/java.scm (openjdk16)[source](patches): Re-add xcursor patch.
(openjdk17)[source](patches): Re-add xcursor patch.
---
 gnu/packages/java.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Ludovic Courtès June 14, 2023, 9:22 p.m. UTC | #1 
Hi Danny,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> * gnu/packages/java.scm (openjdk16)[source](patches): Re-add xcursor patch.
> (openjdk17)[source](patches): Re-add xcursor patch.

Per <https://qa.guix.gnu.org/issue/63195>, it seems you can commit.

Please double-check bordeaux.guix.gnu.org still has up-to-date
substitutes before pushing.

Thanks,
Ludo’.
Danny Milosavljevic June 16, 2023, 11:39 p.m. UTC | #2 
Hi Ludo,

Thanks!

Committed those openjdk package changes to master
as commit 998d89ba20121e87664129890a805c91061baaa7.
diff mbox series

Patch

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 067284017c..dedae4e0fc 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1493,7 +1493,8 @@  (define-public openjdk16
                 "0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"
    (source (origin
              (inherit (package-source base))
-             (patches (search-patches "openjdk-10-setsignalhandler.patch"))))))
+             (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"
+                                      "openjdk-10-setsignalhandler.patch"))))))
 
 (define-public openjdk17
   (make-openjdk
@@ -1501,7 +1502,7 @@  (define-public openjdk17
    "1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs"
    (source (origin
              (inherit (package-source base))
-             (patches '())))
+             (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
    (arguments
     (substitute-keyword-arguments (package-arguments openjdk16)
       ((#:phases phases)