sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (590f07d8937bc2579d84f8776d777a6b9b9a06e3)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (590f07d8937bc2579d84f8776d777a6b9b9a06e3)
- Date: Sun, 2 Feb 2025 10:01:41 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
editors/libreoffice/BUILD | 7 +++++--
editors/libreoffice/DEPENDS | 10 +++++++---
editors/libreoffice/DETAILS | 14 +++++++-------
editors/libreoffice/HISTORY | 4 ++++
4 files changed, 23 insertions(+), 12 deletions(-)
New commits:
commit 590f07d8937bc2579d84f8776d777a6b9b9a06e3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libreoffice 25.2.0.3
diff --git a/editors/libreoffice/BUILD b/editors/libreoffice/BUILD
index c5c1b87..f8656fe 100755
--- a/editors/libreoffice/BUILD
+++ b/editors/libreoffice/BUILD
@@ -1,4 +1,4 @@
-# FIXME ccache doesn't work with user "nobody"
+# Use our own wrappers instead of libreoffice's buildsystem support
OPTS+=' --disable-ccache' &&
# Release build type
OPTS+=' --enable-release-build' &&
@@ -11,9 +11,11 @@ OPTS+=' --disable-extension-update
--enable-readonly-installset' &&
CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1' &&
+install -o nobody -d "$CCACHE_DIR" &&
cd "$SOURCE_DIRECTORY.build" &&
# XXX bails out if you try to build as root
chown nobody . &&
+export LO_PATH_FOR_BUILD="$PATH" &&
su nobody -s /bin/sh -c "
\"$SOURCE_DIRECTORY\"/configure \
--prefix=\"$INSTALL_ROOT\"/usr \
@@ -25,5 +27,6 @@ su nobody -s /bin/sh -c "
--host=\"$HOST\" \
--with-vendor=\"SourceMage\" \
$OPTS $LIBREOFFICE_OPTS &&
-make -j$MAKE_NJOBS
+gmake -j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS)) \
+ CCACHE_DIR='$CCACHE_DIR'
"
diff --git a/editors/libreoffice/DEPENDS b/editors/libreoffice/DEPENDS
index 47f399b..636a4c3 100755
--- a/editors/libreoffice/DEPENDS
+++ b/editors/libreoffice/DEPENDS
@@ -3,7 +3,7 @@ case "$HOST" in
depends libexecinfo
;;
esac &&
-# FIXME clang dep required for branch 7.3; remove on update
+# FIXME clang dep required for branch 25.2; test and remove on update
depends -sub CLANG llvm 'CXX=clang++ CC=clang' &&
depends -sub 'DATE_TIME FILESYSTEM IOSTREAMS LOCALE' boost &&
depends JPEG &&
@@ -11,9 +11,11 @@ depends abseil-cpp &&
depends apr &&
depends box2d &&
depends -sub CONTRIBS clucene &&
+depends dragonbox &&
depends expat &&
depends fontconfig &&
depends freetype2 &&
+depends frozen &&
depends graphite2 &&
depends harfbuzz &&
depends hunspell &&
@@ -23,6 +25,7 @@ depends lcms2 &&
depends libatomic_ops &&
depends libcuckoo &&
depends libexttextcat && # for language guessing
+depends libfixmath &&
depends libnumbertext && # for NUMBERTEXT and MONEYTEXT functions for Calc
depends libpng &&
depends libtommath &&
@@ -30,9 +33,9 @@ depends libxml2 &&
depends mdds &&
depends mythes &&
depends python3 --enable-python=system &&
-depends ucpp --with-system-ucpp &&
depends xmlsec &&
depends zlib &&
+depends zxcvbn-c &&
# QA
depends cppunit --with-system-cppunit && # FIXME make optional
@@ -90,7 +93,8 @@ optional_depends avahi \
--{enable,disable}-avahi \
'to advertise Impress to remote controls' &&
optional_depends libcmis \
- --{enable,disable}-cmis \
+ --enable-libcmis \
+ --disable-libcmis \
'for CMIS protocol support' &&
optional_depends cups \
--{enable,disable}-cups \
diff --git a/editors/libreoffice/DETAILS b/editors/libreoffice/DETAILS
index 7d660ec..9b0f792 100755
--- a/editors/libreoffice/DETAILS
+++ b/editors/libreoffice/DETAILS
@@ -1,16 +1,16 @@
# Watch: https://download.documentfoundation.org/libreoffice/src/
release-([0-9.]+)\.log
SPELL=libreoffice
- VERSION=7.3.0.3
-
SOURCE_HASH=sha512:408b98184afc0721f922768f60e877fd756b656b4fd30cf6ad629bd32ba323fb1f4b052c8427b11395253b4ed67f9a1fd20ef3f7fd5945abc0f8cfb1f40c5d47
+ VERSION=25.2.0.3
+
SOURCE_HASH=sha512:0a39ff7f66c5def0d5a029267949b2f8001543f0b269c628d2285ac7dc62699f2258fc788a7220fca91a7af347a6ded8a4220b255906c817906e51e3a05f3031
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]="https://download.documentfoundation.org/$SPELL/src/${VERSION%.*}/$SOURCE"
addon_url="https://dev-www.libreoffice.org/src"
SOURCE2_HASH=sha512:722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
SOURCE2=dtoa-20180411.tgz
-
SOURCE3_HASH=sha512:530c035a50848eecd292f4fd564bfd8059b47beda0f670e1ccb69e0d2b368e4e73f012bb37526db478549ade1f818c187f0c38b1f8d97c77bdbedf5a50127b67
- SOURCE3=pdfium-4699.tar.bz2
-
SOURCE4_HASH=sha512:fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
- SOURCE4=skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
+
SOURCE3_HASH=sha512:5987bf6b3beefb4726f82ed35a25cbfe67e901f747c44cc2022e2172b1cf5d7e7c9e4f07242c2a46fc3c0aacf3fc6e79548d78e92616f15e348c3286d9bc04cb
+ SOURCE3=pdfium-6764.tar.bz2
+
SOURCE4_HASH=sha512:8739b2e8b578accae14928473fb479d7014e9181dc7f363230282d4282f950f1006b2bcd746c12028fb86aeffdfd7d837435d09480cfe94714e81f8365dcf954
+ SOURCE4=skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz
SOURCE5_HASH=sha512:6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b
SOURCE5=f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
SOURCE2_URL[0]="$addon_url/$SOURCE2"
@@ -18,7 +18,7 @@
SOURCE4_URL[0]="$addon_url/$SOURCE4"
SOURCE5_URL[0]="$addon_url/$SOURCE5"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- CCACHE=off # FIXME can't use /var/cache/compiler when not root
+ CCACHE_DIR="$BUILD_DIRECTORY/$SPELL.ccache"
TMPFS=off # XXX uses a lot of space
LICENSE[0]=MPL-2.0
LICENSE[1]=LGPL-3.0-or-later
diff --git a/editors/libreoffice/HISTORY b/editors/libreoffice/HISTORY
index a2365e9..bf0a17a 100644
--- a/editors/libreoffice/HISTORY
+++ b/editors/libreoffice/HISTORY
@@ -1,3 +1,7 @@
+2025-02-02 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: updated spell to 25.2.0.3
+ * BUILD, DETAILS: enabled ccache & distcc/icecream
+
2022-03-16 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: fixed typo in boost subdep
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (590f07d8937bc2579d84f8776d777a6b9b9a06e3), Ismael Luceno, 02/02/2025
Archive powered by MHonArc 2.6.24.