mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-27 23:44:04 +00:00
extra/libreoffice-still to 5.0.6-2
This commit is contained in:
Kevin Mihelich
parent
dc3a1b799d
commit
7582e49ee6
4 changed files with 91 additions and 11 deletions
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - make build-nocheck: unit tests take a huge amount of time on ARM
|
||||
# - use system firebird
|
||||
|
||||
buildarch=28
|
||||
highmem=1
|
||||
|
|
@ -13,7 +12,7 @@ pkgbase=libreoffice-still
|
|||
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
|
||||
_LOver=5.0.6.3
|
||||
pkgver=5.0.6
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('i686' 'x86_64')
|
||||
license=('LGPL3')
|
||||
url="http://www.libreoffice.org/"
|
||||
|
|
@ -26,7 +25,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'lib
|
|||
'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
|
||||
'gperf' 'kdelibs' 'cppunit' 'beanshell2' 'vigra' 'clucene' #'gtk3'
|
||||
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
|
||||
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
|
||||
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'glew'
|
||||
'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
|
||||
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'libfbclient')
|
||||
|
||||
|
|
@ -54,6 +53,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
|
||||
${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
|
||||
${_additional_source_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
|
||||
${_additional_source_url}/mdds_0.12.1.tar.bz2
|
||||
${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
|
||||
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||
${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2
|
||||
|
|
@ -68,7 +68,10 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
|
||||
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
make-pyuno-work-with-system-wide-module-install.diff
|
||||
libreoffice-still.sh libreoffice-still.csh)
|
||||
libreoffice-still.sh libreoffice-still.csh
|
||||
gcc6_buildfix.diff
|
||||
fix_gcc_build_error.diff
|
||||
hunspell14_buildfix.diff)
|
||||
noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
|
||||
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
|
|
@ -88,6 +91,7 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
|
|||
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
|
||||
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
|
||||
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
|
||||
mdds_0.12.1.tar.bz2
|
||||
7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
|
||||
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||
language-subtag-registry-2015-08-04.tar.bz2
|
||||
|
|
@ -127,6 +131,7 @@ md5sums=('541d92329d433696c478f7669ac976f1'
|
|||
'ace6ab49184e329db254e454a010f56d'
|
||||
'db60e4fde8dd6d6807523deb71ee34dc'
|
||||
'10d61fbaa6a06348823651b1bd7940fe'
|
||||
'ef2560ed5416652a7fe195305b14cebe'
|
||||
'7681383be6ce489d84c1c74f4e7f9643'
|
||||
'0168229624cfac409e766913506961a8'
|
||||
'bf5986dbfa1c9a0f26cf1b00ed369484'
|
||||
|
|
@ -142,7 +147,10 @@ md5sums=('541d92329d433696c478f7669ac976f1'
|
|||
'185d60944ea767075d27247c3162b3bc'
|
||||
'dcb5ad3e5f7139227677ea064b075422'
|
||||
'40680393752d98bcb590f1f62efa61a9'
|
||||
'f82232620f3e27d1532c49af4b36ce9a')
|
||||
'f82232620f3e27d1532c49af4b36ce9a'
|
||||
'6752d22fc5bcbdbef0640c6aca163e50'
|
||||
'60a6a9bf86bbcefa8c712dc8ba8ab73f'
|
||||
'2afac5aa93f7bcd85058348147c962e4')
|
||||
|
||||
prepare() {
|
||||
cd libreoffice-$_LOver
|
||||
|
|
@ -173,12 +181,19 @@ prepare() {
|
|||
|
||||
# i686 build broken
|
||||
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk
|
||||
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_basic_scanner/d' basic/Module_basic.mk
|
||||
|
||||
# qt4 fix
|
||||
sed -i "s:qmake:qmake-qt4:g" configure.ac
|
||||
|
||||
# fix build with mdds 1.0
|
||||
sed -i "s:\[mdds >= 0.12.0\]:\[mdds-1.0 >= 1.0.0\]:" configure.ac
|
||||
|
||||
# fix checking whether KDE is >= 4.2... configure: error: KDE version too old
|
||||
# http://bugs.debian.org/823145
|
||||
patch -Np1 -i ${srcdir}/gcc6_buildfix.diff
|
||||
# commit b9fa2963cf12e6987b3a0acc219c4fa591e41be8
|
||||
patch -Np1 -i ${srcdir}/fix_gcc_build_error.diff
|
||||
|
||||
# hunspell 1.4.x fix
|
||||
patch -Np1 -i ${srcdir}/hunspell14_buildfix.diff
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -186,7 +201,7 @@ build() {
|
|||
|
||||
# strip -s from Makeflags in case you use it to shorten build logs
|
||||
_MAKEFLAGS=${MAKEFLAGS/-s/}
|
||||
|
||||
|
||||
./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
|
||||
--enable-split-app-modules \
|
||||
--with-parallelism=${_MAKEFLAGS/-j/} \
|
||||
|
|
@ -222,7 +237,7 @@ build() {
|
|||
--without-fonts\
|
||||
--with-system-apr \
|
||||
--with-system-libcdr \
|
||||
--with-system-mdds\
|
||||
--without-system-mdds\
|
||||
--without-myspell-dicts \
|
||||
--with-system-libvisio \
|
||||
--without-system-libcmis \
|
||||
|
|
@ -320,7 +335,7 @@ package_libreoffice-still() {
|
|||
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
|
||||
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
|
||||
'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
|
||||
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'gtk2')
|
||||
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'gtk2' 'libfbclient')
|
||||
optdepends=('java-runtime: adds java support'
|
||||
'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
|
||||
'pstoedit: translates PostScript and PDF graphics into other vector formats'
|
||||
|
|
|
|||
39
extra/libreoffice-still/fix_gcc_build_error.diff
Normal file
39
extra/libreoffice-still/fix_gcc_build_error.diff
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Wed, 3 Feb 2016 10:30:43 +0000
|
||||
Subject: fix gcc build error
|
||||
|
||||
error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
|
||||
{aka double}' and 'int' to binary 'operator%'
|
||||
|
||||
apparently there's a template returning double for abs for the
|
||||
non-int/long/float/double argument case. So promote earlier to int so the
|
||||
abs<int> is called
|
||||
|
||||
Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
|
||||
|
||||
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
|
||||
index 744415e..cf061c9 100644
|
||||
--- a/sax/source/tools/converter.cxx
|
||||
+++ b/sax/source/tools/converter.cxx
|
||||
@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
|
||||
|
||||
|
||||
static void
|
||||
-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
|
||||
+lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
|
||||
{
|
||||
if (0 == nOffset)
|
||||
{
|
||||
@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
|
||||
static void lcl_ConvertToUTC(
|
||||
sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
|
||||
sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
|
||||
- sal_Int16 const nSourceOffset)
|
||||
+ int const nSourceOffset)
|
||||
{
|
||||
sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
|
||||
sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
12
extra/libreoffice-still/gcc6_buildfix.diff
Normal file
12
extra/libreoffice-still/gcc6_buildfix.diff
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
--- libreoffice-5.1.3.2/configure.ac 2016-05-12 21:26:13.099948527 +0200
|
||||
+++ libreoffice-5.1.3.2/configure.ac.new 2016-05-12 21:46:50.613664941 +0200
|
||||
@@ -11169,6 +11169,9 @@
|
||||
if test "x$kde_incdir" = "xno"; then
|
||||
AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
|
||||
fi
|
||||
+ # see http://bugs.debian.org/823145. -isystem /usr/include fails with
|
||||
+ # gcc6
|
||||
+ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
|
||||
|
||||
dnl Check for KDE4 libraries
|
||||
AC_MSG_CHECKING([for KDE4 libraries])
|
||||
14
extra/libreoffice-still/hunspell14_buildfix.diff
Normal file
14
extra/libreoffice-still/hunspell14_buildfix.diff
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
|
||||
index 6979a33..a9a1575 100644
|
||||
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
|
||||
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
|
||||
@@ -31,7 +31,6 @@
|
||||
|
||||
#include <lingutil.hxx>
|
||||
#include <hunspell.hxx>
|
||||
-#include <dictmgr.hxx>
|
||||
#include <sspellimp.hxx>
|
||||
|
||||
#include <linguistic/lngprops.hxx>
|
||||
--
|
||||
cgit v0.10.2
|
||||
Loading…
Reference in a new issue