misc fixes

This commit is contained in:
linsui 2022-10-17 17:03:14 +08:00
parent f1aeac89c7
commit 0fb4ccc8c9
13 changed files with 47 additions and 52 deletions

View file

@ -279,9 +279,7 @@ Builds:
submodules: true
gradle:
- ose
prebuild:
- sed -i -e '/developer.huawei.com/d' ../build.gradle
- sed -i -e 's|/app||' build.gradle
prebuild: sed -i -e '/developer.huawei.com/d' ../build.gradle
AutoUpdateMode: Version
UpdateCheckMode: Tags ^v[0-9.]*$

View file

@ -538,6 +538,7 @@ Builds:
- versionName: 1.30.4
versionCode: 113004
disable: https://monitor.f-droid.org/builds/log/ca.rmen.android.poetassistant/113004#site-footer
commit: 61085af0f01feddcaf5dda54241eea88f8ff0c06
subdir: app
gradle:

View file

@ -1197,46 +1197,32 @@ Builds:
- openvpn/src/main/cpp/openvpn3/test/unittests
- openvpn/src/main/cpp/mbedtls/programs/fuzz/corpuses/*
prebuild:
- sdkmanager 'cmake;3.18.1'
- sdkmanager 'cmake;3.18.1' 'ndk;21.4.7075529'
- sed -i -e '/triple/d' -e '/play\ {/,+4d' build.gradle
- git submodule update --init --recursive ../strongswan
- cd ../strongswan
- ln -s -T $$android-ndk-boringssl$$ src/frontends/android/app/src/main/jni/openssl
- cd ..
- echo ndk.dir="$(pwd)"/ndk/android-ndk-r21e > strongswan/src/frontends/android/local.properties
- echo ndk.dir="$ANDROID_SDK/ndk/21.4.7075529" > strongswan/src/frontends/android/local.properties
scanignore:
- build/gradle-build-cache
scandelete:
- strongswan/testing
- openvpn/src/main/cpp/lz4/tmp
- build/gradle-build-cache
build:
- pushd ..
- mkdir -p ndk
- pushd ndk
- curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
- echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip"
| sha256sum -c -
- unzip -q ndk.zip
- popd
- popd
- pushd ../strongswan
- ./autogen.sh
- ./configure || cat config.log
- make dist
- pushd src/frontends/android/app
- cd src/frontends/android/app
- sed -i -e '/android\ {/alintOptions\ {abortOnError\ false}' build.gradle
- gradle assembleRelease
- popd
- popd
- cp -r ../strongswan/src/frontends/android/app/src/main/libs/* src/main/jniLibs/
- rm -fr ../strongswan/src/frontends/android/app/src/main/libs/*
- mv ../strongswan/src/frontends/android/app/src/main/libs/* src/main/jniLibs/
- rm -fr ../strongswan/src/frontends/android/app/build
- pushd ..
- gradle openvpn:assembleRelease
- rm -fr openvpn/build/intermediates
- rm -fr openvpn/build/kotlin
- rm -fr openvpn/build/tmp
- rm -fr openvpn/.cxx
- popd
- cd ../openvpn
- gradle assembleRelease
- rm -fr build/intermediates build/kotlin build/tmp .cxx
ndk: r23b
gradleprops:
- buildUniversalApk

View file

@ -1550,8 +1550,11 @@ Builds:
- versionName: 2.0.6
versionCode: 3048
commit: 6010c7077a45d83be6b35b8bbce65d1b4add3192
subdir: src/ui/flutter_app
output: build/app/outputs/flutter-apk/app-fdroid-release.apk
sudo:
- apt-get update
- apt-get install -y openjdk-11-jdk
- update-alternatives --auto java
output: src/ui/flutter_app/build/app/outputs/flutter-apk/app-fdroid-release.apk
srclibs:
- flutter@3.3.3
rm:
@ -1564,12 +1567,14 @@ Builds:
- src/ui/qt
- resources
- tests
prebuild: mv build.gradle_fdroid build.gradle
prebuild:
- cd src/ui/flutter_app/android/app
- rm build.gradle
- mv build.gradle_fdroid build.gradle
build:
- export PATH=$$flutter$$/bin:$PATH
- pushd ../../..
- ./flutter-init.sh
- popd
- cd src/ui/flutter_app
- flutter config --no-analytics
- flutter build apk -v --flavor fdroid
ndk: r21e

View file

@ -260,32 +260,36 @@ Builds:
- versionName: 8.8.1-fdroid
versionCode: 4842
commit: 99af91393db21b271370188dc68fd93f15d4b2a2
disable: https://github.com/foobnix/LibreraReader/issues/960
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
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- fdroid
srclibs:
- MuPDF@1.20.2
- 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
- sed -i -e '/^#!/a\set -e' -e 's|git clone .*|cp -r $$MuPDF$$ mupdf-$VERSION_TAG|'
-e '/mkdir mupdf/d' -e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.20.2.sh
- mkdir src/main/jniLibs/
- 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_to_mupdf_1.20.2.sh
ndk: r23c
- ./link_merge.sh
ndk: r25b
MaintainerNotes: |-
* Upstream builds separate APKs for each architecture but we build an universal APK.

View file

@ -35,10 +35,6 @@ Builds:
- versionName: 2.0.4
versionCode: 19
commit: 534e1f2613c2bc2ab0004a4dd4f20eabcf30648a
sudo:
- apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
output: build/app/outputs/flutter-apk/app-release.apk
srclibs:
- flutter@3.3.4

View file

@ -194,12 +194,12 @@ Builds:
- yes
rm:
- passwdsafe/libs/*.jar
- lib-owncloud/libs/*.jar
- maven-libs
prebuild:
- sed -i -e '/fileTree/aimplementation "org.bouncycastle:bcprov-jdk15:1.43"'
build.gradle
-e 's|\${.*/maven-libs|https://jitpack.io|' build.gradle
- sed -i -e '/play-services-auth/d' ../sync/build.gradle
scandelete:
- lib-owncloud/libs
ndk: r21d
AutoUpdateMode: Version

