Merge branch 'miscfixes41' into 'master'

Misc fixes after cycle See merge request fdroid/fdroiddata!7252
2026-05-23 14:17:26 +00:00 · 2020-08-17 12:23:25 +00:00 · 2020-08-17 12:23:25 +00:00 · db0a96c617
commit db0a96c617
parent e1efbf9ff5 f92e99f088
17 changed files with 20 additions and 227 deletions
--- a/metadata/com.flxrs.dankchat.yml
+++ b/metadata/com.flxrs.dankchat.yml
@ -251,46 +251,6 @@ Builds:
      - yes
    ndk: r21d

-  - versionName: 1.9.15
-    versionCode: 150
-    commit: v1.9.15
-    subdir: app
-    gradle:
-      - yes
-    ndk: r21d
-
-  - versionName: 1.9.18
-    versionCode: 153
-    commit: v1.9.18
-    subdir: app
-    gradle:
-      - yes
-    ndk: r21d
-
-  - versionName: 2.0.0
-    versionCode: 154
-    commit: v2.0.0
-    subdir: app
-    gradle:
-      - yes
-    ndk: r21d
-
-  - versionName: 2.0.1
-    versionCode: 155
-    commit: v2.0.1
-    subdir: app
-    gradle:
-      - yes
-    ndk: r21d
-
-  - versionName: 2.0.2
-    versionCode: 156
-    commit: v2.0.2
-    subdir: app
-    gradle:
-      - yes
-    ndk: r21d
-
  - versionName: 2.0.3
    versionCode: 157
    commit: v2.0.3
--- a/metadata/com.github.premnirmal.tickerwidget.yml
+++ b/metadata/com.github.premnirmal.tickerwidget.yml
@ -940,58 +940,6 @@ Builds:
      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
        build.gradle

-  - versionName: 3.9.703
-    versionCode: 300900703
-    commit: '300900703'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.705
-    versionCode: 300900705
-    commit: '300900705'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.706
-    versionCode: 300900706
-    commit: '300900706'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.709
-    versionCode: 300900709
-    commit: '300900709'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
  - versionName: 3.9.712
    versionCode: 300900712
    commit: '300900712'
--- a/metadata/com.health.openscale.yml
+++ b/metadata/com.health.openscale.yml
@ -316,6 +316,10 @@ Builds:
    subdir: android_app/app
    gradle:
      - yes
+    rm:
+      - docs/raw_icons/launcher_design_proposal_ jbeguna04.zip
+      - docs/raw_icons/openScale_icons.zip
+      - docs/misc/DCode-v4.02a-build-4.02.0.9306.zip

 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^v[0-9.]*$
--- a/metadata/com.igisw.openmoneybox.yml
+++ b/metadata/com.igisw.openmoneybox.yml
@ -161,6 +161,12 @@ Builds:
    subdir: android/API26
    gradle:
      - yes
+    rm:
+      - 3rdparty/wxsqlite3-3.4.1.zip
+      - 3rdparty/wget.tar.gz
+      - installer_win/include/locales.nsi
+      - lib/wxcode_msw30u_wxsqlite3.dll
+      - lib/sqlite3.dll

 MaintainerNotes: |-
    Summary and Description have been moved to the new localizable text files:
--- a/metadata/com.junjunguo.pocketmaps.yml
+++ b/metadata/com.junjunguo.pocketmaps.yml
@ -108,14 +108,6 @@ Builds:
    gradle:
      - yes

-  - versionName: '3.6'
-    versionCode: 36
-    disable: submodule error
-    commit: '3.6'
-    subdir: PocketMaps/app
-    gradle:
-      - yes
-
  - versionName: '3.7'
    versionCode: 37
    commit: '3.7'
--- a/metadata/com.termoneplus.yml
+++ b/metadata/com.termoneplus.yml
@ -107,14 +107,6 @@ Builds:
      - yes
    ndk: r17c

-  - versionName: 3.4.0
-    versionCode: 340
-    commit: v3.4.0
-    subdir: term
-    gradle:
-      - yes
-    ndk: r17c
-
  - versionName: 3.4.1
    versionCode: 341
    commit: v3.4.1
--- a/metadata/com.tutpro.baresip.plus.yml
+++ b/metadata/com.tutpro.baresip.plus.yml
@ -131,26 +131,6 @@ Builds:
      - popd
    ndk: r21d

-  - versionName: 3.0.2
-    versionCode: 9
-    commit: v3.0.2
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t testing nasm
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@v4.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's|/opt/Android/Sdk/ndk-bundle|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|'
-        Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21d
-
  - versionName: 3.1.0
    versionCode: 10
    commit: v3.1.0
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@ -1278,23 +1278,6 @@ Builds:
      - popd
    ndk: r21d

-  - versionName: 20.0.2
-    versionCode: 132
-    commit: 20.0.2
-    subdir: app
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@14.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's|/opt/Android/Sdk/ndk-bundle|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip|'
-        Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21d
-
  - versionName: 20.1.0
    versionCode: 133
    commit: 20.1.0
--- a/metadata/com.zoffcc.applications.trifa.yml
+++ b/metadata/com.zoffcc.applications.trifa.yml
@ -420,17 +420,9 @@ Builds:
    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
    ndk: r13b

-  - versionName: 1.0.67
-    versionCode: 10067
-    commit: 1.0.67
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk: r13b
-
  - versionName: 1.0.68
    versionCode: 10068
