From afdcba78558bd7a33f517716e69bb9494297064d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 21 Feb 2024 10:26:24 +0100 Subject: gnu: jbr: Update to 17.0.10-b1211.2. * gnu/packages/java.scm (jbr): Update to 17.0.10-b1211.2. Change-Id: If08dc1f7d0c00f6ca2d2ebfb7daeca35cf3f665c --- gnu/packages/java.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a6d55aa358..00768388dc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1722,16 +1722,16 @@ (define-public jbr17 (package (inherit openjdk17) (name "jbr") - (version "17.0.7-b1020") + (version "17.0.10b1207.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") - (commit (string-append "jb" version)))) + (commit (string-append "jbr-release-" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0wh9xhqgcjk0jgvpvlvf78dy3r8m0vgqd0f54whpx0qqbmyavgdw")) + "1n9i07i243wrnnnvj05j81qhx3b5dry8y423pnbrrdn8fcwm1f2d")) (patches (search-patches "jbr-17-xcursor-no-dynamic.patch")))) (arguments (substitute-keyword-arguments (package-arguments openjdk17) -- cgit v1.2.3 From f93d86aaaf0eb0a85a3761e9303418319c67a470 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 23 Feb 2024 23:23:52 +0100 Subject: gnu: openjdk11: Fix ".so" file path patching. * gnu/packages/java.scm (openjdk11)[arguments]<#:phases>[patch-jni-libs]: Fix ".so" file path patching. Change-Id: If705ef237a2afe537af41227479cd2f91efe5ae2 --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 00768388dc..6be97eabbc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1298,10 +1298,10 @@ (define (icedtea-or-openjdk? path) (catch 'decoding-error (lambda () (substitute* file - (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" + (("VERSIONED_JNI_LIB_NAME\\(\"([^\"]*)\", \"([^\"]*)\"\\)" _ name version) (string-append "\"" (find-library name) "\"")) - (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) + (("JNI_LIB_NAME\\(\"([^\"]*)\"\\)" _ name) (string-append "\"" (find-library name) "\"")))) (lambda _ ;; Those are safe to skip. -- cgit v1.2.3 From c0f88cd18649c31c75bcddf8247b14ef3e3a66a5 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 24 Feb 2024 00:02:01 +0100 Subject: gnu: jbr21: Update to 21.0.2b375.1. * gnu/packages/java.scm (jbr21): Update to 21.0.2b375.1. Change-Id: Ib85e6cefcc7e2103f073cb460b0d75742594bd38 --- gnu/packages/java.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6be97eabbc..8be5d98a77 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -92,6 +92,7 @@ (define-module (gnu packages java) #:use-module (gnu packages kerberos) #:use-module (gnu packages security-token) #:use-module (gnu packages xml) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages texinfo) #:use-module ((srfi srfi-1) #:select (fold alist-delete)) @@ -1756,20 +1757,21 @@ (define-public jbr21 (package (inherit openjdk21) (name "jbr") - (version "21-b240.22") + (version "21.0.2b375.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") - (commit (string-append "jb" version)))) + (commit (string-append "jbr-release-" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1sx48mm5vap4ab1qr6hy25wlgxljmhvpvrqiqiq692izr8dh7j4c")) + "15rcwbch0xxzcgggc34lna9dwimwqsc0z4mvw5hd428414gz71iy")) (patches (search-patches "openjdk-21-fix-rpath.patch" "jbr-17-xcursor-no-dynamic.patch")))) (inputs `(("wayland" ,wayland) + ("libxkbcommon" ,libxkbcommon) ; for wayland ,@(package-inputs openjdk21))) (arguments (substitute-keyword-arguments (package-arguments openjdk21) -- cgit v1.2.3