aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/libreoffice/APKBUILD24
-rw-r--r--community/libreoffice/fix-includes.patch23
-rw-r--r--community/libreoffice/musl-libintl.patch15
-rw-r--r--community/libreoffice/musl-stacksize.patch39
4 files changed, 69 insertions, 32 deletions
diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index 8bebdab9587..8aba3b09207 100644
--- a/community/libreoffice/APKBUILD
+++ b/community/libreoffice/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libreoffice
-pkgver=6.0.6.2
+pkgver=6.1.0.3
pkgrel=0
pkgdesc="LibreOffice - Meta package for the full office suite"
url="http://www.libreoffice.org/"
@@ -18,7 +18,7 @@ depends_dev="cups-dev libjpeg-turbo-dev boost-dev clucene-dev libe-book-dev icu-
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 xmlsec-dev gpgme-dev libepubgen-dev
- libqxp-dev liborcus-dev"
+ libqxp-dev liborcus-dev libnumbertext-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
@@ -54,13 +54,16 @@ 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-3235.tar.bz2
+ $_addsrcurl/pdfium-3426.tar.bz2
+ $_addsrcurl/lxml-4.1.1.tgz
http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
linux-musl.patch
fix-execinfo.patch
fix-includes.patch
disable-liborcus-unittest.patch
+ musl-stacksize.patch
+ musl-libintl.patch
"
languages=""
@@ -348,9 +351,9 @@ sdk_doc() {
_split sdk_doc
}
-sha512sums="8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517 libreoffice-6.0.6.2.tar.xz
-7b84e2ec964b02e5d2fe17f7879080571fce02d090cde0e09de07af5419c8b7879e88a53fd1231d1195e3d29a2919c33a7d85f11c469cd87670ad67921cf8b9b libreoffice-dictionaries-6.0.6.2.tar.xz
-fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5bf04fe0680807cb9af5f46f838bac6e6a5c88f90f88c5f2c libreoffice-translations-6.0.6.2.tar.xz
+sha512sums="9461c183a41d23aecd3de75b2ec765def426643b19f25aeff4524f06e510a46677a8449c294881d59173398453e2cc4c11dbaa79ef642c2b9886d504c0b7667f libreoffice-6.1.0.3.tar.xz
+9a6adb29fa60ece389b8779ab39666804f92961d479e87f8c2878340ec0cde123333e76768302e510b17e95c06b3b51a22e862de850996449df0e633e65c5500 libreoffice-dictionaries-6.1.0.3.tar.xz
+8510d5f98ad62c0489a6f79093aa35956dc8512ab9b332105227721cce6c4a0fe6d84ed2708196bb98cd17b4410e844e2250902d19f370cf3efe43aa1935670f libreoffice-translations-6.1.0.3.tar.xz
a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 commons-logging-1.2-src.tar.gz
a04eca6a57807358bd4f8d017a2eeaa58403ef51fab11fc46ab089113a0ff5f66aaa793d3fc57b484334cbf51ed388a90d8d72d1e5819c8248cc0113ac928a77 beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
@@ -367,9 +370,12 @@ c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9
654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-dde98eb9bcd484486b3cd51a0d659d880f47cfe056485294b270bd0f23c824b9279f117c002d6539c6bb1d099372f59be633b11b1ff1671a74cfbea9ad608af5 pdfium-3235.tar.bz2
+8086cdb18f5591a90dfd5fdfcc3795bc37a8ea85cb9b0c12379788a4b8cc3f44dce2fe85c4bff31cf0f4a2c47c1420ba98eadd5ab0ea19c2af064391dcc47efa pdfium-3426.tar.bz2
+9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1 lxml-4.1.1.tgz
854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c 185d60944ea767075d27247c3162b3bc-unowinreg.dll
10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a linux-musl.patch
4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336 fix-execinfo.patch
-ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e fix-includes.patch
-056ec393ef36aa790919bdb976b100593481a3dffec0ec4095023df6706e0a2ccc3aec9383d8382b2fecbc77e13833599ead82fb712d7b7147bdf01175b4c5a9 disable-liborcus-unittest.patch"
+0591099d4e650601b180e80910cd0de9a904713087f189e4ceac96b9ec5654010c2b60fe17177c134f27acc02a753ad37c3b4866299585e1a9ae8667d895fe1a fix-includes.patch
+056ec393ef36aa790919bdb976b100593481a3dffec0ec4095023df6706e0a2ccc3aec9383d8382b2fecbc77e13833599ead82fb712d7b7147bdf01175b4c5a9 disable-liborcus-unittest.patch
+afaaf724c7b29aedb8dda238c76fd47688fb88fe07120f71c3b75e16e583bc7f16a803a64ef18bd7750de311c6589b66d0f0348cdce26068a846ff083273e2f7 musl-stacksize.patch
+d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3 musl-libintl.patch"
diff --git a/community/libreoffice/fix-includes.patch b/community/libreoffice/fix-includes.patch
index 4a837a94b13..d2048e284d9 100644
--- a/community/libreoffice/fix-includes.patch
+++ b/community/libreoffice/fix-includes.patch
@@ -11,26 +11,3 @@ index f177d86..99bb408 100644
#include <sys/socket.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
-diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
-index 932e928..b65ced7 100644
---- a/vcl/inc/headless/svpinst.hxx
-+++ b/vcl/inc/headless/svpinst.hxx
-@@ -30,7 +30,7 @@
-
- #include <list>
-
--#include <time.h>
-+#include <sys/time.h>
-
- #define VIRTUAL_DESKTOP_WIDTH 1024
- #define VIRTUAL_DESKTOP_HEIGHT 768
---- a/avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100
-+++ b/avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100
-@@ -15,6 +15,7 @@
- #if defined(_WIN32)
- typedef __int64 libvlc_time_t;
- #else
-+# include <stdint.h>
- typedef int64_t libvlc_time_t;
- #endif
-
diff --git a/community/libreoffice/musl-libintl.patch b/community/libreoffice/musl-libintl.patch
new file mode 100644
index 00000000000..ceaaaff5c1e
--- /dev/null
+++ b/community/libreoffice/musl-libintl.patch
@@ -0,0 +1,15 @@
+diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
+index 0bfcbad..99acee1 100644
+--- a/unotools/Library_utl.mk
++++ b/unotools/Library_utl.mk
+@@ -16,6 +16,10 @@ $(eval $(call gb_Library_use_externals,utl,\
+ boost_locale \
+ ))
+
++$(eval $(call gb_Library_add_libs,utl,\
++ -lintl \
++))
++
+ $(eval $(call gb_Library_use_custom_headers,utl,\
+ officecfg/registry \
+ ))
diff --git a/community/libreoffice/musl-stacksize.patch b/community/libreoffice/musl-stacksize.patch
new file mode 100644
index 00000000000..9968ccbd200
--- /dev/null
+++ b/community/libreoffice/musl-stacksize.patch
@@ -0,0 +1,39 @@
+diff -Naur libreoffice-6.1.0.3/sal/osl/unx/thread.cxx libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx
+--- libreoffice-6.1.0.3/sal/osl/unx/thread.cxx 2018-08-02 22:54:54.000000000 +0300
++++ libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx 2018-09-05 18:21:38.552838233 +0300
+@@ -249,7 +249,7 @@
+ short nFlags)
+ {
+ Thread_Impl* pImpl;
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ pthread_attr_t attr;
+ size_t stacksize;
+ #endif
+@@ -265,7 +265,7 @@
+
+ pthread_mutex_lock (&(pImpl->m_Lock));
+
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ if (pthread_attr_init(&attr) != 0)
+ return nullptr;
+
+@@ -282,7 +282,7 @@
+
+ if ((nRet = pthread_create (
+ &(pImpl->m_hThread),
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ &attr,
+ #else
+ PTHREAD_ATTR_DEFAULT,
+@@ -301,7 +301,7 @@
+ return nullptr;
+ }
+
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ pthread_attr_destroy(&attr);
+ #endif
+
generated by cgit v1.2.3 (git 2.41.0) at 2024-04-24 02:19:03 +0000