Merge branch 'miscfixes8' into 'master'

Misc fixes - remove unbuilt See merge request fdroid/fdroiddata!6464
2026-05-18 19:59:12 +00:00 · 2020-03-10 13:03:53 +00:00 · 2020-03-10 13:03:53 +00:00 · a0f995eee2
commit a0f995eee2
parent ff4d230331 f2866d5c56
14 changed files with 17 additions and 186 deletions
--- a/metadata/com.haha01haha01.harail.yml
+++ b/metadata/com.haha01haha01.harail.yml
@ -67,6 +67,7 @@ Builds:

  - versionName: '1.4'
    versionCode: 5
+    disable: fails to bui;d
    commit: '1.4'
    submodules: true
    gradle:
--- a/metadata/com.standardnotes.yml
+++ b/metadata/com.standardnotes.yml
@ -172,7 +172,7 @@ Builds:

  - versionName: 3.0.18
    versionCode: 3000180
-    commit: 3.0.18
+    commit: 777c57cb6f2a784a469df393d144ff7a614d1e1d
    subdir: android/app/
    submodules: true
    sudo:
@ -183,7 +183,6 @@ Builds:
      - yes
    rm:
      - vendor/react-native-aes/android/build/
-      - vendor/TrustKit/
    prebuild:
      - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
      - sed -i -e 's/gradle-4.1/gradle-5.4.1/' gradle/wrapper/gradle-wrapper.properties
@ -191,7 +190,6 @@ Builds:
      - android/build.gradle
      - node_modules/react-native-screens/android/build.gradle
      - node_modules/react-native-webview/android/build.gradle
-      - vendor/react-native-navigation/android/build.gradle
    scandelete:
      - node_modules/
      - vendor/
--- a/metadata/de.baumann.weather.yml
+++ b/metadata/de.baumann.weather.yml
@ -208,6 +208,7 @@ Builds:

  - versionName: '4.6'
    versionCode: 53
+    disable: fails to build
    commit: v4.6
    subdir: app
    gradle:
--- a/metadata/de.blau.android.yml
+++ b/metadata/de.blau.android.yml
@ -842,14 +842,14 @@ Builds:
      - current
    prebuild: sed -i -e '/bintray/d' -e '/markdown/d' -e '/preset-utils/d' build.gradle

-  - versionName: Unknown
-    versionCode: 1320
-    commit: Unknown
+  - versionName: 14.0.19.0
+    versionCode: 1321
+    commit: 14.0.19.0
    gradle:
      - current
    prebuild: sed -i -e '/bintray/d' -e '/markdown/d' -e '/preset-utils/d' build.gradle

 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9]+\.[0-9]+\.[0-9]+\.0$
-CurrentVersion: Unknown
-CurrentVersionCode: 1320
+CurrentVersion: 14.0.19.0
+CurrentVersionCode: 1321
--- a/metadata/de.blinkt.openvpn.yml
+++ b/metadata/de.blinkt.openvpn.yml
@ -379,23 +379,6 @@ Builds:
      - .gradle
    ndk: r19c

-  - versionName: 0.7.13
-    versionCode: 166
-    commit: v0.7.13
-    subdir: main
-    submodules: true
-    gradle:
-      - ui
-    rm:
-      - main/src/main/cpp/mbedtls/tests
-      - main/src/main/cpp/mbedtls/crypto/tests
-      - main/src/main/cpp/openvpn3/test/unittests
-    prebuild: sed -i -e '/signingConfigs.getByName/d' -e 's/isEnable\ =\ true/isEnable\
-        =\ false/' build.gradle.kts
-    scandelete:
-      - .gradle
-    ndk: r19c
-
  - versionName: 0.7.15
    versionCode: 168
    commit: v0.7.15
--- a/metadata/ga.testapp.testapp.yml
+++ b/metadata/ga.testapp.testapp.yml
@ -78,19 +78,6 @@ Builds:
      - $$flutter$$/bin/flutter packages pub get
      - $$flutter$$/bin/flutter build apk