+    disable: fails to build
    commit: 1.0.68
    subdir: android-refimpl-app/app
    gradle:
--- a/metadata/de.blinkt.openvpn.yml
+++ b/metadata/de.blinkt.openvpn.yml
@ -403,7 +403,6 @@ Builds:
      - 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
--- a/metadata/de.luhmer.owncloudnewsreader.yml
+++ b/metadata/de.luhmer.owncloudnewsreader.yml
@ -1413,6 +1413,9 @@ Builds:
      - mkdir libs
      - mv $$JavaOptionClass$$/target/option-1.3-SNAPSHOT.jar libs/option-1.3.jar
      - mv $$MaterialFilePicker$$/library/build/outputs/aar/library-release.aar libs/MaterialFilePicker-1.8.aar
+    scanignore:
+      - News-Android-App/libs/MaterialFilePicker-1.8.aar
+      - News-Android-App/libs/option-1.3.jar

 MaintainerNotes: |-
    MaterialShowcaseView/build.gradle misses the google() repo but it's specified at top level.
--- a/metadata/design.codeux.authpass.fdroid.yml
+++ b/metadata/design.codeux.authpass.fdroid.yml
@ -203,6 +203,7 @@ Builds:

  - versionName: 1.7.3
    versionCode: 141
+    disable: fails to find flutter
    commit: v1.7.3
    subdir: authpass
    submodules: true
--- a/metadata/eu.sum7.conversations.yml
+++ b/metadata/eu.sum7.conversations.yml
@ -395,6 +395,7 @@ Builds:

  - versionName: 2.8.10
    versionCode: 397
+    disable: fails to build
    commit: 2.8.10-sum7
    gradle:
      - conversationsFreeCompat
--- a/metadata/info.dvkr.screenstream.yml
+++ b/metadata/info.dvkr.screenstream.yml
@ -355,35 +355,9 @@ Builds:
      - sed -i -e '/firebaseCrashlytics/,+2d' -e '/^android\.applicationVariants\.all
        {/,/^}$/d' build.gradle

-  - versionName: 3.4.10
-    versionCode: 30410
-    disable: no source for bottomsheets.aar see upstream issue 107
-    commit: 3.4.10
-    subdir: app
-    gradle:
-      - firebasefree
-    prebuild:
-      - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle
-      - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle
-        build.gradle
-      - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all
-        {/,/^}$/d' build.gradle
-
-  - versionName: 3.4.11
-    versionCode: 30411
-    commit: 3.4.11
-    subdir: app
-    gradle:
-      - firebasefree
-    prebuild:
-      - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle
-      - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle
-        build.gradle
-      - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all
-        {/,/^}$/d' build.gradle
-
  - versionName: 3.4.12
    versionCode: 30412
+    disable: no source for bottomsheets.aar see upstream issue 107
    commit: 3.4.12
    subdir: app
    gradle:
--- a/metadata/org.ddosolitary.okcagent.yml
+++ b/metadata/org.ddosolitary.okcagent.yml
@ -30,15 +30,6 @@ Builds:
    rm:
      - gradle/wrapper/gradle-wrapper.properties

-  - versionName: 0.2.1
-    versionCode: 4
-    commit: v0.2.1
-    subdir: app
-    gradle:
-      - yes
-    rm:
-      - gradle/wrapper/gradle-wrapper.properties
-
  - versionName: 0.2.2
    versionCode: 5
    commit: v0.2.2
--- a/metadata/org.nutritionfacts.dailydozen.yml
+++ b/metadata/org.nutritionfacts.dailydozen.yml
@ -79,6 +79,8 @@ Builds:
    subdir: app
    gradle:
      - fdroid
+    rm:
+      - archive/OriginalApp.zip
    prebuild:
      - sed -i -e '/fabric/d; /com.google.gms/d' ../build.gradle build.gradle
      - sed -i -e '/com.crashlytics.sdk/d; /firebase/d' build.gradle
--- a/metadata/org.xcsoar.yml
+++ b/metadata/org.xcsoar.yml
@ -242,48 +242,13 @@ Builds:
    build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
    ndk: r15c

-  - versionName: 6.8.14
-    versionCode: 116
-    disable: fails to build
-    commit: v6.8.14
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ vorbis-tools librsvg2-bin
-      - apt-get install -y -t testing imagemagick
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
-    rm:
-      - android/ioio/software/IOIODude/lib
-      - android/ioio/software/IOIOLib/target/pc/lib
-      - android/ioio/software/applications/IOIOConnectionTester/lib
-    build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
-    ndk: r15c
-
-  - versionName: 6.8.15
-    versionCode: 117
-    disable: fails to build
-    commit: v6.8.15
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ vorbis-tools librsvg2-bin
-      - apt-get install -y -t testing imagemagick
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
-    rm:
-      - android/ioio/software/IOIODude/lib
-      - android/ioio/software/IOIOLib/target/pc/lib
-      - android/ioio/software/applications/IOIOConnectionTester/lib
-    build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
-    ndk: r15c
-
  - versionName: 6.8.16
    versionCode: 118
    commit: v6.8.16
    submodules: true
    sudo:
      - apt-get update || apt-get update
-      - apt-get install -y g++ vorbis-tools librsvg2-bin
-      - apt-get install -y -t testing imagemagick
+      - apt-get install -y g++ vorbis-tools librsvg2-bin imagemagick
    output: output/ANDROID7NEON/opt/build/unsigned.apk
    rm:
      - android/ioio/software/IOIODude/lib