View file

@ -49,9 +49,11 @@ Builds:
subdir: app
gradle:
- libre
output: build/outputs/apk/libre/release/app-libre-universal-release-unsigned.apk
prebuild:
- sed -i -e '/maven.aliyun.com/d' ../build.gradle
- sed -i -e '/enable true/d' build.gradle
AutoUpdateMode: Version %v
AutoUpdateMode: Version
UpdateCheckMode: Tags
UpdateCheckName: com.perol.asdpl.play.pixivez
CurrentVersion: 1.8.3

View file

@ -510,7 +510,7 @@ Builds:
submodules: true
sudo:
- apt-get update
- apt-get install -y gcc-multilib
- apt-get install -y gcc-multilib make
gradle:
- five
srclibs:

View file

@ -48,7 +48,7 @@ Builds:
commit: 87b3f285b8b0f0963ff023117bba696a39c2911a
output: build/app/outputs/flutter-apk/app-release.apk
srclibs:
- flutter@2.5.3
- flutter@3.3.4
rm:
- ios
- test
@ -57,7 +57,7 @@ Builds:
- $$flutter$$/bin/flutter packages pub get
- $$flutter$$/bin/flutter build apk
AutoUpdateMode: Version %v
AutoUpdateMode: Version
UpdateCheckMode: Tags
UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
CurrentVersion: 1.2.0

View file

@ -310,6 +310,8 @@ Builds:
- stable
prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
-e '/google-services/d' build.gradle
gradleprops:
- org.gradle.jvmargs=-Xmx4096m
MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting
it to not trigger fdroid/fdroidserver#463.

View file

@ -118,7 +118,7 @@ Builds:
commit: c83410bac2ae09e74daa737897eb6f5b2067d31b
output: build/app/outputs/apk/release/*.apk
srclibs:
- flutter@3.0.4
- flutter@3.3.4
rm:
- ios
- linux

View file

@ -2818,6 +2818,7 @@ Builds:
sudo:
- apt-get update
- apt-get install -y g++ g++-multilib make libtool npm python2 python-is-python2
autoconf automake libtool
- sysctl fs.inotify.max_user_watches=524288
- npm install -g react-native-cli
init: npm install --no-optional