-  - versionName: 3.5.0
-    versionCode: 44
-    commit: 3.5.0
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@v1.12.13+hotfix.7
-    prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all
-        { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter build apk
-
  - versionName: 3.6.0
    versionCode: 45
    commit: 3.6.0
--- a/metadata/it.diab.yml
+++ b/metadata/it.diab.yml
@ -46,7 +46,7 @@ Builds:

  - versionName: v1.3.5
    versionCode: 491
-    commit: vv1.3.5
+    commit: v1.3.5
    subdir: app
    gradle:
      - oss
@ -54,7 +54,7 @@ Builds:
      - googlefit
    prebuild: sed -i -e '/googleFitImplementation/d' build.gradle

-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: v1.3.5
 CurrentVersionCode: 491
--- a/metadata/org.koreader.launcher.yml
+++ b/metadata/org.koreader.launcher.yml
@ -248,28 +248,9 @@ Builds:
      - ANDROID_FLAVOR=fdroid ./kodev release android
    ndk: r15c

-  - versionName: v2020.02
-    versionCode: 7325
-    commit: v2020.02
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y gcc-multilib luarocks p7zip-full ragel
-    output: koreader-android-*.apk
-    rm:
-      - platform/ubuntu-touch/
-      - platform/win32/
-    prebuild: sed -i -e 's#./gradlew#gradle#' platform/android/luajit-launcher/Makefile
-    scandelete:
-      - base/thirdparty/
-    build:
-      - NDK=$$NDK$$
-      - SDK=$$SDK$$
-      - ANDROID_FLAVOR=fdroid ./kodev release android
-    ndk: r15c
-
  - versionName: v2020.03
    versionCode: 7360
+    disable: mismatched versionCode waiting for upstream
    commit: v2020.03
    submodules: true
    sudo:
--- a/metadata/org.linphone.yml
+++ b/metadata/org.linphone.yml
@ -603,46 +603,6 @@ Builds:
        linphone-sdk-android/
    ndk: r16b

-  - versionName: 4.2.2
-    versionCode: 4217
-    commit: 4.2.2
-    timeout: 20000
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends cmake -t stretch-backports
-      - apt-get install -y doxygen pkgconf python-pystache python-six yasm
-    gradle:
-      - yes
-    output: app/build/outputs/apk/release/linphone-android-release-*.apk
-    srclibs:
-      - linphone-sdk@4.3.1
-    rm:
-      - app/src/main/java/org/linphone/firebase/Firebase*.java
-      - app/google-services.json
-      - sample
-    prebuild:
-      - sed -i -e '/google-services/d' build.gradle
-      - sed -i -e '/keystore/d' -e '/repositories/,+5d' -e 's/${project.version}/$$VERSION$$/g'
-        -e '/com.google.gms.google-services/d' app/build.gradle
-      - sed -i -e 's|"kill_service_with_task_manager">true<|"kill_service_with_task_manager">false<|'
-        -e 's|"check_for_update_when_app_starts">true<|"check_for_update_when_app_starts">false<|'
-        app/src/main/res/values/non_localizable_custom.xml
-      - sed -i -e 's!https://www.linphone.org/releases!!' app/src/main/res/raw/linphonerc_default
-    scanignore:
-      - app/build.gradle
-    build:
-      - pushd $$linphone-sdk$$
-      - git submodule update --init --recursive
-      - mkdir build-sdk
-      - cd build-sdk
-      - cmake .. -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="arm64,
-        armv7, x86, x86_64" -DCMAKE_BUILD_TYPE=Release
-      - cmake --build . --parallel $(nproc)
-      - popd
-      - cp $$linphone-sdk$$/build-sdk/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
-        linphone-sdk-android/
-    ndk: r16b
-
  - versionName: 4.2.3
    versionCode: 4230
    commit: 4.2.3
--- a/metadata/org.softeg.slartus.forpdaplus.yml
+++ b/metadata/org.softeg.slartus.forpdaplus.yml
@ -278,33 +278,15 @@ Builds:
      - rel
    prebuild: sed -i -e '/applicationVariants.all/,/^    }/d; /signingConfigs/d' build.gradle

-  - versionName: 3.5.6
-    versionCode: 636
-    commit: 8259a4bfc64b97c5ae114099452454e0a5de17e7
-    subdir: app
-    gradle:
-      - rel
-    prebuild: sed -i -e '/applicationVariants.all/,/^    }/d; /signingConfigs/d' build.gradle
-
-  - versionName: 3.5.6
-    versionCode: 636
-    commit: 3.5.6
-    subdir: app
-    gradle:
-      - rel
-    prebuild: sed -i -e '/applicationVariants.all/,/^    }/d; /signingConfigs/d' build.gradle
-
-  - versionName: 3.5.6
+  - versionName: 3.5.5.7
    versionCode: 637
-    commit: 3.5.6
+    commit: 3.5.5.7
    subdir: app
    gradle:
      - rel
    prebuild: sed -i -e '/applicationVariants.all/,/^    }/d; /signingConfigs/d' build.gradle

-AutoUpdateMode: Version %v
-UpdateCheckMode: HTTP
-UpdateCheckData: https://raw.githubusercontent.com/slartus/4pdaClient-plus/master/app/build.gradle|def
-    appVersionCode = (.*)|.|def appVersionName = "(.*)"
-CurrentVersion: 3.5.6
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 3.5.5.7
 CurrentVersionCode: 637
--- a/metadata/org.voidsink.anewjkuapp.yml
+++ b/metadata/org.voidsink.anewjkuapp.yml
@ -245,18 +245,6 @@ Builds:
      - sed -i -e '/maven {$/,/}/d; /com.google.gms/d; /io.fabric.tools/d' ../build.gradle
      - sed -i -e '/applicationVariants/,+4d; /googleImplementation/d' build.gradle

-  - versionName: 0.53.0
-    versionCode: 140079
-    commit: v0.53.0
-    subdir: aNewJKUApp
-    gradle:
-      - fdroid
-    rm:
-      - tools
-    prebuild:
-      - sed -i -e '/maven {$/,/}/d; /com.google.gms/d; /io.fabric.tools/d' ../build.gradle
-      - sed -i -e '/applicationVariants/,+4d; /googleImplementation/d' build.gradle
-
  - versionName: 0.53.1
    versionCode: 140080
    commit: v0.53.1
--- a/metadata/org.wownero.cyberwow.yml
+++ b/metadata/org.wownero.cyberwow.yml
@ -45,7 +45,7 @@ Builds:
      - $flutter_dir/flutter config --no-analytics
      - cd ..
      - PATH=$flutter_dir:$PATH ANDROID_NDK_ROOT=$$NDK$$ make wow
-    ndk: r20
+    ndk: r20b

 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
--- a/metadata/ru.evgeniy.dpitunnel.yml
+++ b/metadata/ru.evgeniy.dpitunnel.yml
@ -30,15 +30,6 @@ Builds:
      - yes
    ndk: r20b

-  - versionName: '1.5'
-    versionCode: 7
-    commit: v1.5
-    subdir: app
-    submodules: true
-    gradle:
-      - yes
-    ndk: r20b
-
  - versionName: '1.6'
    versionCode: 8
    commit: v1.6
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@ -1190,47 +1190,6 @@ Builds:
      - npm run build-android-assets
    ndk: r19c

-  - versionName: 0.2002.24-beta
-    versionCode: 81
-    commit: v0.2002.24-beta
-    timeout: 30000
-    subdir: android/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends g++ lib32stdc++-6-dev libc6-dev-i386
-        ninja-build linux-libc-dev linux-libc-dev:i386
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v10.16.3/node-v10.16.3-linux-x64.tar.xz
-      - echo "d2271fd8cf997fa7447d638dfa92749ff18ca4b0d796bf89f2a82bf7800d5506 node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v10.16.3-linux-x64/. /usr/local/
-      - npm install -g react-native-cli
-    init:
-      - npm install --no-optional
-      - truncate -s 0 ../../node_modules/react-native/node_modules/@react-native-community/cli/build/commands/server/external/xsel
-    gradle:
-      - indie
-    srclibs:
-      - NodejsMobile@nodejs-mobile-v0.2.1
-    rm:
-      - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
-      - node_modules/react-native/template/
-      - e2e/apple-app-store-demo
-    prebuild: sed -i -e '/lifecycle/d' ../build.gradle
-    scanignore:
-      - android/build.gradle
-    scandelete:
-      - node_modules
-    build:
-      - pushd $$NodejsMobile$$
-      - ./tools/android_build.sh $$NDK$$ arm
-      - ./tools/android_build.sh $$NDK$$ arm64
-      - popd
-      - mv $$NodejsMobile$$/out_android/armeabi-v7a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/armeabi-v7a/libnode.so
-      - mv $$NodejsMobile$$/out_android/arm64-v8a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/arm64-v8a/libnode.so
-      - npm run build-android-assets
-    ndk: r19c
-
  - versionName: 0.2003.4-beta
    versionCode: 82
    commit: v0.2003.4-beta