From 6f54fb3c915c0a96beca3b2d5798f2664c11f09a Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 23 Feb 2024 10:24:49 +0100 Subject: [PATCH] LibreOffice Viewer: Update to 7.6.5 Update to new release 7.6.5 and adjust the versionName to just use the version number and drop the comment in the maintainer notes about a part of the commit hash and the vendor being part of the versionName. This is no longer the case since LibreOffice commit [1], which also removes one aspect previously making it impossible to use the automatic update mechanism. (The versionCode is still only set via an environment variable during the build and not retrievable another way, so that still prevents switching to the automatic update mechanism at the moment.) [1] https://git.libreoffice.org/core/commit/35b7aa3a865eda90bec945ac2e11b20a75a37bd6 --- .../org.documentfoundation.libreoffice.yml | 278 +++++++++++++++++- 1 file changed, 274 insertions(+), 4 deletions(-) diff --git a/metadata/org.documentfoundation.libreoffice.yml b/metadata/org.documentfoundation.libreoffice.yml index edc54157aa..ef2f6f1a61 100644 --- a/metadata/org.documentfoundation.libreoffice.yml +++ b/metadata/org.documentfoundation.libreoffice.yml @@ -2045,6 +2045,278 @@ Builds: - make ndk: 23.2.8568313 + - versionName: 7.6.5.2 + versionCode: 40 + commit: libreoffice-7.6.5.2 + 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 '/rm /d' -e '/gradlew/d' android/source/Makefile + - sed -i -e '/maven {/I,+2 d' android/source/build.gradle + - 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 + - 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=$$VERCODE$$ + 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.5.2 + versionCode: 41 + commit: libreoffice-7.6.5.2 + 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 '/rm /d' -e '/gradlew/d' android/source/Makefile + - sed -i -e '/maven {/I,+2 d' android/source/build.gradle + - 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 + - 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=$$VERCODE$$ + 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.5.2 + versionCode: 42 + commit: libreoffice-7.6.5.2 + 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 '/rm /d' -e '/gradlew/d' android/source/Makefile + - sed -i -e '/maven {/I,+2 d' android/source/build.gradle + - 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 + - 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=$$VERCODE$$ + 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.5.2 + versionCode: 43 + commit: libreoffice-7.6.5.2 + 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 '/rm /d' -e '/gradlew/d' android/source/Makefile + - sed -i -e '/maven {/I,+2 d' android/source/build.gradle + - 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 + - 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=$$VERCODE$$ + 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? @@ -2056,8 +2328,6 @@ MaintainerNotes: |- 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 version needs to be in the format a.b.c.d//. 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. The libreoffice build scripts spit out warning about the NDK version, so keep an eye out to make sure you have the right one. It's usually pretty recent. @@ -2067,5 +2337,5 @@ MaintainerNotes: |- ArchivePolicy: 12 AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 7.6.4.1/e19e193f88cd/F-Droid -CurrentVersionCode: 38 +CurrentVersion: 7.6.5.2 +CurrentVersionCode: 43