extra/libreoffice-fresh to 24.8.0-1

This commit is contained in:
Kevin Mihelich 2024-08-22 12:56:30 +00:00
parent 4c523141d4
commit 185fa585d0
5 changed files with 46 additions and 333 deletions

View file

@ -1,6 +1,6 @@
pkgbase = libreoffice-fresh
pkgver = 24.2.5
pkgrel = 2
pkgver = 24.8.0
pkgrel = 1
url = https://www.libreoffice.org/
arch = x86_64
license = MPL-2.0
@ -26,7 +26,7 @@ pkgbase = libreoffice-fresh
makedepends = icu
makedepends = libxslt
makedepends = lcms2
makedepends = poppler>=0.24.0
makedepends = poppler
makedepends = libvisio
makedepends = libetonyek
makedepends = libodfgen
@ -51,6 +51,7 @@ pkgbase = libreoffice-fresh
makedepends = qt5-base
makedepends = qt5-x11extras
makedepends = qt6-base
makedepends = qt6-multimedia
makedepends = kio
makedepends = kconfig
makedepends = kcoreaddons
@ -103,15 +104,14 @@ pkgbase = libreoffice-fresh
makedepends = box2d
makedepends = git
makedepends = python-setuptools
noextract = 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
noextract = 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
makedepends = rhino
noextract = a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
noextract = 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
noextract = language-subtag-registry-2021-03-05.tar.bz2
noextract = 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
noextract = d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
noextract = ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
noextract = pdfium-6179.tar.bz2
noextract = pdfium-6425.tar.bz2
noextract = dtoa-20180411.tgz
noextract = lxml-4.1.1.tgz
noextract = Firebird-3.0.7.33374-0.tar.bz2
@ -119,26 +119,24 @@ pkgbase = libreoffice-fresh
noextract = dragonbox-1.1.3.tar.gz
noextract = frozen-1.1.1.tar.gz
noextract = zxcvbn-c-2.5.tar.gz
noextract = Java-WebSocket-1.5.4.tar.gz
noextract = Java-WebSocket-1.5.6.tar.gz
noextract = 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
noextract = odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
options = !lto
source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz.asc
source = https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
source = https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
source = https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-24.8.0.3.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-24.8.0.3.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-help-24.8.0.3.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-help-24.8.0.3.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-translations-24.8.0.3.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-translations-24.8.0.3.tar.xz.asc
source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
source = https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
source = https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2
source = https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
source = https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
source = https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
source = https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2
source = https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2
source = https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
source = https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz
source = https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2
@ -146,32 +144,27 @@ pkgbase = libreoffice-fresh
source = https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz
source = https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz
source = https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz
source = https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz
source = https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz
source = https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
source = https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
source = https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
source = make-pyuno-work-with-system-wide-module-install.diff
source = 623ea5c.diff
source = libreoffice-7.5.8.2-icu-74-compatibility.patch
source = soffice-template.desktop.in
source = libreoffice-fresh.sh
source = libreoffice-fresh.csh
validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3
sha256sums = 9c16e4f7415521e42dda48d76a614e18e78fc5e5fae689b4bbe8139ed8a70a0e
sha256sums = 5b11468cd1b68c05c33b151fcd7d044eea0c7e1dbf4bda028b490e18df7d78c1
sha256sums = SKIP
sha256sums = 545fdbcbb00ddff1acda18d33cfceec792d0a2ac0f92f4ecbe3f16691b8a1724
sha256sums = 7653e34fa2139fa6818d644208a0fc9e4e43be18d669c020f38c8dab161671ed
sha256sums = SKIP
sha256sums = 3cb01f83a3a605082b2054874741c74db69b8bdbd0c009304515fe547c20313b
sha256sums = 5e2706a6b0339b3424a3fb75c83b73817603722baf8fa11a9b84dc9a65ece55c
sha256sums = SKIP
sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
sha256sums = 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
sha256sums = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
sha256sums = ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a
sha256sums = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
sha256sums = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
sha256sums = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
sha256sums = 4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c
sha256sums = fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c
sha256sums = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
sha256sums = 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
sha256sums = acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76
@ -179,13 +172,10 @@ pkgbase = libreoffice-fresh
sha256sums = 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384
sha256sums = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45
sha256sums = 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd
sha256sums = a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720
sha256sums = 167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f
sha256sums = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
sha256sums = 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
sha256sums = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563
sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
sha256sums = 9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f
sha256sums = 512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb
@ -225,7 +215,7 @@ pkgname = libreoffice-fresh
depends = icu
depends = libxslt
depends = lcms2
depends = poppler>=0.24.0
depends = poppler
depends = libvisio
depends = libetonyek
depends = libodfgen
@ -295,8 +285,10 @@ pkgname = libreoffice-fresh
optdepends = coin-or-mp: required by the Calc solver
optdepends = gtk3: for GTK3 integration
optdepends = gtk4: for GTK4 integration (experimental)
optdepends = qt5-x11extras: for Qt5 desktop integration
optdepends = kio: for KF6 KDE desktop integration
optdepends = qt6-base: for Qt6 desktop integration
optdepends = qt6-multimedia: for Qt6 desktop integration
optdepends = rhino: for JavaScript support
provides = libreoffice
provides = libreoffice-en-US
conflicts = libreoffice-still

