From 722fa6daf0d24dd98932c626744068b12e3e2ee2 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 29 Jun 2023 15:58:33 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.graphhopper.maps.yml            | 14 +++++++-------
 metadata/net.slions.fulguris.full.fdroid.yml |  2 ++
 metadata/org.cimbar.camerafilecopy.yml       |  1 +
 metadata/xdsopl.robot36.yml                  |  3 ++-
 metadata/xyz.apiote.bimba.czwek.yml          |  4 ++++
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/metadata/com.graphhopper.maps.yml b/metadata/com.graphhopper.maps.yml
index 8f540098f8..49f03bb783 100644
--- a/metadata/com.graphhopper.maps.yml
+++ b/metadata/com.graphhopper.maps.yml
@@ -158,14 +158,14 @@ Builds:
     submodules: true
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
-      - curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
-      - apt-get install -y nodejs
-    init:
-      - cd ../..
-      - cp config.js graphhopper-maps/
-      - cd graphhopper-maps
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.20.1/node-v16.20.1-linux-x64.tar.gz
+      - echo "c76d2aabd2d02542505fd24e18876fb8515e23638531249277272def42ab54e3 node.tar.gz"
+        | sha256sum -c -
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+    prebuild:
+      - cd ../../graphhopper-maps
+      - cp ../config.js ./
       - npm install
-      - sed -i -e 's/gitSHA\ =/gitSHA\ ="1"\/\//g' webpack.common.js
       - npm run build
       - mv dist/bundle.*.js dist/bundle.js
       - cd ..
diff --git a/metadata/net.slions.fulguris.full.fdroid.yml b/metadata/net.slions.fulguris.full.fdroid.yml
index dfcf2cd983..3db28805d9 100644
--- a/metadata/net.slions.fulguris.full.fdroid.yml
+++ b/metadata/net.slions.fulguris.full.fdroid.yml
@@ -109,6 +109,8 @@ Builds:
       - full
       - fdroid
     prebuild: sed -i -e '/firebase/d' ../build.gradle
+    scandelete:
+      - app/src/main/jniLibs
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/org.cimbar.camerafilecopy.yml b/metadata/org.cimbar.camerafilecopy.yml
index 5988666038..9914afd720 100644
--- a/metadata/org.cimbar.camerafilecopy.yml
+++ b/metadata/org.cimbar.camerafilecopy.yml
@@ -70,6 +70,7 @@ Builds:
 
   - versionName: 0.5.13
     versionCode: 9
+    disable: https://github.com/sz3/cfc/issues/20
     commit: a7190cefe536cd010245b23908a4be08e5b92406
     subdir: app
     sudo:
diff --git a/metadata/xdsopl.robot36.yml b/metadata/xdsopl.robot36.yml
index 809cd31619..ff6a1775b9 100644
--- a/metadata/xdsopl.robot36.yml
+++ b/metadata/xdsopl.robot36.yml
@@ -43,7 +43,8 @@ Builds:
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y libncurses5
+      - apt-get install -y libncurses5 openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/xyz.apiote.bimba.czwek.yml b/metadata/xyz.apiote.bimba.czwek.yml
index fd940d24a6..feecb11f13 100644
--- a/metadata/xyz.apiote.bimba.czwek.yml
+++ b/metadata/xyz.apiote.bimba.czwek.yml
@@ -26,6 +26,10 @@ Builds:
     versionCode: 22
     commit: c6594b28ee7bff7c8c338de68a7fa9fa6209f63f
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes