misc fixes

metadata/com.atharok.barcodescanner.yml

@@ -41,10 +41,6 @@ Builds:
     versionCode: 8
     commit: bc13f0c53df61d6f7b37bb929279110f90a36e23
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 

metadata/com.foobnix.pro.pdf.reader.yml

@@ -257,40 +257,6 @@ Builds:
       - ./link_to_mupdf_1.20.2.sh
     ndk: r23c
 
-  - versionName: 8.8.1-fdroid
-    versionCode: 4842
-    disable: https://github.com/foobnix/LibreraReader/issues/960
-    commit: 99af91393db21b271370188dc68fd93f15d4b2a2
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y g++ mesa-common-dev libxcursor-dev libxrandr-dev libxinerama-dev
-        libglu1-mesa-dev libxi-dev
-    gradle:
-      - fdroid
-    srclibs:
-      - MuPDF@b674dde6af4db9307575374eb4e634aa66fe046d
-    rm:
-      - Builder/libs
-    prebuild:
-      - sed -i -e '/F-DROID REMOVE THIS LINE/,+1d' ../build.gradle
-      - sed -i -e '/^if.*Fdroid/,/^}/d' -e '/enable true/d' build.gradle
-      - mkdir src/main/jniLibs
-      - cd ../Builder
-      - sed -i -e '/^#!/a\set -e' -e '/git clone/d' -e '/mkdir mupdf/d' -e 's|.*ndk-build|$$NDK$$/ndk-build
-        -j`nproc`|' ../Builder/link_to_mupdf_master.sh ../Builder/link_to_mupdf_1.11.sh
-      - cp -r $$MuPDF$$ mupdf-master
-      - cp -r $$MuPDF$$ mupdf-1.11
-      - cd mupdf-1.11
-      - git checkout 1.11
-    scanignore:
-      - Builder/fonts/fonts.zip
-      - app/src/fdroid/assets/fonts.zip
-    build:
-      - pushd ../Builder/
-      - ./link_merge.sh
-    ndk: r25b
-
   - versionName: 8.8.4-fdroid
     versionCode: 4852
     commit: 2f19d467c57df986a5c59fc69cec07842ab2325c
@@ -298,7 +264,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y g++ mesa-common-dev libxcursor-dev libxrandr-dev libxinerama-dev
-        libglu1-mesa-dev libxi-dev
+        libglu1-mesa-dev libxi-dev make
     gradle:
       - fdroid
     srclibs:
@@ -307,7 +273,8 @@ Builds:
       - Builder/libs
     prebuild:
       - sed -i -e '/F-DROID REMOVE THIS LINE/,+1d' ../build.gradle
-      - sed -i -e '/^if.*Fdroid/,/^}/d' -e '/enable true/d' build.gradle
+      - sed -i -e '/^if.*Fdroid/,/^}/d' -e '/enable true/d' -e '/_appGdriveKey/d'
+        -e '/_admob/d' build.gradle
       - mkdir src/main/jniLibs
       - cd ../Builder
       - sed -i -e '/^#!/a\set -e' -e '/git clone/d' -e '/mkdir mupdf/d' -e 's|.*ndk-build|$$NDK$$/ndk-build
@@ -316,6 +283,9 @@ Builds:
       - cp -r $$MuPDF$$ mupdf-1.11
       - cd mupdf-1.11
       - git checkout 1.11
+      - git submodule update
+      - cd ..
+      - rm -rf mupdf-{master,1.11}/thirdparty/{harfbuzz/test,curl/tests,leptonica/prog/fuzzing}
     scanignore:
       - Builder/fonts/fonts.zip
       - app/src/fdroid/assets/fonts.zip

metadata/com.katiearose.sobriety.yml

@@ -52,7 +52,6 @@ Builds:
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e 's/VERSION_16/VERSION_11/g' build.gradle
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags