[arch-commits] Commit in libreoffice-fresh/trunk (2 files)

[Andreas Radke]

    Date: Friday, February 4, 2022 @ 18:16:48
  Author: andyrtr
Revision: 436193

upgpkg: libreoffice-fresh 7.3.0-4: build skia using clang per upstream suggestion, solves gcc lto workaround - https://gerrit.libreoffice.org/c/core/+/124017

Modified:
  libreoffice-fresh/trunk/PKGBUILD
Deleted:
  libreoffice-fresh/trunk/fix-lto-build-without-clang.patch

-----------------------------------+
 PKGBUILD                          |   10 ++--------
 fix-lto-build-without-clang.patch |   11 -----------
 2 files changed, 2 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-04 18:12:59 UTC (rev 436192)
+++ PKGBUILD	2022-02-04 18:16:48 UTC (rev 436193)
@@ -12,7 +12,7 @@
 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/"
@@ -32,7 +32,7 @@
 	'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') # using --enable-lto (for parallel link-time optimization)
@@ -53,7 +53,6 @@
 	${_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
@@ -61,7 +60,6 @@
 	${_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)
@@ -111,7 +109,6 @@
             'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
-            'bbbeec2ed1b9b3054e70c4cee9837a40fb89a11edbb73718533945f109ea683e'
             '81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
             'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
@@ -136,9 +133,6 @@
 	# 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
 

Deleted: fix-lto-build-without-clang.patch
===================================================================
--- fix-lto-build-without-clang.patch	2022-02-04 18:12:59 UTC (rev 436192)
+++ fix-lto-build-without-clang.patch	2022-02-04 18:16:48 UTC (rev 436193)
@@ -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
-