archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/libreoffice-fresh to 7.3.0-4

Browse source
This commit is contained in:
David Beauchamp 2022-02-05 15:57:24 -05:00
parent 996124bf58
commit c7e69cfcc8
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extra/libreoffice-fresh/PKGBUILD
View file

@ -21,7 +21,7 @@ pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=7.3.0.3
pkgver=7.3.0
pkgrel=3
pkgrel=4
arch=('x86_64')
license=('LGPL3')
url="https://www.libreoffice.org/"
@ -41,7 +41,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'lib
'libexttextcat' 'gobject-introspection' # 'libfbclient'
'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext'
'libcuckoo' 'abseil-cpp' 'zxing-cpp'
'libcuckoo' 'abseil-cpp' 'zxing-cpp' 'clang'
'libffi' 'box2d' 'git'
)
options=('!lto')
@ -62,7 +62,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_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
#${_additional_source_url}/zxing-cpp-1.2.0.tar.gz
${_additional_source_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
${_additional_source_url}/libcmis-0.5.2.tar.xz
${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
@ -70,7 +69,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
fix-lto-build-without-clang.patch
0001_drop_the_SolarMutex_before_QApplication.patch
soffice-template.desktop.in
libreoffice-fresh.sh libreoffice-fresh.csh)
@ -120,7 +118,6 @@ sha256sums=('98d369c9541f0c3286345b93f448f2ceb2e344865ee01bdd58f3bb27f08f3f25'
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'bbbeec2ed1b9b3054e70c4cee9837a40fb89a11edbb73718533945f109ea683e'
'81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
@ -145,9 +142,6 @@ prepare() {
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
# fix LTO build when clang is not present
patch -Np1 -i "${srcdir}"/fix-lto-build-without-clang.patch
# fix crash on start - FS#73471
patch -Np1 -i "${srcdir}"/0001_drop_the_SolarMutex_before_QApplication.patch

11
extra/libreoffice-fresh/fix-lto-build-without-clang.patch
View file

@ -1,11 +0,0 @@
--- libreoffice-7.3.0.3.orig/solenv/gbuild/platform/com_GCC_defs.mk 2022-02-02 23:12:39.000000000 +0000
+++ libreoffice-7.3.0.3/solenv/gbuild/platform/com_GCC_defs.mk 2022-02-02 23:27:44.167129779 +0000
@@ -196,7 +196,7 @@ else
# use first element of the PARALLELISM, to allow values like "12 -l 14" to specify load limits
gb_LTOFLAGS := -flto=$(if $(filter-out 0,$(PARALLELISM)),$(firstword $(PARALLELISM)),auto) -fuse-linker-plugin -O2
# clang does not support -flto=<number>
-gb_CLANG_LTOFLAGS := -flto=thin
+gb_CLANG_LTOFLAGS := -flto
endif
endif