diff options
| -rw-r--r-- | community/libreoffice/APKBUILD | 40 | ||||
| -rw-r--r-- | community/libreoffice/fix-execinfo.patch | 39 |
2 files changed, 47 insertions, 32 deletions
diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD index 19419836897..9671841c5b4 100644 --- a/community/libreoffice/APKBUILD +++ b/community/libreoffice/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libreoffice -pkgver=5.3.4.2 -pkgrel=2 +pkgver=5.4.2.2 +pkgrel=0 pkgdesc="LibreOffice - Meta package for the full office suite" url="http://www.libreoffice.org/" arch="all" @@ -17,7 +17,7 @@ depends_dev="cups-dev libjpeg-turbo-dev boost-dev clucene-dev libe-book-dev icu- gconf-dev bluez-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev poppler-dev cairo-dev hyphen-dev mythes-dev python3-dev harfbuzz-dev libfreehand-dev libodfgen-dev libcdr-dev libzmf-dev libstaroffice-dev - liborcus-dev openjdk8 apache-ant junit" + liborcus-dev openjdk8 apache-ant junit xmlsec-dev gpgme-dev" makedepends="$depends_dev autoconf automake tar coreutils findutils ucpp gperf bison flex zip perl perl-archive-zip sed tar libxml2-utils doxygen paxmark" # GNU sed is needed for in i18npool/CustomTarget_localedata.mk @@ -37,7 +37,6 @@ esac source="http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-$pkgver.tar.xz http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-dictionaries-$pkgver.tar.xz http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-translations-$pkgver.tar.xz - $_addsrcurl/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz $_addsrcurl/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip $_addsrcurl/commons-logging-1.2-src.tar.gz $_addsrcurl/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip @@ -54,6 +53,7 @@ source="http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice $_addsrcurl/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip $_addsrcurl/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip $_addsrcurl/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + $_addsrcurl/pdfium-3064.tar.bz2 http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll linux-musl.patch @@ -187,8 +187,8 @@ ldpath="/usr/lib/libreoffice/program:/usr/lib/libreoffice/ure/lib/" builddir="$srcdir"/libreoffice-$pkgver unpack() { if [ -z "$force" ]; then - verify || return 1 - initdcheck || return 1 + verify + initdcheck fi mkdir -p "$srcdir" msg "Unpacking sources..." @@ -206,7 +206,7 @@ unpack() { prepare() { cd "$builddir" - default_prepare || return 1 + default_prepare NOCONFIGURE=1 ./autogen.sh } @@ -230,7 +230,7 @@ build() { --enable-split-app-modules \ --enable-python=system \ --with-alloc=system \ - --with-tls=openssl \ + --with-tls=nss \ --with-system-libs \ --with-system-dicts \ --with-system-ucpp \ @@ -256,16 +256,16 @@ build() { || return 1 # adding '-isystem /usr/include' make things break with gcc6 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823145 - sed -i -e 's:-isystem /usr/include[^/]::g' config_host.mk || return 1 + sed -i -e 's:-isystem /usr/include[^/]::g' config_host.mk - make build-nocheck || return 1 + make build-nocheck # build libreofficekit - cd libreofficekit && make || return 1 + cd libreofficekit && make } package() { cd "$builddir" - make DESTDIR="$pkgdir"/../all distro-pack-install || return 1 + make DESTDIR="$pkgdir"/../all distro-pack-install } _split() { @@ -273,7 +273,7 @@ _split() { for i in $(grep -v ^%dir $builddir/file-lists/${1}_list.txt | sort -u); do dirname="$(dirname $i)" [ -d "$subpkgdir/$dirname" ] || install -dm755 "$subpkgdir/$dirname" - mv "$pkgdir"/../all/"$i" "$subpkgdir"/"$i" || return 1 + mv "$pkgdir"/../all/"$i" "$subpkgdir"/"$i" done } @@ -292,7 +292,7 @@ calc() { common() { pkgdesc="LibreOffice - Common files" depends="libreoffice-lang-en_us" - _split common || return 1 + _split common paxmark -m \ "$subpkgdir"/usr/lib/libreoffice/program/soffice.bin \ "$subpkgdir"/usr/lib/libreoffice/program/unopkg.bin @@ -318,7 +318,7 @@ impress() { libreofficekit() { mkdir -p "$subpkgdir"/usr/include - cp -a "$builddir"/include/LibreOfficeKit "$subpkgdir"/usr/include || return 1 + cp -a "$builddir"/include/LibreOfficeKit "$subpkgdir"/usr/include } math() { @@ -351,10 +351,9 @@ sdk_doc() { _split sdk_doc } -sha512sums="ac3b0a0615577faf6c2529b7ec888fd7969d32f38d8b83a3747535bc408e8d2ef2e724f5b1840ae79a219bb855584be87f10ab26ef101afe04dd15d224e6ebc0 libreoffice-5.3.4.2.tar.xz -db4ee68454298903c902aaeed6e940e797bda00cba48f0598a3529c7d77f23d01b93e5feb99360f41bb6817008fb45fdd3aaa8dccc6b0c405cda2247633cd150 libreoffice-dictionaries-5.3.4.2.tar.xz -2b9cf188f246c8dfc6e847d9c33c6ab8c11830601222c71203074b862b67f245958eb843d6f15866e896202d068476d820a19543e249447e3bedbbb80e316ba5 libreoffice-translations-5.3.4.2.tar.xz -20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz +sha512sums="37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c libreoffice-5.4.2.2.tar.xz +d0f29911400739a9524cac2389a74851a26ef58ce42b629e6f24772bead07312a9e03cd5b4ffcb78b15a942d22db03536c4c9861c9a89d5cc13a0ddd77f20479 libreoffice-dictionaries-5.4.2.2.tar.xz +bf5ecbf1a36f7390ce69826d9101613a9cc02e41895c2beeb194a9efa104b97ae73d2a337f385a95d9e498866275b3d849efc2bc3ec8d9ddcf5bc20ea1a891af libreoffice-translations-5.4.2.2.tar.xz a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 commons-logging-1.2-src.tar.gz a04eca6a57807358bd4f8d017a2eeaa58403ef51fab11fc46ab089113a0ff5f66aaa793d3fc57b484334cbf51ed388a90d8d72d1e5819c8248cc0113ac928a77 beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip @@ -371,7 +370,8 @@ c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +2cb6bdfd7391d7945869026c1b1a33361ad7117fcecb3eb51a43191b81a17d9a40e22ddda2a249ed633b7a4187052f60a5119652be54fbe73afe4874613db707 pdfium-3064.tar.bz2 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c 185d60944ea767075d27247c3162b3bc-unowinreg.dll 10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a linux-musl.patch -567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 fix-execinfo.patch +4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336 fix-execinfo.patch c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a fix-includes.patch" diff --git a/community/libreoffice/fix-execinfo.patch b/community/libreoffice/fix-execinfo.patch index 01fca6fb2e6..4c3b359174d 100644 --- a/community/libreoffice/fix-execinfo.patch +++ b/community/libreoffice/fix-execinfo.patch @@ -1,24 +1,39 @@ -diff -ru sal.orig/osl/unx/backtrace.h sal/osl/unx/backtrace.h ---- a/sal/osl/unx/backtrace.h 2015-01-22 22:05:28.000000000 -0200 -+++ b/sal/osl/unx/backtrace.h 2015-02-02 17:06:27.765494731 -0200 -@@ -47,7 +47,7 @@ - - #endif /* defined SOLARIS || FREEBSD || NETBSD || OPENBSD */ +diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h +index 5fafc1c..408c12c 100644 +--- a/sal/osl/unx/backtrace.h ++++ b/sal/osl/unx/backtrace.h +@@ -20,7 +20,7 @@ + #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H + #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H -#if defined (LINUX) +#if defined (LINUX) && defined (__GLIBC__) + #include <execinfo.h> - #endif -diff -ru sal.orig/osl/unx/signal.cxx sal/osl/unx/signal.cxx ---- a/sal/osl/unx/signal.cxx 2015-01-22 22:05:28.000000000 -0200 -+++ b/sal/osl/unx/signal.cxx 2015-02-02 17:06:53.495496086 -0200 -@@ -36,7 +36,7 @@ +diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx +index f4c9a9c..da6d9cf 100644 +--- a/sal/osl/unx/signal.cxx ++++ b/sal/osl/unx/signal.cxx +@@ -35,7 +35,7 @@ #endif /* MACOSX */ -#ifdef LINUX -+#if defined (LINUX) && defined (__GLIBC__) ++#if defined(LINUX) && defined(__GLIBC__) #include <execinfo.h> #include <link.h> #define INCLUDE_BACKTRACE +diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c +index 1d9a58b..fd648e4 100644 +--- a/sal/osl/unx/backtrace.c ++++ b/sal/osl/unx/backtrace.c +@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) + } + } + +-#elif !defined LINUX ++#elif !defined(__GLIBC__) + + int backtrace( void **buffer, int max_frames ) + { |