View file

@ -1,21 +0,0 @@
From 623ea5c4d2871aba2e3e5114ad7d58d6f910a2f3 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 12 Jan 2023 20:55:27 +0000
Subject: [PATCH] Related: tdf#151898 fix gtk4 build in 7-4
Change-Id: I71b59b7d2eac406817c79bf6911736ad4510771c
---
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8ba6409..b697b0b 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -5114,7 +5114,7 @@
void picture_set_from_xgraphic(GtkPicture* pPicture, const css::uno::Reference<css::graphic::XGraphic>& rPicture)
{
- if (auto xTempFile = getImageFile(rPicture, false))
+ if (auto xTempFile = getImageFile(rPicture))
gtk_picture_set_filename(pPicture, OUStringToOString(xTempFile->GetFileName(), osl_getThreadTextEncoding()).getStr());
else
gtk_picture_set_pixbuf(pPicture, nullptr);

View file

@ -18,21 +18,21 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=24.2.5.2
pkgver=24.2.5
pkgrel=2
_LOver=24.8.0.3
pkgver=24.8.0
pkgrel=1
arch=('x86_64')
license=('MPL-2.0' 'LGPL-3.0-or-later')
url="https://www.libreoffice.org/"
makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'lcms2' 'poppler' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
'gperf' 'gtk3' 'gtk4' 'cppunit' 'beanshell' 'clucene'
'qt5-base' 'qt5-x11extras'
'qt6-base' 'kio' 'kconfig' 'kcoreaddons' 'kwindowsystem' 'ki18n' 'kcoreaddons'
'qt6-base' 'qt6-multimedia' 'kio' 'kconfig' 'kcoreaddons' 'kwindowsystem' 'ki18n' 'kcoreaddons'
'junit' 'libmythes' 'libwpg' 'java-environment=17' 'postgresql-libs' 'mariadb-libs' 'libgl'
'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
@ -41,7 +41,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp'
'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext'
'abseil-cpp' 'clang' 'zxing-cpp'
'libffi' 'box2d' 'git' 'python-setuptools'
'libffi' 'box2d' 'git' 'python-setuptools' 'rhino'
)
options=('!lto') # using --enable-lto (for parallel link-time optimization)
_mirror="https://ftp.osuosl.org/pub/tdf/libreoffice/src/${pkgver}"
@ -50,15 +50,13 @@ _mirror="https://ftp.osuosl.org/pub/tdf/libreoffice/src/${pkgver}"
_additional_source_url="https://dev-www.libreoffice.org/src"
_additional_source_url2="https://dev-www.libreoffice.org/extern"
source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
${_additional_source_url}/language-subtag-registry-2021-03-05.tar.bz2
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
${_additional_source_url}/pdfium-6179.tar.bz2
${_additional_source_url}/pdfium-6425.tar.bz2
${_additional_source_url}/dtoa-20180411.tgz
${_additional_source_url}/lxml-4.1.1.tgz
${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
@ -66,24 +64,19 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/dragonbox-1.1.3.tar.gz
${_additional_source_url}/frozen-1.1.1.tar.gz
${_additional_source_url}/zxcvbn-c-2.5.tar.gz
${_additional_source_url}/Java-WebSocket-1.5.4.tar.gz
${_additional_source_url}/Java-WebSocket-1.5.6.tar.gz
${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
make-pyuno-work-with-system-wide-module-install.diff
623ea5c.diff
libreoffice-7.5.8.2-icu-74-compatibility.patch
soffice-template.desktop.in
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
noextract=(a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
language-subtag-registry-2021-03-05.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
pdfium-6179.tar.bz2
pdfium-6425.tar.bz2
dtoa-20180411.tgz
lxml-4.1.1.tgz
Firebird-3.0.7.33374-0.tar.bz2
@ -91,27 +84,25 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
dragonbox-1.1.3.tar.gz
frozen-1.1.1.tar.gz
zxcvbn-c-2.5.tar.gz
Java-WebSocket-1.5.4.tar.gz
Java-WebSocket-1.5.6.tar.gz
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('9c16e4f7415521e42dda48d76a614e18e78fc5e5fae689b4bbe8139ed8a70a0e'
sha256sums=('5b11468cd1b68c05c33b151fcd7d044eea0c7e1dbf4bda028b490e18df7d78c1'
'SKIP'
'545fdbcbb00ddff1acda18d33cfceec792d0a2ac0f92f4ecbe3f16691b8a1724'
'7653e34fa2139fa6818d644208a0fc9e4e43be18d669c020f38c8dab161671ed'
'SKIP'
'3cb01f83a3a605082b2054874741c74db69b8bdbd0c009304515fe547c20313b'
'5e2706a6b0339b3424a3fb75c83b73817603722baf8fa11a9b84dc9a65ece55c'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
'75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
'983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
'ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a'
'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
'1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
'233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
'4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c'
'fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c'
'0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4'
'940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76'
@ -119,13 +110,10 @@ sha256sums=('9c16e4f7415521e42dda48d76a614e18e78fc5e5fae689b4bbe8139ed8a70a0e'
'09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384'
'f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45'
'77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd'
'a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720'
'167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f'
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
'984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f'
'512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb')
@ -141,19 +129,6 @@ prepare() {
done
popd
# should be obsolete - Debian has dropped this long time ago
# fix not upstreamable pyuno paths - FS#54250
# patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
# fix build - https://gerrit.libreoffice.org/c/core/+/145421
patch -Np1 -i "${srcdir}"/623ea5c.diff
# fix build with icu 74
patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch
# fix build with icu 75.1
# remove breaking test breaking rule
sed -i "109d" i18npool/source/breakiterator/data/sent.txt
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
@ -267,6 +242,7 @@ build() {
--without-system-libfixmath \
--without-system-frozen \
--without-system-zxcvbn \
--with-system-rhino \
--with-gdrive-client-id=${_google_default_client_id} \
--with-gdrive-client-secret=${_google_default_client_secret} \
--disable-dependency-tracking
@ -312,7 +288,7 @@ package_libreoffice-fresh() {
depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'lcms2' 'poppler' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
@ -338,8 +314,10 @@ package_libreoffice-fresh() {
'coin-or-mp: required by the Calc solver'
'gtk3: for GTK3 integration'
'gtk4: for GTK4 integration (experimental)'
'qt5-x11extras: for Qt5 desktop integration'
'kio: for KF6 KDE desktop integration'
'qt6-base: for Qt6 desktop integration')
'qt6-multimedia: for Qt6 desktop integration'
'rhino: for JavaScript support')
backup=(etc/libreoffice/sofficerc
etc/libreoffice/bootstraprc
etc/libreoffice/psprint.conf

View file

@ -1,218 +0,0 @@
https://bugs.gentoo.org/917618
https://bugs.documentfoundation.org/show_bug.cgi?id=158108
From bcd5d851ebe91fc22edd3ea92be4a674bd13acba Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Mon, 20 Nov 2023 14:47:28 +0200
Subject: [PATCH] Remove use of the now removed LBCMNoChain options
* This change removes its use and explicitly prevents chaining where
the rule would have applied.
https://github.com/unicode-org/icu/commit/84e47620692be90950d090f2f4722494b020ad96
https://github.com/unicode-org/icu/commit/9d9256f3b792100cda697c7bcf52bacfbc3bca87
Signed-off-by: Alfred Wingate <parona@protonmail.com>
--- a/i18npool/source/breakiterator/data/line.txt
+++ b/i18npool/source/breakiterator/data/line.txt
@@ -14,7 +14,6 @@
#
!!chain;
-!!LBCMNoChain;
!!lookAheadHardBreak;
@@ -206,13 +205,13 @@ $CR $LF {100};
#
$LB4NonBreaks? $LB4Breaks {100}; # LB 5 do not break before hard breaks.
$CAN_CM $CM* $LB4Breaks {100};
-$CM+ $LB4Breaks {100};
+^$CM+ $LB4Breaks {100};
# LB 7 x SP
# x ZW
$LB4NonBreaks [$SP $ZW];
$CAN_CM $CM* [$SP $ZW];
-$CM+ [$SP $ZW];
+^$CM+ [$SP $ZW];
#
# LB 8 Break after zero width space
@@ -226,14 +225,14 @@ $LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]];
# See definition of $CAN_CM.
$CAN_CM $CM+; # Stick together any combining sequences that don't match other rules.
-$CM+;
+^$CM+;
#
# LB 11 Do not break before or after WORD JOINER & related characters.
#
$CAN_CM $CM* $WJcm;
$LB8NonBreaks $WJcm;
-$CM+ $WJcm;
+^$CM+ $WJcm;
$WJcm [^$CAN_CM];
$WJcm $CAN_CM $CM*;
@@ -243,7 +242,7 @@ $WJcm $CAN_CM $CM*;
#
# (!SP) x GL
[$LB8NonBreaks-$SP] $CM* $GLcm;
-$CM+ $GLcm;
+^$CM+ $GLcm;
# GL x
$GLcm ($LB8Breaks | $SP);
@@ -260,19 +259,19 @@ $GLcm [$LB8NonBreaks-$SP] $CM*; # Don't let a combining mark go onto $CR, $B
#
$LB8NonBreaks $CL;
$CAN_CM $CM* $CL;
-$CM+ $CL; # by rule 10, stand-alone CM behaves as AL
+^$CM+ $CL; # by rule 10, stand-alone CM behaves as AL
$LB8NonBreaks $EX;
$CAN_CM $CM* $EX;
-$CM+ $EX; # by rule 10, stand-alone CM behaves as AL
+^$CM+ $EX; # by rule 10, stand-alone CM behaves as AL
$LB8NonBreaks $IS;
$CAN_CM $CM* $IS;
-$CM+ $IS; # by rule 10, stand-alone CM behaves as AL
+^$CM+ $IS; # by rule 10, stand-alone CM behaves as AL
$LB8NonBreaks $SY;
$CAN_CM $CM* $SY;
-$CM+ $SY; # by rule 10, stand-alone CM behaves as AL
+^$CM+ $SY; # by rule 10, stand-alone CM behaves as AL
#
@@ -302,7 +301,7 @@ $LB18Breaks = [$LB8Breaks $SP];
# LB 19
# x QU
$LB18NonBreaks $CM* $QUcm;
-$CM+ $QUcm;
+^$CM+ $QUcm;
# QU x
$QUcm .?;
@@ -331,7 +330,7 @@ $HLcm ($HYcm | $BAcm) [^$CB]?;
# LB 22
($ALcm | $HLcm) $INcm;
-$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
+^$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
$IDcm $INcm;
$INcm $INcm;
$NUcm $INcm;
@@ -341,7 +340,7 @@ $NUcm $INcm;
$IDcm $POcm;
$ALcm $NUcm; # includes $LB19
$HLcm $NUcm;
-$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
+^$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
$NUcm $ALcm;
$NUcm $HLcm;
@@ -373,7 +372,7 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
# LB 28 Do not break between alphabetics
#
($ALcm | $HLcm) ($ALcm | $HLcm);
-$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
+^$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
# LB 29
$IScm ($ALcm | $NUcm);
@@ -383,7 +382,7 @@ $IScm ($ALcm | $NUcm);
# and opening or closing punctuation
#
($ALcm | $HLcm | $NUcm) $OPcm;
-$CM+ $OPcm;
+^$CM+ $OPcm;
$CLcm ($ALcm | $HLcm | $NUcm);
#
@@ -393,32 +392,32 @@ $CLcm ($ALcm | $HLcm | $NUcm);
!!reverse;
-$CM+ $ALPlus;
-$CM+ $BA;
-$CM+ $BB;
-$CM+ $B2;
-$CM+ $CL;
-$CM+ $EX;
-$CM+ $GL;
-$CM+ $HL;
-$CM+ $HY;
-$CM+ $H2;
-$CM+ $H3;
-$CM+ $ID;
-$CM+ $IN;
-$CM+ $IS;
-$CM+ $JL;
-$CM+ $JV;
-$CM+ $JT;
-$CM+ $NS;
-$CM+ $NU;
-$CM+ $OP;
-$CM+ $PO;
-$CM+ $PR;
-$CM+ $QU;
-$CM+ $SY;
-$CM+ $WJ;
-$CM+;
+^$CM+ $ALPlus;
+^$CM+ $BA;
+^$CM+ $BB;
+^$CM+ $B2;
+^$CM+ $CL;
+^$CM+ $EX;
+^$CM+ $GL;
+^$CM+ $HL;
+^$CM+ $HY;
+^$CM+ $H2;
+^$CM+ $H3;
+^$CM+ $ID;
+^$CM+ $IN;
+^$CM+ $IS;
+^$CM+ $JL;
+^$CM+ $JV;
+^$CM+ $JT;
+^$CM+ $NS;
+^$CM+ $NU;
+^$CM+ $OP;
+^$CM+ $PO;
+^$CM+ $PR;
+^$CM+ $QU;
+^$CM+ $SY;
+^$CM+ $WJ;
+^$CM+;
#
@@ -468,7 +467,7 @@ $LF $CR;
# X $CM needs to behave like X, where X is not $SP or controls.
# $CM not covered by the above needs to behave like $AL
# Stick together any combining sequences that don't match other rules.
-$CM+ $CAN_CM;
+^$CM+ $CAN_CM;
# LB 11
@@ -606,8 +605,8 @@ $CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
!!safe_reverse;
# LB 7
-$CM+ [^$CM $BK $CR $LF $NL $ZW $SP];
-$CM+ $SP / .;
+^$CM+ [^$CM $BK $CR $LF $NL $ZW $SP];
+^$CM+ $SP / .;
# LB 9
$SP+ $CM* $OP;
--
2.42.1

View file

@ -1,18 +0,0 @@
--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200
+++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200
@@ -16,8 +16,14 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-import pyuno
+
+# Special modification to make uno load on Arch
+import os
import sys
+sys.path.append("/usr/lib/libreoffice/program/")
+os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
+
+import pyuno
import traceback
import warnings