diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 8698d58ab..c69a460f1 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -111,12 +111,6 @@ jobs: ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/Cryptomator.desktop ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun - - name: Extract libjffi.so # workaround for https://github.com/cryptomator/cryptomator-linux/issues/27 - run: | - JFFI_NATIVE_JAR=`ls lib/app/ | grep -e 'jffi-[1-9]\.[0-9]\{1,2\}.[0-9]\{1,2\}-native.jar'` - ${JAVA_HOME}/bin/jar -xf lib/app/${JFFI_NATIVE_JAR} /jni/x86_64-Linux/ - mv jni/x86_64-Linux/* lib/app/libjffi.so - working-directory: Cryptomator.AppDir - name: Download AppImageKit run: | curl -L https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage -o appimagetool.AppImage diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 47549b76f..c4d67319d 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -65,10 +65,10 @@ jobs: unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64 - name: Ensure major jfx version in pom and in jmods is the same run: | - JMOD_VERSION_AMD64=$(jmod describe ${JAVA_HOME}/jmods/amd64/javafx.base.jmod | head -1) + JMOD_VERSION_AMD64=$(jmod describe jmods/amd64/javafx.base.jmod | head -1) JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64#*@} JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64%%.*} - JMOD_VERSION_AARCH64=$(jmod describe ${JAVA_HOME}/jmods/aarch64/javafx.base.jmod | head -1) + JMOD_VERSION_AARCH64=$(jmod describe jmods/aarch64/javafx.base.jmod | head -1) JMOD_VERSION_AARCH64=${JMOD_VERSION_AARCH64#*@} JMOD_VERSION_AARCH64=${JMOD_VERSION_AARCH64%%.*} POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 7fc9f04a8..a98529bc7 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -43,6 +43,8 @@ ${JAVA_HOME}/bin/jpackage \ --dest appdir \ --name Cryptomator \ --vendor "Skymatic GmbH" \ + --java-options "--enable-preview" \ + --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \ --copyright "(C) 2016 - 2023 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ diff --git a/dist/linux/debian/control b/dist/linux/debian/control index 92c91fdeb..dd4809950 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -12,7 +12,7 @@ Package: cryptomator Architecture: any Section: utils Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse2, xdg-utils, libjffi-jni, libffi7 +Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse3-3 Recommends: gvfs-backends, gvfs-fuse, gnome-keyring XB-AppName: Cryptomator XB-Category: Utility;Security;FileTools; diff --git a/dist/linux/debian/cryptomator.install b/dist/linux/debian/cryptomator.install index d3ff8cf1f..62a1f3f15 100644 --- a/dist/linux/debian/cryptomator.install +++ b/dist/linux/debian/cryptomator.install @@ -1,5 +1,4 @@ cryptomator usr/lib -debian/cryptomator.sh usr/lib/cryptomator/bin common/org.cryptomator.Cryptomator.desktop usr/share/applications common/org.cryptomator.Cryptomator.svg usr/share/icons/hicolor/scalable/apps common/org.cryptomator.Cryptomator256.png usr/share/icons/hicolor/256x256/apps diff --git a/dist/linux/debian/cryptomator.links b/dist/linux/debian/cryptomator.links index 8cc4cd0d4..12e37bd0a 100644 --- a/dist/linux/debian/cryptomator.links +++ b/dist/linux/debian/cryptomator.links @@ -1 +1 @@ -usr/lib/cryptomator/bin/cryptomator.sh usr/bin/cryptomator +usr/lib/cryptomator/bin/cryptomator usr/bin/cryptomator diff --git a/dist/linux/debian/cryptomator.sh b/dist/linux/debian/cryptomator.sh deleted file mode 100644 index e79855a03..000000000 --- a/dist/linux/debian/cryptomator.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# fix for https://github.com/cryptomator/cryptomator/issues/1370 -export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/jni/libjffi-1.2.so:/usr/lib/x86_64-linux-gnu/libffi.so.7.1.0 - -/usr/lib/cryptomator/bin/cryptomator $@ \ No newline at end of file diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 9c693d8e0..be1014ea9 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -42,6 +42,8 @@ override_dh_auto_build: --dest . \ --name cryptomator \ --vendor "Skymatic GmbH" \ + --java-options "--enable-preview" \ + --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \ --copyright "(C) 2016 - 2023 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ @@ -58,10 +60,3 @@ override_dh_auto_build: --app-version "${VERSION_NUM}.${REVISION_NUM}" \ --resource-dir resources \ --verbose - -override_dh_fixperms: - dh_fixperms - chmod +x debian/cryptomator/usr/lib/cryptomator/bin/cryptomator.sh - -# override_dh_strip: - # no-op