Merge branch 'LibreOffice-Viewer' into 'master'
LibreOfficeViewer: Update See merge request !588
This commit is contained in:
commit
e365423168
|
@ -29,6 +29,7 @@ Repo:git://anongit.freedesktop.org/libreoffice/core
|
|||
|
||||
Build:4.5.0.0.alpha0+/7f68f67,6
|
||||
commit=7f68f67
|
||||
disable=Remove old alpha build
|
||||
srclibs=LOTarballs@c873ae6f
|
||||
ndk=r10d
|
||||
output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
|
||||
|
@ -63,8 +64,33 @@ Build:4.5.0.0.alpha0+/3f1713b,8
|
|||
./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=8
|
||||
|
||||
Build:4.5.0.0.alpha0+/2f6bc9c,9
|
||||
commit=2f6bc9c
|
||||
srclibs=LOTarballs@c873ae6f
|
||||
output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
|
||||
ndk=r10d
|
||||
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
|
||||
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=9
|
||||
|
||||
Build:4.5.0.0.alpha0+/2f6bc9c,10
|
||||
commit=2f6bc9c
|
||||
srclibs=LOTarballs@c873ae6f
|
||||
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
|
||||
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=10
|
||||
|
||||
Archive Policy:4 versions
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:None
|
||||
Current Version:4.5.0.0.alpha0+/3f1713b
|
||||
Current Version Code:8
|
||||
Current Version:4.5.0.0.alpha0+/2f6bc9c
|
||||
Current Version Code:10
|
||||
|
||||
|
|
Loading…
Reference in a new issue