commit 53e21676fcaf3b657b8f3152a8b688c4cf5c0b39 Author: Tim Biermann <tbier@posteo.de> Date: Tue Dec 1 23:22:00 2020 +0000 libreoffice: 7.0.3.1 -> 7.0.4.1 diff --git a/libreoffice/.signature b/libreoffice/.signature index 877534b9e..ded6a4a11 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,13 +1,12 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30MsgukDQVdLzDd6lIT+RkpPrHgvQjuf/3fF61a/sZnoLcNbPXjB2SLyqoTNwKCfPpiM1N4Fv18dq+iyb2NYlgA= -SHA256 (Pkgfile) = dc2f569c8a4539622cf7a8ed90bffd631e241c44751f65431697d4d87b1d2a9a +RWSagIOpLGJF3wysDk17HvmLYlz2ase3EjimjPoudY+ZPRnqLYFtXlYaiJ2ssNYM7F9quOEC5Pk2MRF4lTMDr7UEw2WL3/3L/AQ= +SHA256 (Pkgfile) = 8f58b6be7db5c0d50a06f68dc9cc2d3be892e2f543a996a9aaf7db63352521db SHA256 (.footprint) = 413126b9fb6905484606a1cb4c613cc9cec56387f3cb203a04463404caafdba0 -SHA256 (libreoffice-7.0.3.1.tar.xz) = 6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d -SHA256 (libreoffice-dictionaries-7.0.3.1.tar.xz) = 959001bc692a67fd65296a0f33179a33414c0754182908396756849da1fee034 +SHA256 (libreoffice-7.0.4.1.tar.xz) = 8f568ea2ee297b6fbd5d93ac433f4715c50856347529e595f144ccd9c0c7d230 +SHA256 (libreoffice-dictionaries-7.0.4.1.tar.xz) = 620ca8dad1c101ba35ba5a6fd8473cd8cb4001a19a443f7d022a3626f5c03d32 SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 SHA256 (skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz) = 3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760 -SHA256 (pdfium-4137.tar.bz2) = 9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6 +SHA256 (pdfium-4306.tar.bz2) = eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8 SHA256 (makefile.in.patch) = 88856d163b66cecf7a5cb4dc6d46a95ec07b21569b26e90cf8d5e82ce684b332 -SHA256 (libreoffice-6.4.7.2-icu-68-1.patch) = 89d278a4fd5aea2873378e4da751abf543345aadf94c681e681269dd53b74010 diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index e83a5bb9b..0440ace9b 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -5,18 +5,16 @@ # Optional: cups kio qt5 valgrind vlc name=libreoffice -version=7.0.3.1 +version=7.0.4.1 release=1 -pdfiumversion=4137 +pdfiumversion=4306 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/... https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/... https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unow... https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.... https://dev-www.libreoffice.org/src/dtoa-20180411.tgz https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f7... - https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2 makefile.in.patch - # https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/libreoffice/files - libreoffice-6.4.7.2-icu-68-1.patch) + https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2 makefile.in.patch) unpack_source() { for file in ${source[@]}; do @@ -48,8 +46,6 @@ build() { cd $name-$version patch -Np1 -i $SRC/makefile.in.patch - [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \ - patch -Np1 -i $SRC/libreoffice-6.4.7.2-icu-68-1.patch find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libreoffice/libreoffice-6.4.7.2-icu-68-1.patch b/libreoffice/libreoffice-6.4.7.2-icu-68-1.patch deleted file mode 100644 index fe20e3435..000000000 --- a/libreoffice/libreoffice-6.4.7.2-icu-68-1.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <rene@debian.org> -Date: Sun, 1 Nov 2020 18:30:49 +0100 -Subject: fix build with ICU 68 - -use standard true. - -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope - 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); - | ^~~~ - -/usr/include/unicode/umachine.h says: - -@deprecated ICU 68 Use standard "true" instead. - -Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 -Tested-by: Jenkins -Reviewed-by: Eike Rathke <erack@redhat.com> ---- - i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx -index b7ae49fbd96e..59ee46fa0e0f 100644 ---- a/i18npool/source/calendar/calendar_gregorian.cxx -+++ b/i18npool/source/calendar/calendar_gregorian.cxx -@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) - "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); - int32_t nZoneOffset, nDSTOffset; - UErrorCode status = U_ZERO_ERROR; -- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); -+ body->getTimeZone().getOffset( fR, -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ true, -+#else -+ TRUE, -+#endif -+ nZoneOffset, nDSTOffset, status ); -+ - if ( !U_SUCCESS(status) ) throw ERROR; - status = U_ZERO_ERROR; - body->setTime( fR - (nZoneOffset + nDSTOffset), status ); --- -cgit v1.2.1