2 Achegas ef54b685f6 ... 0a0dde3f47

Autor SHA1 Mensaxe Data
  Armin Schrenk 0a0dde3f47 [skip ci] coffeelibs jdk is built with JEP 493 hai 22 horas
  Armin Schrenk e27e303c01 [skip ci] use JDK 24 also for deb build hai 23 horas
Modificáronse 3 ficheiros con 6 adicións e 6 borrados
  1. 2 2
      .github/workflows/debian.yml
  2. 1 1
      dist/linux/debian/control
  3. 3 3
      dist/linux/debian/rules

+ 2 - 2
.github/workflows/debian.yml

@@ -18,8 +18,8 @@ on:
 env:
   JAVA_DIST: 'temurin'
   JAVA_VERSION: '24.0.1+9'
-  COFFEELIBS_JDK: 23
-  COFFEELIBS_JDK_VERSION: '23.0.2+7-0ppa1'
+  COFFEELIBS_JDK: 24
+  COFFEELIBS_JDK_VERSION: '24.0.1+9-0ppa2'
   OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/23.0.2/openjfx-23.0.2_linux-x64_bin-jmods.zip'
   OPENJFX_JMODS_AMD64_HASH: '063baebc6922e4a89c94b9dfb7a4f53e59e8d6fec400d4e670b31bc2ab324dec'
   OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/23.0.2/openjfx-23.0.2_linux-aarch64_bin-jmods.zip'

+ 1 - 1
dist/linux/debian/control

@@ -2,7 +2,7 @@ Source: cryptomator
 Maintainer: Cryptobot <releases@cryptomator.org>
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>=10), coffeelibs-jdk-23 (>= 23.0.2+7-0ppa1), libgtk-3-0,  libxxf86vm1, libgl1
+Build-Depends: debhelper (>=10), coffeelibs-jdk-24 (>= 24.0.1+9-0ppa1), libgtk-3-0,  libxxf86vm1, libgl1
 Standards-Version: 4.5.0
 Homepage: https://cryptomator.org
 Vcs-Git: https://github.com/cryptomator/cryptomator.git

+ 3 - 3
dist/linux/debian/rules

@@ -4,12 +4,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-JAVA_HOME = /usr/lib/jvm/java-23-coffeelibs
+JAVA_HOME = /usr/lib/jvm/java-24-coffeelibs
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(DEB_BUILD_ARCH),amd64)
-JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods
+JMODS_PATH = jmods/amd64
 else ifeq ($(DEB_BUILD_ARCH),arm64)
-JMODS_PATH = jmods/aarch64:${JAVA_HOME}/jmods
+JMODS_PATH = jmods/aarch64
 endif
 
 %: