mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/libreoffice-still to 7.6.6-4
This commit is contained in:
parent
0105586ff0
commit
5306280356
3 changed files with 69 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
|||
pkgbase = libreoffice-still
|
||||
pkgver = 7.6.6
|
||||
pkgrel = 3
|
||||
pkgrel = 4
|
||||
url = https://www.libreoffice.org/
|
||||
arch = x86_64
|
||||
license = MPL-2.0
|
||||
|
@ -26,7 +26,6 @@ pkgbase = libreoffice-still
|
|||
makedepends = icu
|
||||
makedepends = libxslt
|
||||
makedepends = lcms2
|
||||
makedepends = poppler>=0.24.0
|
||||
makedepends = libvisio
|
||||
makedepends = libetonyek
|
||||
makedepends = libodfgen
|
||||
|
@ -112,6 +111,8 @@ pkgbase = libreoffice-still
|
|||
noextract = dragonbox-1.1.3.tar.gz
|
||||
noextract = frozen-1.1.1.tar.gz
|
||||
noextract = xmlsec1-1.2.37.tar.gz
|
||||
noextract = poppler-23.09.0.tar.xz
|
||||
noextract = poppler-data-0.4.12.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
|
||||
|
@ -138,12 +139,15 @@ pkgbase = libreoffice-still
|
|||
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/xmlsec1-1.2.37.tar.gz
|
||||
source = https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz
|
||||
source = https://dev-www.libreoffice.org/src/poppler-data-0.4.12.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 = gcc14-buildfix.patch
|
||||
source = soffice-template.desktop.in
|
||||
source = libreoffice-still.sh
|
||||
source = libreoffice-still.csh
|
||||
|
@ -170,12 +174,15 @@ pkgbase = libreoffice-still
|
|||
sha256sums = 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384
|
||||
sha256sums = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45
|
||||
sha256sums = 5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
|
||||
sha256sums = 80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
|
||||
sha256sums = c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
|
||||
sha256sums = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
|
||||
sha256sums = 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
|
||||
sha256sums = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
|
||||
sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563
|
||||
sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
|
||||
sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
|
||||
sha256sums = ddc7aaed0b755c4f2a89ddc2ff68a7d9bc1b7b3458177f1de34085cd3163a1f7
|
||||
sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
|
||||
sha256sums = 364af7c45bc4e41f9ebaa36944daefb9bf3aca823b7e0059307ef0cbb41bbf4c
|
||||
sha256sums = 060390bec7882072099c54508993fcfa7e3dd34d6e4b44996bd197d5e99cf0f6
|
||||
|
@ -214,7 +221,6 @@ pkgname = libreoffice-still
|
|||
depends = icu
|
||||
depends = libxslt
|
||||
depends = lcms2
|
||||
depends = poppler>=0.24.0
|
||||
depends = libvisio
|
||||
depends = libetonyek
|
||||
depends = libodfgen
|
||||
|
|
|
@ -20,14 +20,14 @@ pkgbase=libreoffice-still
|
|||
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
|
||||
_LOver=7.6.6.3
|
||||
pkgver=7.6.6
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
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' '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' 'qt5-base' 'qt5-x11extras' 'qt6-base' 'cppunit' 'beanshell' 'clucene'
|
||||
|
@ -64,12 +64,15 @@ 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}/xmlsec1-1.2.37.tar.gz
|
||||
${_additional_source_url}/poppler-23.09.0.tar.xz
|
||||
${_additional_source_url}/poppler-data-0.4.12.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
|
||||
gcc14-buildfix.patch
|
||||
soffice-template.desktop.in
|
||||
libreoffice-still.sh libreoffice-still.csh)
|
||||
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
|
@ -88,6 +91,8 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
|||
dragonbox-1.1.3.tar.gz
|
||||
frozen-1.1.1.tar.gz
|
||||
xmlsec1-1.2.37.tar.gz
|
||||
poppler-23.09.0.tar.xz
|
||||
poppler-data-0.4.12.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
|
||||
|
@ -115,12 +120,15 @@ sha256sums=('41a83a7f09c539e22c873107d5d4088ac7cdf1a299ad9e9de15e30600fe521b6'
|
|||
'09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384'
|
||||
'f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45'
|
||||
'5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c'
|
||||
'80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55'
|
||||
'c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74'
|
||||
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
|
||||
'984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
|
||||
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
|
||||
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
|
||||
'440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
|
||||
'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
|
||||
'ddc7aaed0b755c4f2a89ddc2ff68a7d9bc1b7b3458177f1de34085cd3163a1f7'
|
||||
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
|
||||
'364af7c45bc4e41f9ebaa36944daefb9bf3aca823b7e0059307ef0cbb41bbf4c'
|
||||
'060390bec7882072099c54508993fcfa7e3dd34d6e4b44996bd197d5e99cf0f6')
|
||||
|
@ -146,6 +154,9 @@ prepare() {
|
|||
# fix build with icu 74
|
||||
patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch
|
||||
|
||||
# fix build with gcc14
|
||||
patch -Np1 -i "${srcdir}"/gcc14-buildfix.patch
|
||||
|
||||
#use the CFLAGS but remove the LibO overridden ones
|
||||
for i in $CFLAGS; do
|
||||
case "$i" in
|
||||
|
@ -258,6 +269,7 @@ build() {
|
|||
--without-system-dragonbox \
|
||||
--without-system-libfixmath \
|
||||
--without-system-frozen \
|
||||
--without-system-poppler \
|
||||
--with-gdrive-client-id=${_google_default_client_id} \
|
||||
--with-gdrive-client-secret=${_google_default_client_secret} \
|
||||
--disable-dependency-tracking
|
||||
|
@ -307,7 +319,7 @@ package_libreoffice-still() {
|
|||
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' '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'
|
||||
|
|
45
extra/libreoffice-still/gcc14-buildfix.patch
Normal file
45
extra/libreoffice-still/gcc14-buildfix.patch
Normal file
|
@ -0,0 +1,45 @@
|
|||
From db98a3f1b1a703ea8e1284b8815eea2274abb2db Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jambor <mjambor@suse.cz>
|
||||
Date: Wed, 7 Jun 2023 18:11:45 +0200
|
||||
Subject: Add cstdlib include necessary to build with gcc14 libstdc++
|
||||
(tdf#155715)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Without explicitely including <cstdlib>, compiling some files
|
||||
including store/source/storbase.hxx (such as store/source/storpage.cxx
|
||||
which includes it through store/source/storpage.hxx) will result in
|
||||
errors:
|
||||
|
||||
error: ‘malloc’ is not a member of ‘std’
|
||||
|
||||
and
|
||||
|
||||
error: ‘free’ is not a member of ‘std’
|
||||
|
||||
This patch simply adds the necessary include.
|
||||
|
||||
Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
||||
---
|
||||
store/source/storbase.hxx | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
|
||||
index feac0db96227..207cbf40a8d3 100644
|
||||
--- a/store/source/storbase.hxx
|
||||
+++ b/store/source/storbase.hxx
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include <store/types.h>
|
||||
|
||||
+#include <cstdlib>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
--
|
||||
cgit v1.2.3
|
||||
|
Loading…
Reference in a new issue