diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg index cfc247821..743639b7d 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=141131 +AppVersionCode=150626 # Application user-visible version name (string) -AppVersionName="14.11.31" +AppVersionName="15.06.26" # 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, other downloads should be selected by user from startup config menu @@ -18,17 +18,17 @@ AppVersionName="14.11.31" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!!System image|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/14.05.01/dist-debug-wheezy-proot-.tar.gz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall2.sh^!!Update|:update1.tar.gz:update1.tgz^!!Update|:update2.tar.gz:update2-.tgz^!!Update|:update3.tar.gz:update3.tgz^!!Update|:update4.tar.gz:update4.tgz^!!Update|:update5.tar.gz:update5-.tgz" +AppDataDownloadUrl="!!Data files|:data.tar.xz:obb:main.150626|:data.tar.xz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-debian-jessie.tar.xz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=n +ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="%" +DeleteFilesOnUpgrade="postinstall.sh libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag libsdl-DownloadFinished-6.flag libsdl-DownloadFinished-7.flag libsdl-DownloadFinished-8.flag libsdl-DownloadFinished-9.flag libsdl-DownloadFinished-10.flag libsdl-DownloadFinished-11.flag libsdl-DownloadFinished-12.flag libsdl-DownloadFinished-13.flag libsdl-DownloadFinished-14.flag libsdl-DownloadFinished-15.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/ -ReadmeText='This app will download 220 Mb data,\\\\n and will use 600 Mb of internal storage.' +ReadmeText='' # libSDL version to use (1.2/1.3/2.0) LibSdlVersion=1.2 @@ -40,11 +40,15 @@ ScreenOrientation=h InhibitSuspend=y # Create Android service, so the app is less likely to be killed while in background -CreateService=n +CreateService=y # Screen follows mouse cursor, when it's covered by soft keyboard, this works only in software video mode (y) or (n) ScreenFollowsMouse=y +RightMouseButtonLongPress=n + +CompatibilityHacksForceScreenUpdateMouseClick=y + # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) VideoDepthBpp=16 @@ -229,7 +233,7 @@ AppSubdirsBuild='' AppBuildExclude='' # Application command line parameters, including app name as 0-th param -AppCmdline='XSDL -nohelp -screenbuttons -exec $SECURE_STORAGE_DIR/img/proot.sh ./startx.sh' +AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 1000 -exec $SECURE_STORAGE_DIR/usr/bin/xli -onroot -border black -center $UNSECURE_STORAGE_DIR/loading.gif ; $SECURE_STORAGE_DIR/img/proot.sh ./startx.sh' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/project/jni/application/xserver-debian/AndroidData/loading.gif b/project/jni/application/xserver-debian/AndroidData/loading.gif new file mode 120000 index 000000000..1c621d5eb --- /dev/null +++ b/project/jni/application/xserver-debian/AndroidData/loading.gif @@ -0,0 +1 @@ +../../xserver-gimp/AndroidData/loading.gif \ No newline at end of file diff --git a/project/jni/application/xserver-debian/AndroidData/postinstall2.sh b/project/jni/application/xserver-debian/AndroidData/postinstall.sh similarity index 100% rename from project/jni/application/xserver-debian/AndroidData/postinstall2.sh rename to project/jni/application/xserver-debian/AndroidData/postinstall.sh diff --git a/project/jni/application/xserver-debian/AndroidData/update1.tgz b/project/jni/application/xserver-debian/AndroidData/update1.tgz deleted file mode 100644 index 389ecb0b9..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update1.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update2-armeabi-v7a.tgz b/project/jni/application/xserver-debian/AndroidData/update2-armeabi-v7a.tgz deleted file mode 100644 index 757c5a0f8..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update2-armeabi-v7a.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update2-x86.tgz b/project/jni/application/xserver-debian/AndroidData/update2-x86.tgz deleted file mode 100644 index ac3e546b1..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update2-x86.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update3.tgz b/project/jni/application/xserver-debian/AndroidData/update3.tgz deleted file mode 100644 index a44be9316..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update3.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update4.tgz b/project/jni/application/xserver-debian/AndroidData/update4.tgz deleted file mode 100644 index fef9362f0..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update4.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update5-armeabi-v7a.tgz b/project/jni/application/xserver-debian/AndroidData/update5-armeabi-v7a.tgz deleted file mode 100644 index 546d67258..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update5-armeabi-v7a.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update5-x86.tgz b/project/jni/application/xserver-debian/AndroidData/update5-x86.tgz deleted file mode 100644 index 781d999c7..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update5-x86.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update6-armeabi-v7a.tgz b/project/jni/application/xserver-debian/AndroidData/update6-armeabi-v7a.tgz deleted file mode 100644 index 0f810872a..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update6-armeabi-v7a.tgz and /dev/null differ diff --git a/project/jni/application/xserver-debian/AndroidData/update6-x86.tgz b/project/jni/application/xserver-debian/AndroidData/update6-x86.tgz deleted file mode 100644 index 504ae9f04..000000000 Binary files a/project/jni/application/xserver-debian/AndroidData/update6-x86.tgz and /dev/null differ diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg index 29047967c..04d622ccc 100644 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="GIMP Inkscape" AppFullName=org.gimp.inkscape # Application version code (integer) -AppVersionCode=281422 +AppVersionCode=281423 # Application user-visible version name (string) -AppVersionName="2.8.14.22" +AppVersionName="2.8.14.23" # 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, other downloads should be selected by user from startup config menu @@ -18,13 +18,13 @@ AppVersionName="2.8.14.22" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file -AppDataDownloadUrl="!!Data files|:data.tar.xz:obb:main.281420|:data.tar.xz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-gimp-jessie.tar.xz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!Update 1|:update1.tar.gz:update1.tgz^!!Update 2|:update2.tar.gz:update2-.tgz" +AppDataDownloadUrl="!!Data files|:data.tar.xz:obb:main.281420|:data.tar.xz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-gimp-jessie.tar.xz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!Update 1|:update1.tar.gz:update1.tgz^!!Update 2|:update2.tar.gz:update2-.tgz^!!Update 3|:update3.tar.gz:update3.tgz" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=y +ResetSdlConfigForThisVersion=n # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="postinstall.sh libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag libsdl-DownloadFinished-6.flag libsdl-DownloadFinished-7.flag libsdl-DownloadFinished-8.flag libsdl-DownloadFinished-9.flag" +DeleteFilesOnUpgrade="" # 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/ diff --git a/project/jni/application/xserver-gimp/AndroidData/postinstall.sh b/project/jni/application/xserver-gimp/AndroidData/postinstall.sh index ac797f4fb..75c50e5c5 120000 --- a/project/jni/application/xserver-gimp/AndroidData/postinstall.sh +++ b/project/jni/application/xserver-gimp/AndroidData/postinstall.sh @@ -1 +1 @@ -../../xserver-debian/AndroidData/postinstall2.sh \ No newline at end of file +../../xserver-debian/AndroidData/postinstall.sh \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/AndroidData/update3.tgz b/project/jni/application/xserver-gimp/AndroidData/update3.tgz new file mode 100644 index 000000000..8b4878b73 Binary files /dev/null and b/project/jni/application/xserver-gimp/AndroidData/update3.tgz differ