forked from ports/contrib
libreoffice: 7.4.4.1 -> 7.5.0.1
This commit is contained in:
parent
c7033eb688
commit
157bba1b26
File diff suppressed because it is too large
Load Diff
@ -1,12 +1,11 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF3wEpjxUoWQ+th7asYS/AwY1pQkKJoujyIMAtTXmEW/2qdGMD3iULQS1J6lPA25wHST53Hu06ZH4YkAO7p5uVhgU=
|
||||
SHA256 (Pkgfile) = cf69dafd8aeb9285863ac87d2669e237d664fa51d9bd046633e62f663b5f3a35
|
||||
SHA256 (.footprint) = 7b3b507c326a1720a5a71b8b15c286fc1c67cc546e42aac790b71e3842441c98
|
||||
SHA256 (libreoffice-7.4.4.1.tar.xz) = 2c51d60eb6b1e27782a312aec57768ea29fbb0156362fc04f5134e2cfe5439f1
|
||||
SHA256 (libreoffice-dictionaries-7.4.4.1.tar.xz) = 17d1f19fb7a3f3a11fdc910b287ee02f83afa66e380b7dddd288b41c3b969148
|
||||
RWSagIOpLGJF3wkDVrYto817+BEWUfdfuQDi/QGU6/pqVdsS9NJTwaMbDdJ3pLL/AVp7uZyTBV0G9q8GA+5YxLLobJ5jdWEBkwo=
|
||||
SHA256 (Pkgfile) = 8286f6c33f7e23171d04ca8eebb7f0ff6731cacb39567a99721e28761aa0ac51
|
||||
SHA256 (.footprint) = 3e6ae8e1792f59bd1f8ab29f6acb9df338de87141411f2db0d6374050a7f1057
|
||||
SHA256 (libreoffice-7.5.0.1.tar.xz) = 677eff537dde9a5d0637ed68cc573ba97aa9c619dfb39e32e167777f680dc6b3
|
||||
SHA256 (libreoffice-dictionaries-7.5.0.1.tar.xz) = af306730e93b6e4936147d0af3bda58d7725e8af4cd54b627aae4cd47e46a5a6
|
||||
SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
|
||||
SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
|
||||
SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
|
||||
SHA256 (pdfium-5058.tar.bz2) = eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac
|
||||
SHA256 (boost.patch) = de94a55ae3fbad001106b44a93b775f82e926814dd014d2e539d3a81655ed3bc
|
||||
SHA256 (makefile.in.patch) = 03f1b534fac16aadf273533836fae5c8e591200c95db48fe58aa0e2635a31c56
|
||||
SHA256 (pdfium-5408.tar.bz2) = 7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35
|
||||
SHA256 (makefile.in.patch) = b4889affa4d2f8dac4e3c16c0a142fd0d403ecbb7a1c00ed593128dd613b737a
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
# Optional: avahi coin-or-mp cups gpgme kio lpsolve mariadb openldap postgresql python3-lxml qt5 sane valgrind
|
||||
|
||||
name=libreoffice
|
||||
version=7.4.4.1
|
||||
version=7.5.0.1
|
||||
release=1
|
||||
pdfiumversion=5058
|
||||
pdfiumversion=5408
|
||||
source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-$version.tar.xz
|
||||
https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-dictionaries-$version.tar.xz
|
||||
https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
@ -16,7 +16,6 @@ source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/
|
||||
#https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
|
||||
https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2
|
||||
#https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz
|
||||
boost.patch
|
||||
makefile.in.patch)
|
||||
|
||||
# unpack_source() {{{
|
||||
@ -51,7 +50,6 @@ build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -Np1 -i $SRC/makefile.in.patch
|
||||
patch -Np1 -i $SRC/boost.patch
|
||||
sed -i 's:application/pdf;::g' sysui/desktop/menus/draw.desktop
|
||||
sed -i 's:text/plain;::g' sysui/desktop/menus/writer.desktop
|
||||
sed -i 's:dragonbox-1.0.0:dragonbox:g' configure.ac
|
||||
@ -61,6 +59,7 @@ build() {
|
||||
prt-get isinst avahi && PKGMK_LIBREOFFICE+=' --enable-avahi' || PKGMK_LIBREOFFICE+=' --disable-avahi'
|
||||
#prt-get isinst box2d && PKGMK_LIBREOFFICE+=' --with-system-box2d' || PKGMK_LIBREOFFICE+=' --without-system-box2d'
|
||||
#prt-get isinst ccache && PKGMK_LIBREOFFICE+=' --enable-ccache' || PKGMK_LIBREOFFICE+=' --disable-ccache'
|
||||
prt-get isinst ccache && export PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
|
||||
prt-get isinst ccache && export CCACHE_CPP2=1
|
||||
#prt-get isinst clucene && PKGMK_LIBREOFFICE+=' --with-system-clucene' || PKGMK_LIBREOFFICE+=' --without-system-clucene'
|
||||
prt-get isinst coin-or-mp && PKGMK_LIBREOFFICE+=' --with-system-coinmp' || PKGMK_LIBREOFFICE+=' --disable-coinmp'
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 23dcd4339428e4080029ec5ae658e75f01e79a62 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
|
||||
<congdanhqx@gmail.com>
|
||||
Date: Sun, 27 Nov 2022 18:59:24 +0700
|
||||
Subject: i18n: fix build with Boost 1.81.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Boost.Locale since 1.81.0 switch to enum classes for facet type [1].
|
||||
Switch our resource manager accordingly.
|
||||
|
||||
1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1
|
||||
|
||||
Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343
|
||||
Reviewed-by: Heiko Becker <heirecka@exherbo.org>
|
||||
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
||||
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
||||
---
|
||||
unotools/source/i18n/resmgr.cxx | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
|
||||
index ddedf5b9e8a2..3a7116350062 100644
|
||||
--- a/unotools/source/i18n/resmgr.cxx
|
||||
+++ b/unotools/source/i18n/resmgr.cxx
|
||||
@@ -127,8 +127,13 @@ namespace Translate
|
||||
if (aFind != aCache.end())
|
||||
return aFind->second;
|
||||
boost::locale::generator gen;
|
||||
+#if BOOST_VERSION < 108100
|
||||
gen.characters(boost::locale::char_facet);
|
||||
gen.categories(boost::locale::message_facet | boost::locale::information_facet);
|
||||
+#else
|
||||
+ gen.characters(boost::locale::char_facet_t::char_f);
|
||||
+ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information);
|
||||
+#endif
|
||||
#if defined(ANDROID)
|
||||
OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
|
||||
#else
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@ -1,21 +1,19 @@
|
||||
diff -Naur libreoffice-7.3.0.2.orig/Makefile.in libreoffice-7.3.0.2/Makefile.in
|
||||
--- libreoffice-7.3.0.2.orig/Makefile.in 2022-01-12 20:09:02.000000000 +0100
|
||||
+++ libreoffice-7.3.0.2/Makefile.in 2022-01-17 09:52:51.876539962 +0100
|
||||
diff -Naur libreoffice-7.5.0.1.old/Makefile.in libreoffice-7.5.0.1/Makefile.in
|
||||
--- libreoffice-7.5.0.1.old/Makefile.in 2022-12-28 10:49:24.815353715 +0000
|
||||
+++ libreoffice-7.5.0.1/Makefile.in 2022-12-28 10:50:18.325920089 +0000
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
|
||||
|
||||
-.PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
|
||||
+.PHONY : bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
|
||||
-.PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo coverage internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
|
||||
+.PHONY : bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo coverage internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
|
||||
|
||||
MAKECMDGOALS?=build
|
||||
build_goal:=$(if $(filter build build-nocheck uicheck,$(MAKECMDGOALS)),build)\
|
||||
@@ -58,18 +58,6 @@
|
||||
build_goal:=$(if $(filter build uicheck,$(MAKECMDGOALS)),build)\
|
||||
@@ -61,16 +61,6 @@
|
||||
|
||||
.DEFAULT_GOAL := build
|
||||
|
||||
-# Nested test is to check if the systemd-detect-virt command doesn't exist or it reports we're not
|
||||
-# in a container:
|
||||
# Nested test is to check if the systemd-detect-virt command doesn't exist or it reports we're not
|
||||
# in a container:
|
||||
-check-if-root:
|
||||
- @if test ! `uname` = 'Haiku' -a `id -u` = 0; then \
|
||||
- if test ! -x "$$(command -v systemd-detect-virt)" || ! systemd-detect-virt -c -q; then \
|
||||
@ -29,7 +27,7 @@ diff -Naur libreoffice-7.3.0.2.orig/Makefile.in libreoffice-7.3.0.2/Makefile.in
|
||||
gb_Side ?= host
|
||||
|
||||
include $(BUILDDIR)/config_$(gb_Side).mk
|
||||
@@ -275,7 +263,7 @@
|
||||
@@ -276,7 +266,7 @@
|
||||
#
|
||||
# Bootstrap
|
||||
#
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user