diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg index 80bf22c26..420fcea60 100644 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg @@ -18,7 +18,7 @@ AppVersionName="2.8.2.15" # 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="!!Data files|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/14.05.01/dist-gimp-wheezy-.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" +AppDataDownloadUrl="!!Data files|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/14.05.01/dist-gimp-wheezy-.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" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/xserver-gimp/AndroidData/update1.tgz b/project/jni/application/xserver-gimp/AndroidData/update1.tgz new file mode 100644 index 000000000..46556a001 Binary files /dev/null and b/project/jni/application/xserver-gimp/AndroidData/update1.tgz differ diff --git a/project/jni/application/xserver-gimp/xserver b/project/jni/application/xserver-gimp/xserver index 5eecca50c..3cce1acc1 160000 --- a/project/jni/application/xserver-gimp/xserver +++ b/project/jni/application/xserver-gimp/xserver @@ -1 +1 @@ -Subproject commit 5eecca50cbd8bad6eb9d2804094b0a603413ff8f +Subproject commit 3cce1acc1f943ded8491e1be814aebfce6e09023 diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c index 234548096..ce3703197 100644 --- a/project/jni/application/xserver/gfx.c +++ b/project/jni/application/xserver/gfx.c @@ -236,11 +236,11 @@ static void * unpackFilesThread(void * unused) { const char *unpack[][3] = { - {"data.tar.gz", "postinstall.sh", "usr/lib/xorg/protocol.txt" }, - {"xfonts.tar.gz", "", "" }, - {"update1.tar.gz", "update1.sh", "" }, - {"update2.tar.gz", "update2.sh", "" }, - {"update3.tar.gz", "update3.sh", "" }, + { "data.tar.gz", "postinstall.sh", "usr/lib/xorg/protocol.txt" }, + { "xfonts.tar.gz", "", "" }, + { "update1.tar.gz", "update1.sh", "" }, + { "update2.tar.gz", "update2.sh", "" }, + { "update3.tar.gz", "update3.sh", "" }, {NULL, NULL, NULL} }; int i;