From fbdf1b1bdb0aff34973de21f3353cb89e9be5cda Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 2 Jun 2026 18:27:39 +0200 Subject: [PATCH] Replace openjdk by coffeelibs-jdk again Signed-off-by: Armin Schrenk --- .github/workflows/debian.yml | 3 ++- dist/linux/debian/control | 2 +- dist/linux/debian/rules | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 6c2a0eb9f..602b44fa3 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -26,7 +26,7 @@ on: env: JAVA_DIST: 'temurin' JAVA_VERSION: '26.0.1+8' - DEB_BUILD_DEPENDS: 'debhelper (>=10), openjdk-25-jdk (>= 25+36), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1' + DEB_BUILD_DEPENDS: 'debhelper (>=10), coffeelibs-jdk-26 (>= 26.0.1+8-0ppa1), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1' OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/25.0.2/openjfx-25.0.2_linux-x64_bin-jmods.zip' OPENJFX_JMODS_AMD64_HASH: 'e0a9c29d8cf3af9b8b48848b43f87b5785bc107c53a951b19668ce05842bba1b' OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/25.0.2/openjfx-25.0.2_linux-aarch64_bin-jmods.zip' @@ -56,6 +56,7 @@ jobs: fi - name: Install build tools run: | + sudo add-apt-repository ppa:coffeelibs/openjdk sudo apt-get update sudo apt-get install devscripts dput sudo apt-get satisfy "${DEB_BUILD_DEPENDS}" diff --git a/dist/linux/debian/control b/dist/linux/debian/control index 713f03972..5d6535a4b 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -2,7 +2,7 @@ Source: cryptomator Maintainer: Cryptobot Section: utils Priority: optional -Build-Depends: debhelper (>=10), openjdk-25-jdk (>= 25+36), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1 +Build-Depends: debhelper (>=10), coffeelibs-jdk-26 (>= 26.0.1+8-0ppa1), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1 Standards-Version: 4.5.0 Homepage: https://cryptomator.org Vcs-Git: https://github.com/cryptomator/cryptomator.git diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 2c8266adc..d2acc4cd4 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -4,12 +4,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +JAVA_HOME = /usr/lib/jvm/java-26-coffeelibs DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifeq ($(DEB_BUILD_ARCH),amd64) -JAVA_HOME = /usr/lib/jvm/java-26-openjdk-amd64 JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods else ifeq ($(DEB_BUILD_ARCH),arm64) -JAVA_HOME = /usr/lib/jvm/java-26-openjdk-arm64 JMODS_PATH = jmods/aarch64:${JAVA_HOME}/jmods endif