mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
extra/libreoffice-fresh to 6.4.4-1
This commit is contained in:
Kevin Mihelich
parent
bf37b72bfb
commit
ab33e79b9a
2 changed files with 93 additions and 8 deletions
extra/libreoffice-fresh
|
|
@ -18,9 +18,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
|
|||
|
||||
pkgbase=libreoffice-fresh
|
||||
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
|
||||
_LOver=6.4.3.2
|
||||
pkgver=6.4.3
|
||||
pkgrel=3
|
||||
_LOver=6.4.4.2
|
||||
pkgver=6.4.4
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
license=('LGPL3')
|
||||
url="https://www.libreoffice.org/"
|
||||
|
|
@ -66,7 +66,8 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
make-pyuno-work-with-system-wide-module-install.diff
|
||||
soffice-template.desktop.in
|
||||
libreoffice-fresh.sh libreoffice-fresh.csh
|
||||
libreoffice-poppler-0.86.patch)
|
||||
libreoffice-poppler-0.86.patch
|
||||
disable-latest-c++.diff)
|
||||
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
|
|
@ -85,11 +86,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
|||
185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
)
|
||||
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
|
||||
sha256sums=('bc14547c188efa15f4cb36cfb3da7cacb3037a7448d1bba8a58ed6a320ccabb2'
|
||||
sha256sums=('54388597dffc9c32f81446e6e634f7af76ca0e0e5a0d27bc3fe89033a011c078'
|
||||
'SKIP'
|
||||
'8570eaa8903e4fb747500adbf06d69d2d3cb6ed3a11a3a804403878f1ecfef56'
|
||||
'c61ac7b9ceac9aa0813bce405ce25b13dc1b698509ce33827ff7c65dffde25ac'
|
||||
'SKIP'
|
||||
'03260badad37d1d96c9bcac79ee48ab2ab00000aba78c3a4a4accd51c987e91b'
|
||||
'49cd385aabe7f197447ac0645a8fcdba75b04642b38fac49342aace2055098bd'
|
||||
'SKIP'
|
||||
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
|
||||
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
|
||||
|
|
@ -111,7 +112,8 @@ sha256sums=('bc14547c188efa15f4cb36cfb3da7cacb3037a7448d1bba8a58ed6a320ccabb2'
|
|||
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
|
||||
'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
|
||||
'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1'
|
||||
'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e')
|
||||
'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e'
|
||||
'501d55c26607d8ee7cb46d5755479e2a72fd49ad92075ce466bf071abb5e815f')
|
||||
|
||||
prepare() {
|
||||
|
||||
|
|
@ -119,6 +121,10 @@ prepare() {
|
|||
|
||||
patch -p1 -i ../libreoffice-poppler-0.86.patch # Fix build with poppler 0.86
|
||||
|
||||
# fix build with recent toolchain
|
||||
# https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-6-4&id=f0b74640137f07ed74027f98fbf6d1c0d98939bf
|
||||
patch -Np1 -i ../disable-latest-c++.diff
|
||||
|
||||
# move external sources into place
|
||||
mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
|
||||
for source in "${noextract[@]}"; do
|
||||
|
|
|
|||
79
extra/libreoffice-fresh/disable-latest-c++.diff
Normal file
79
extra/libreoffice-fresh/disable-latest-c++.diff
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
From f0b74640137f07ed74027f98fbf6d1c0d98939bf Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Mon, 20 Apr 2020 11:40:24 +0200
|
||||
Subject: Add --with-latest-c++ to explicitly opt in for
|
||||
-std=c++20/-std:c++latest
|
||||
|
||||
Adaptation of this change to this branch. The point is to avoid
|
||||
compiling as C++2a as the code for externals has not been patched
|
||||
properly for that here. Here is the original commit message even if I
|
||||
assume it is a bit misleading in this branch:
|
||||
|
||||
cd472d1d8489f30797f47d3f6dafede28c1feb90 "Compile as C++2a, where available" had
|
||||
started to unconditionally check for support of -std=c++2a (and later also
|
||||
-std=c++20) for Clang and GCC, but that can cause occasional issues especially
|
||||
for Linux distros, see e.g. 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 "replace
|
||||
boost::bimap in sdext pdfimport" or
|
||||
<https://bugzilla.redhat.com/show_bug.cgi?id=1818723>
|
||||
"/usr/include/boost/format/alt_sstream_impl.hpp incompatible with -std=c++20
|
||||
(std::allocator::allocate hint argument)" (where
|
||||
677c8de4fa79cd9b278b142013ba7f1c9e4e41c3 "external/boost: Adapt to
|
||||
std::allocator parts removed in C++20" is not picked up due to
|
||||
--with-system-boost).
|
||||
|
||||
So better require an explicit opt-in via a new --with-latest-c++. And while at
|
||||
it, also make that enable -std:c++latest for MSVC.
|
||||
|
||||
Change-Id: I2d1f03144fad9a7884562e56b1b76cab5eb8f080
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92555
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93204
|
||||
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
|
||||
Reviewed-by: Tor Lillqvist <tml@collabora.com>
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93692
|
||||
Tested-by: Tor Lillqvist <tml@collabora.com>
|
||||
---
|
||||
configure.ac | 18 ++++++++++++++++--
|
||||
1 file changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 78080305f3d6..8364138bdc96 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2143,6 +2143,12 @@ libo_FUZZ_ARG_WITH(lxml,
|
||||
report widget classes and ids.]),
|
||||
,)
|
||||
|
||||
+libo_FUZZ_ARG_WITH(latest-c++,
|
||||
+ AS_HELP_STRING([--with-latest-c++],
|
||||
+ [Try to enable the latest features of the C++ compiler, even if they are not yet part of a
|
||||
+ published standard.]),,
|
||||
+ [$with_latest_c__=no])
|
||||
+
|
||||
dnl ===================================================================
|
||||
dnl Branding
|
||||
dnl ===================================================================
|
||||
@@ -6456,9 +6462,17 @@ dnl ===================================================================
|
||||
AC_MSG_CHECKING([whether $CXX_BASE supports C++17])
|
||||
CXXFLAGS_CXX11=
|
||||
if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
|
||||
- CXXFLAGS_CXX11='-std:c++17 -Zc:__cplusplus'
|
||||
+ if test "$with_latest_c__" = yes; then
|
||||
+ CXXFLAGS_CXX11=-std:c++latest
|
||||
+ else
|
||||
+ CXXFLAGS_CXX11=-std:c++17
|
||||
+ fi
|
||||
+ CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -Zc:__cplusplus"
|
||||
elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
||||
- my_flags='-std=c++2a -std=c++17 -std=c++1z'
|
||||
+ my_flags='-std=c++17 -std=c++1z'
|
||||
+ if test "$with_latest_c__" = yes; then
|
||||
+ my_flags="-std=gnu++2a -std=c++2a $my_flags"
|
||||
+ fi
|
||||
for flag in $my_flags; do
|
||||
if test "$COM" = MSC; then
|
||||
flag="-Xclang $flag"
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
Loading…
Reference in a new issue