diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg index ec9be6034..3e202b660 100644 --- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Debian" AppFullName=com.cuntubuntu # Application version code (integer) -AppVersionCode=200106 +AppVersionCode=200107 # Application user-visible version name (string) -AppVersionName="20.01.06" +AppVersionName="20.01.07" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, '!!' will also hide the entry from the menu, so it cannot be disabled @@ -20,13 +20,13 @@ AppVersionName="20.01.06" # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip -AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:logo.png:logo.png^!!System overlay|:overlay.tar.xz:overlay-.tar.xz" +AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:logo.png:logo.png^!!Sloppy symlinks patch|:symlinks.tar.xz:symlinks-.tar.xz^!!System overlay|:overlay.tar.xz:overlay-.tar.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="busybox usr tmp pulseaudio.conf libsdl-DownloadFinished-0.flag libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag" +DeleteFilesOnUpgrade="busybox usr tmp pulseaudio.conf libsdl-DownloadFinished-0.flag libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag libsdl-DownloadFinished-6.flag" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ @@ -183,7 +183,7 @@ AppRecordsAudio=n AccessSdCard=y # Application needs to read it's own OBB file. Enable this if you are using Play Store expansion files. (y) / (n) -ReadObbFile= +ReadObbFile=y # Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n) AccessInternet= diff --git a/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz b/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz index 7f8b86c07..4d591e857 100644 Binary files a/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz and b/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz differ diff --git a/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz b/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz index b1b5f2135..faa50ef96 100644 Binary files a/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz and b/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz differ diff --git a/project/jni/application/xserver-debian/AndroidData/postinstall.sh b/project/jni/application/xserver-debian/AndroidData/postinstall.sh index 05f8dad31..b7425d725 100755 --- a/project/jni/application/xserver-debian/AndroidData/postinstall.sh +++ b/project/jni/application/xserver-debian/AndroidData/postinstall.sh @@ -9,6 +9,9 @@ echo "./busybox tar xvJf $ANDROID_OBB_DIR/main.$OBB_VERSION.$ANDROID_PACKAGE_NAM ./busybox tar xvJf $ANDROID_OBB_DIR/main.$OBB_VERSION.$ANDROID_PACKAGE_NAME.obb echo "./busybox unzip -p $ANDROID_PACKAGE_PATH assets/dist-debian-buster-$ARCH.tar.xz | ./busybox tar xvJ" ./busybox unzip -p $ANDROID_PACKAGE_PATH assets/dist-debian-buster-$ARCH.tar.xz | ./busybox tar xvJ +echo "Extracting sloppy symlinks patch" +echo "./busybox tar xvJf $DATADIR/symlinks.tar.xz" +./busybox tar xvJf $DATADIR/symlinks.tar.xz echo "Extracting overlay data files" echo "./busybox tar xvJf $DATADIR/overlay.tar.xz" ./busybox tar xvJf $DATADIR/overlay.tar.xz diff --git a/project/jni/application/xserver-debian/debian-image b/project/jni/application/xserver-debian/debian-image index 775db9342..d8c195633 160000 --- a/project/jni/application/xserver-debian/debian-image +++ b/project/jni/application/xserver-debian/debian-image @@ -1 +1 @@ -Subproject commit 775db9342ec50adf61830ae6ad595df5b0d0f652 +Subproject commit d8c195633777611f3c366b14f3cf43d56071c2f3 diff --git a/project/jni/application/xserver-debian/project-target-android-p.patch b/project/jni/application/xserver-debian/project.patch similarity index 100% rename from project/jni/application/xserver-debian/project-target-android-p.patch rename to project/jni/application/xserver-debian/project.patch diff --git a/project/jni/application/xserver/readme.txt b/project/jni/application/xserver/readme.txt index 2da4bde47..b753c4a4b 100644 --- a/project/jni/application/xserver/readme.txt +++ b/project/jni/application/xserver/readme.txt @@ -18,5 +18,5 @@ cd sdl-android git submodule update --init --recursive ./build.sh xserver -Busybox is precompiled, taken from this repository: -https://github.com/pelya/busybox-android +Busybox is precompiled, extracted from this .apk file: +https://f-droid.org/en/packages/ru.meefik.busybox/