Merge branch 'LibreOfficeViewer' into 'master'

Update LibreOffice Viewer to commit 2d6e16f (2015-05-03) VC: 12

This has a fix[1] to run with a newer AppCompat

[1] https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg141934.html

See merge request !787
This commit is contained in:
Boris Kraut 2015-05-25 19:25:59 +00:00
commit 0560993eba

View file

@ -88,9 +88,39 @@ Build:4.5.0.0.alpha0+/2f6bc9c,10
./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="com.collabora.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidX86 --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --with-x=no --disable-gconf --disable-python" && \
make versionCode=10
Build:4.5.0.0.alpha0+/2d6e16f,11
commit=2d6e16f
srclibs=LOTarballs@187cf421
ndk=r10d
output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
echo "***HOTFIX***" && \
sed -i -e '/windowActionBar/d' android/experimental/LOAndroid3/res/values/themes.xml && \
sed -i -e 's/"Theme.AppCompat.Light"/"Theme.AppCompat.Light.NoActionBar"/g' android/experimental/LOAndroid3/res/values/themes.xml
build=ln -s ../$$LOTarballs$$ external/tarballs && \
./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="com.collabora.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroid --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --with-x=no --disable-gconf --disable-python" && \
make versionCode=11
Build:4.5.0.0.alpha0+/2d6e16f,12
commit=2d6e16f
srclibs=LOTarballs@187cf421
ndk=r10d
output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
echo "***HOTFIX***" && \
sed -i -e '/windowActionBar/d' android/experimental/LOAndroid3/res/values/themes.xml && \
sed -i -e 's/"Theme.AppCompat.Light"/"Theme.AppCompat.Light.NoActionBar"/g' android/experimental/LOAndroid3/res/values/themes.xml
build=ln -s ../$$LOTarballs$$ external/tarballs && \
./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="com.collabora.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidX86 --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --with-x=no --disable-gconf --disable-python" && \
make versionCode=12
Archive Policy:4 versions
Auto Update Mode:None
Update Check Mode:None
Current Version:4.5.0.0.alpha0+/2f6bc9c
Current Version Code:10
Current Version:4.5.0.0.alpha0+/2d6e16f
Current Version Code:12