From eed9200fa2de1ac5103eb5117d95c7f3bf976ab1 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 7 Jun 2024 06:03:57 +0000 Subject: [PATCH] LibreOffice Viewer: Update to 24.2.4 --- .../org.documentfoundation.libreoffice.yml | 270 +++++++++++++++++- 1 file changed, 258 insertions(+), 12 deletions(-) diff --git a/metadata/org.documentfoundation.libreoffice.yml b/metadata/org.documentfoundation.libreoffice.yml index ffdff80555..c91b4fb470 100644 --- a/metadata/org.documentfoundation.libreoffice.yml +++ b/metadata/org.documentfoundation.libreoffice.yml @@ -2534,8 +2534,8 @@ Builds: 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 + - 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 unzip xsltproc zip gradle: - StrippedUIEditing @@ -2602,8 +2602,8 @@ Builds: 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 + - 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 unzip xsltproc zip gradle: - StrippedUIEditing @@ -2670,8 +2670,8 @@ Builds: 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 + - 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 unzip xsltproc zip gradle: - StrippedUIEditing @@ -2738,8 +2738,8 @@ Builds: 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 + - 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 unzip xsltproc zip gradle: - StrippedUIEditing @@ -2799,6 +2799,254 @@ Builds: - make ndk: 23.2.8568313 + - versionName: 24.2.4.2 + versionCode: 56 + commit: libreoffice-24.2.4.2 + timeout: 43200 + subdir: android/source + sudo: + - apt-get update + - apt-get install -y 7zip 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 unzip xsltproc zip + gradle: + - StrippedUIEditing + rm: + - external/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,zip}; do mkdir -p "extracted/${ARCHIVE}"; + 7z x -o"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: + - 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 + - solenv/gbuild/empty.zip + scandelete: + - external + build: + - pushd "../../external/tarballs/extracted/" + - for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz,zip}; do pushd "${ARCHIVE}"; 7z + a "../../${ARCHIVE}" *; popd; done + - popd + - cd ../../ + - rm -rf workdir instdir + - make versionCode=$$VERCODE$$ + ndk: 25.1.8937393 + + - versionName: 24.2.4.2 + versionCode: 57 + commit: libreoffice-24.2.4.2 + timeout: 43200 + subdir: android/source + sudo: + - apt-get update + - apt-get install -y 7zip 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 unzip xsltproc zip + gradle: + - StrippedUIEditing + rm: + - external/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,zip}; do mkdir -p "extracted/${ARCHIVE}"; + 7z x -o"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: + - 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 + - solenv/gbuild/empty.zip + scandelete: + - external + build: + - pushd "../../external/tarballs/extracted/" + - for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz,zip}; do pushd "${ARCHIVE}"; 7z + a "../../${ARCHIVE}" *; popd; done + - popd + - cd ../../ + - rm -rf workdir instdir + - make versionCode=$$VERCODE$$ + ndk: 25.1.8937393 + + - versionName: 24.2.4.2 + versionCode: 58 + commit: libreoffice-24.2.4.2 + timeout: 43200 + subdir: android/source + sudo: + - apt-get update + - apt-get install -y 7zip 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 unzip xsltproc zip + gradle: + - StrippedUIEditing + rm: + - external/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,zip}; do mkdir -p "extracted/${ARCHIVE}"; + 7z x -o"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: + - 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 + - solenv/gbuild/empty.zip + scandelete: + - external + build: + - pushd "../../external/tarballs/extracted/" + - for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz,zip}; do pushd "${ARCHIVE}"; 7z + a "../../${ARCHIVE}" *; popd; done + - popd + - cd ../../ + - rm -rf workdir instdir + - make versionCode=$$VERCODE$$ + ndk: 25.1.8937393 + + - versionName: 24.2.4.2 + versionCode: 59 + commit: libreoffice-24.2.4.2 + timeout: 43200 + subdir: android/source + sudo: + - apt-get update + - apt-get install -y 7zip 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 unzip xsltproc zip + gradle: + - StrippedUIEditing + rm: + - external/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,zip}; do mkdir -p "extracted/${ARCHIVE}"; + 7z x -o"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: + - 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 + - solenv/gbuild/empty.zip + scandelete: + - external + build: + - pushd "../../external/tarballs/extracted/" + - for ARCHIVE in *.{tar.bz2,tar.gz,tar.xz,tgz,zip}; do pushd "${ARCHIVE}"; 7z + a "../../${ARCHIVE}" *; popd; done + - popd + - cd ../../ + - rm -rf workdir instdir + - make versionCode=$$VERCODE$$ + ndk: 25.1.8937393 + 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? @@ -2812,12 +3060,10 @@ MaintainerNotes: |- 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. - Currently, the automatic update (check) mechanism can't be used since the versionCode is only set via an environment variable during the build. ArchivePolicy: 12 AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 7.6.7.2 -CurrentVersionCode: 55 +CurrentVersion: 24.2.4.2 +CurrentVersionCode: 59