Update LibreOffice Viewer to 7.6.0.3

This commit is contained in:
Michael Weghorn 2023-09-01 08:35:03 +00:00 committed by linsui
parent 40ceba1bbe
commit b1f4129719
No known key found for this signature in database

View file

@ -829,6 +829,310 @@ Builds:
- make
ndk: r23c
- versionName: 7.6.0.3/69edd8b8ebc4/F-Droid-editing
versionCode: 22
commit: libreoffice-7.6.0.3
timeout: 43200
subdir: android/source
sudo:
- apt-get update
- apt-get install -y ant ant-optional autoconf automake bison build-essential
flex gperf junit4 nasm python3-dev libfontconfig1-dev libnss3-dev libservlet-api-java
libxml2-utils libxslt1-dev xsltproc
gradle:
- StrippedUIEditing
rm:
- onlineupdate/qa/*
- oox/qa/unit/data/*
- package/qa/cppunit/data/*
- qadevOOo/testdocs/qadevlibs/*.jar
- setup_native/source/packinfo/DS_Store*
- svx/qa/unit/data/*
- sw/qa/extras/ww8import/data/*
- test/signing-keys/random_seed
- testtools/source/cliversioning/version_libs/*.dll
- writerperfect/qa/unit/data/*
prebuild:
- pushd ../../
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/rm /d' -e '/gradlew/d' android/source/Makefile
- sed -i -e '/maven {/I,+2 d' android/source/build.gradle
- sed -i -e '/opencl.openclwrapper.hxx/d' -i -e 's/bOpenCL = .*;$/bOpenCL =
false;/' cui/source/dialogs/about.cxx
- sed -i -e '/desktop\/source\/app\/opencl/d' desktop/Library_sofficeapp.mk
- rm desktop/source/app/opencl.cxx
- sed -i '/"horst"/d' javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/JAVA_HOME=/i CLASSPATH=/usr/share/java/servlet-api.jar \\' external/hsqldb/ExternalProject_hsqldb.mk
- ./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice"
--with-android-ndk=$$NDK$$ --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidX86
--enable-android-editing --disable-dconf --with-build-platform-configure-options="--with-system-jpeg=no
--with-system-libxml=no --disable-dbus --disable-gconf --disable-python --disable-gui
--disable-gtk --disable-gstreamer-1.0"
- make fetch
- pushd external/tarballs
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do mkdir -p "extracted/${ARCHIVE}";
tar -C "extracted/${ARCHIVE}" -xaf "${ARCHIVE}"; rm "${ARCHIVE}"; done
- for ARCHIVE in *.zip; do mkdir -p "extracted/${ARCHIVE}"; unzip -d "extracted/${ARCHIVE}"
"${ARCHIVE}"; rm "${ARCHIVE}"; done
- popd
- mkdir -p instdir/program/classes/
- cd $_
- touch java_uno.jar juh.jar jurt.jar ridl.jar unoloader.jar unoil.jar
- popd
- make liboSettings.gradle versionCode=22
scanignore:
- external/lcms2/lcms2_sln
- instdir/program/classes/unoloader.jar
- instdir/program/classes/ridl.jar
- instdir/program/classes/unoil.jar
- instdir/program/classes/jurt.jar
- instdir/program/classes/juh.jar
- instdir/program/classes/java_uno.jar
- sd/res/buttons/*.zip
- solenv/gbuild/empty.zip
scandelete:
- external
build:
- pushd "../../external/tarballs/extracted/"
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do pushd "${ARCHIVE}"; tar -caf
"../../${ARCHIVE}" *; popd; done
- for ARCHIVE in *.zip; do pushd "${ARCHIVE}"; zip -r "../../${ARCHIVE}" *;
popd; done
- popd
- cd ../../
- rm -rf workdir instdir
- make
ndk: 23.2.8568313
- versionName: 7.6.0.3/69edd8b8ebc4/F-Droid-editing
versionCode: 23
commit: libreoffice-7.6.0.3
timeout: 43200
subdir: android/source
sudo:
- apt-get update
- apt-get install -y ant ant-optional autoconf automake bison build-essential
flex gperf junit4 nasm python3-dev libfontconfig1-dev libnss3-dev libservlet-api-java
libxml2-utils libxslt1-dev xsltproc
gradle:
- StrippedUIEditing
rm:
- onlineupdate/qa/*
- oox/qa/unit/data/*
- package/qa/cppunit/data/*
- qadevOOo/testdocs/qadevlibs/*.jar
- setup_native/source/packinfo/DS_Store*
- svx/qa/unit/data/*
- sw/qa/extras/ww8import/data/*
- test/signing-keys/random_seed
- testtools/source/cliversioning/version_libs/*.dll
- writerperfect/qa/unit/data/*
prebuild:
- pushd ../../
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/rm /d' -e '/gradlew/d' android/source/Makefile
- sed -i -e '/maven {/I,+2 d' android/source/build.gradle
- sed -i -e '/opencl.openclwrapper.hxx/d' -i -e 's/bOpenCL = .*;$/bOpenCL =
false;/' cui/source/dialogs/about.cxx
- sed -i -e '/desktop\/source\/app\/opencl/d' desktop/Library_sofficeapp.mk
- rm desktop/source/app/opencl.cxx
- sed -i '/"horst"/d' javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/JAVA_HOME=/i CLASSPATH=/usr/share/java/servlet-api.jar \\' external/hsqldb/ExternalProject_hsqldb.mk
- ./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice"
--with-android-ndk=$$NDK$$ --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidX86_64
--enable-android-editing --disable-dconf --with-build-platform-configure-options="--with-system-jpeg=no
--with-system-libxml=no --disable-dbus --disable-gconf --disable-python --disable-gui
--disable-gtk --disable-gstreamer-1.0"
- make fetch
- pushd external/tarballs
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do mkdir -p "extracted/${ARCHIVE}";
tar -C "extracted/${ARCHIVE}" -xaf "${ARCHIVE}"; rm "${ARCHIVE}"; done
- for ARCHIVE in *.zip; do mkdir -p "extracted/${ARCHIVE}"; unzip -d "extracted/${ARCHIVE}"
"${ARCHIVE}"; rm "${ARCHIVE}"; done
- popd
- mkdir -p instdir/program/classes/
- cd $_
- touch java_uno.jar juh.jar jurt.jar ridl.jar unoloader.jar unoil.jar
- popd
- make liboSettings.gradle versionCode=23
scanignore:
- external/lcms2/lcms2_sln
- instdir/program/classes/unoloader.jar
- instdir/program/classes/ridl.jar
- instdir/program/classes/unoil.jar
- instdir/program/classes/jurt.jar
- instdir/program/classes/juh.jar
- instdir/program/classes/java_uno.jar
- sd/res/buttons/*.zip
- solenv/gbuild/empty.zip
scandelete:
- external
build:
- pushd "../../external/tarballs/extracted/"
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do pushd "${ARCHIVE}"; tar -caf
"../../${ARCHIVE}" *; popd; done
- for ARCHIVE in *.zip; do pushd "${ARCHIVE}"; zip -r "../../${ARCHIVE}" *;
popd; done
- popd
- cd ../../
- rm -rf workdir instdir
- make
ndk: 23.2.8568313
- versionName: 7.6.0.3/69edd8b8ebc4/F-Droid-editing
versionCode: 24
commit: libreoffice-7.6.0.3
timeout: 43200
subdir: android/source
sudo:
- apt-get update
- apt-get install -y ant ant-optional autoconf automake bison build-essential
flex gperf junit4 nasm python3-dev libfontconfig1-dev libnss3-dev libservlet-api-java
libxml2-utils libxslt1-dev xsltproc
gradle:
- StrippedUIEditing
rm:
- onlineupdate/qa/*
- oox/qa/unit/data/*
- package/qa/cppunit/data/*
- qadevOOo/testdocs/qadevlibs/*.jar
- setup_native/source/packinfo/DS_Store*
- svx/qa/unit/data/*
- sw/qa/extras/ww8import/data/*
- test/signing-keys/random_seed
- testtools/source/cliversioning/version_libs/*.dll
- writerperfect/qa/unit/data/*
prebuild:
- pushd ../../
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/rm /d' -e '/gradlew/d' android/source/Makefile
- sed -i -e '/maven {/I,+2 d' android/source/build.gradle
- sed -i -e '/opencl.openclwrapper.hxx/d' -i -e 's/bOpenCL = .*;$/bOpenCL =
false;/' cui/source/dialogs/about.cxx
- sed -i -e '/desktop\/source\/app\/opencl/d' desktop/Library_sofficeapp.mk
- rm desktop/source/app/opencl.cxx
- sed -i '/"horst"/d' javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/JAVA_HOME=/i CLASSPATH=/usr/share/java/servlet-api.jar \\' external/hsqldb/ExternalProject_hsqldb.mk
- ./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice"
--with-android-ndk=$$NDK$$ --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroid
--enable-android-editing --disable-dconf --with-build-platform-configure-options="--with-system-jpeg=no
--with-system-libxml=no --disable-dbus --disable-gconf --disable-python --disable-gui
--disable-gtk --disable-gstreamer-1.0"
- make fetch
- pushd external/tarballs
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do mkdir -p "extracted/${ARCHIVE}";
tar -C "extracted/${ARCHIVE}" -xaf "${ARCHIVE}"; rm "${ARCHIVE}"; done
- for ARCHIVE in *.zip; do mkdir -p "extracted/${ARCHIVE}"; unzip -d "extracted/${ARCHIVE}"
"${ARCHIVE}"; rm "${ARCHIVE}"; done
- popd
- mkdir -p instdir/program/classes/
- cd $_
- touch java_uno.jar juh.jar jurt.jar ridl.jar unoloader.jar unoil.jar
- popd
- make liboSettings.gradle versionCode=24
scanignore:
- external/lcms2/lcms2_sln
- instdir/program/classes/unoloader.jar
- instdir/program/classes/ridl.jar
- instdir/program/classes/unoil.jar
- instdir/program/classes/jurt.jar
- instdir/program/classes/juh.jar
- instdir/program/classes/java_uno.jar
- sd/res/buttons/*.zip
- solenv/gbuild/empty.zip
scandelete:
- external
build:
- pushd "../../external/tarballs/extracted/"
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do pushd "${ARCHIVE}"; tar -caf
"../../${ARCHIVE}" *; popd; done
- for ARCHIVE in *.zip; do pushd "${ARCHIVE}"; zip -r "../../${ARCHIVE}" *;
popd; done
- popd
- cd ../../
- rm -rf workdir instdir
- make
ndk: 23.2.8568313
- versionName: 7.6.0.3/69edd8b8ebc4/F-Droid-editing
versionCode: 25
commit: libreoffice-7.6.0.3
timeout: 43200
subdir: android/source
sudo:
- apt-get update
- apt-get install -y ant ant-optional autoconf automake bison build-essential
flex gperf junit4 nasm python3-dev libfontconfig1-dev libnss3-dev libservlet-api-java
libxml2-utils libxslt1-dev xsltproc
gradle:
- StrippedUIEditing
rm:
- onlineupdate/qa/*
- oox/qa/unit/data/*
- package/qa/cppunit/data/*
- qadevOOo/testdocs/qadevlibs/*.jar
- setup_native/source/packinfo/DS_Store*
- svx/qa/unit/data/*
- sw/qa/extras/ww8import/data/*
- test/signing-keys/random_seed
- testtools/source/cliversioning/version_libs/*.dll
- writerperfect/qa/unit/data/*
prebuild:
- pushd ../../
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/rm /d' -e '/gradlew/d' android/source/Makefile
- sed -i -e '/maven {/I,+2 d' android/source/build.gradle
- sed -i -e '/opencl.openclwrapper.hxx/d' -i -e 's/bOpenCL = .*;$/bOpenCL =
false;/' cui/source/dialogs/about.cxx
- sed -i -e '/desktop\/source\/app\/opencl/d' desktop/Library_sofficeapp.mk
- rm desktop/source/app/opencl.cxx
- sed -i '/"horst"/d' javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
- sed -i -e '/debug/d' android/CustomTarget_lo_android.mk
- sed -i -e '/JAVA_HOME=/i CLASSPATH=/usr/share/java/servlet-api.jar \\' external/hsqldb/ExternalProject_hsqldb.mk
- ./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice"
--with-android-ndk=$$NDK$$ --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidAarch64
--enable-android-editing --disable-dconf --with-build-platform-configure-options="--with-system-jpeg=no
--with-system-libxml=no --disable-dbus --disable-gconf --disable-python --disable-gui
--disable-gtk --disable-gstreamer-1.0"
- make fetch
- pushd external/tarballs
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do mkdir -p "extracted/${ARCHIVE}";
tar -C "extracted/${ARCHIVE}" -xaf "${ARCHIVE}"; rm "${ARCHIVE}"; done
- for ARCHIVE in *.zip; do mkdir -p "extracted/${ARCHIVE}"; unzip -d "extracted/${ARCHIVE}"
"${ARCHIVE}"; rm "${ARCHIVE}"; done
- popd
- mkdir -p instdir/program/classes/
- cd $_
- touch java_uno.jar juh.jar jurt.jar ridl.jar unoloader.jar unoil.jar
- popd
- make liboSettings.gradle versionCode=25
scanignore:
- external/lcms2/lcms2_sln
- instdir/program/classes/unoloader.jar
- instdir/program/classes/ridl.jar
- instdir/program/classes/unoil.jar
- instdir/program/classes/jurt.jar
- instdir/program/classes/juh.jar
- instdir/program/classes/java_uno.jar
- sd/res/buttons/*.zip
- solenv/gbuild/empty.zip
scandelete:
- external
build:
- pushd "../../external/tarballs/extracted/"
- for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz}; do pushd "${ARCHIVE}"; tar -caf
"../../${ARCHIVE}" *; popd; done
- for ARCHIVE in *.zip; do pushd "${ARCHIVE}"; zip -r "../../${ARCHIVE}" *;
popd; done
- popd
- cd ../../
- rm -rf workdir instdir
- make
ndk: 23.2.8568313
MaintainerNotes: |-
To fix crashes on Tegra2 device, we might need to `sed -i -e 's/mfpu=neon/mfpu=vfpv3-d16/g' configure.ac`, but this might have consequences for other devices. Since we use our own versioncodes, maybe have a third flavor?
@ -836,13 +1140,11 @@ MaintainerNotes: |-
External libraries/tarballs are downloaded using the `make fetch` command and extracted in prebuild, so that they are scanned as well and unwanted binaries are removed during the scan. They're re-packed again to the original location where the LibreOffice build system expects them in the build step (i.e. after scanning).
Compilation success is quite sensitive to the commit used in my experience. It's probably best to check Google Play and note the commit hash used in the version number. Other tagged versions may fail.
For the build of the HSQLDB external, the Java classpath is explicitly set to use the system-provided Java Servlet API jar, because the one contained in the HSQLDB tarball that is usually used is deleted as binary during the scan.
The cd/mkdir/touch commands near the end of the prebuild are to enable fdroid to run the project clean command, which expects these dependencies.
The last line sets the version code. Make sure this is correct (i.e. matches what Google Play says). The version needs to be in the format a.b.c.d<blah>/<commit hash>/<vendor>. Crucially, without the right portion of the commit hash, it will fail at the end of the build with "unexpected version/version code".
The last line sets the version code. Make sure this is correct. The version needs to be in the format a.b.c.d<blah>/<commit hash>/<vendor>. Crucially, without the right portion of the commit hash, it will fail at the end of the build with "unexpected version/version code".
In the build section, the touch-ed files from the prebuild are removed before making the libreoffice core.
@ -851,5 +1153,5 @@ MaintainerNotes: |-
ArchivePolicy: 12
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: 7.6.0.0.alpha1+/5c1c768e128d/F-Droid-editing
CurrentVersionCode: 21
CurrentVersion: 7.6.0.3/69edd8b8ebc4/F-Droid-editing
CurrentVersionCode: 25