community/libreoffice: upgrade to 6.2.4.2

5 files changed, 31 insertions, 35 deletions

diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index a0be75d6ed..a9a1e03918 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=6.2.3.2
-pkgrel=3
+pkgver=6.2.4.2
+pkgrel=0
 pkgdesc="LibreOffice - Meta package for the full office suite"
 url="https://www.libreoffice.org/"
 arch="all !s390x"
@@ -347,9 +347,9 @@ sdk_doc() {
 	_split sdk_doc
 }
 
-sha512sums="06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000  libreoffice-6.2.3.2.tar.xz
-cdae39342028ccb2048a6a43ed68d0e59536ec3a7a0d7d7cb7a69ca1e38a7bfd836200adfaebf32a330ea038ab9d69ada95763caccf7ecbe7bfa54f514418c35  libreoffice-dictionaries-6.2.3.2.tar.xz
-aa91ea5564cf7684dc9fe1d991a0d4de386eba1d295bd16b2f99a221b1f872f0c25a2975e90148dc5b01d5eb31117548945cf52976b90f486375bacff3701bcc  libreoffice-translations-6.2.3.2.tar.xz
+sha512sums="d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5  libreoffice-6.2.4.2.tar.xz
+a5b0e06961a9b2b10401cf8692b204aa437ad113ec6991605f750f36452309fcacfc8cf98e7f886038698f7e68bf2790800441d1b90198b830281747d05b202f  libreoffice-dictionaries-6.2.4.2.tar.xz
+f7c45d26364ac813eb77d020410542622989d809413dde0deea4c54bbf289dcf577b4ebd77490af691bc9cbec541da219d5e7bc64e67bf5b724f19e3c3272bd0  libreoffice-translations-6.2.4.2.tar.xz
 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44  3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a  35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -370,9 +370,9 @@ c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9
 634eafb22078b113d3c05dd3dd78f853aa8a09ba11ec1ead8fc3435772ea2f8f4e9783af631107616893c38308bf3b4a25a216a53b76f2b532c0adde087635cc  pdfium-3550.tar.bz2
 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c  185d60944ea767075d27247c3162b3bc-unowinreg.dll
 359ba0314a0e5094aa2a10067e5613b10cb9044dca04d49bae68afd8a49d88e070b9a5321b77fd15ef5685109f664409ae1af24d40edd7b462f1366a1967b0e2  49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
-10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a  linux-musl.patch
-4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336  fix-execinfo.patch
+81207be7cb9d65664d96cc8f7f36b2da5642b6d8529346b638812a59303b08d881bd0552cc4accac2205293442324dc34a067dcf0daa713880311b67916bae98  linux-musl.patch
+c2970c482b3d6557272fe07eda236613176662dd0b789a24dbbea17a33cb6aa55d981feb96a650298828d5cb3e7f51040ca7577ea6fde595321dc22e99e14248  fix-execinfo.patch
 0591099d4e650601b180e80910cd0de9a904713087f189e4ceac96b9ec5654010c2b60fe17177c134f27acc02a753ad37c3b4866299585e1a9ae8667d895fe1a  fix-includes.patch
-056ec393ef36aa790919bdb976b100593481a3dffec0ec4095023df6706e0a2ccc3aec9383d8382b2fecbc77e13833599ead82fb712d7b7147bdf01175b4c5a9  disable-liborcus-unittest.patch
-afaaf724c7b29aedb8dda238c76fd47688fb88fe07120f71c3b75e16e583bc7f16a803a64ef18bd7750de311c6589b66d0f0348cdce26068a846ff083273e2f7  musl-stacksize.patch
+83081b999cedb631122d59d77f74b60adf97e412de924306e35d8d7975e5f5d17694907166136cb865f30c51d8669b79e871d6e8450c8b0038e7d6cdee5cdc02  disable-liborcus-unittest.patch
+9abb0b14b7c408705569f26f6ed6519630ee7b98ff9c959eb53bb5efec6c08cae906f3c82943aee21098ab09c6caf58443a0dbe347d7dc5c8b6637f3665abca2  musl-stacksize.patch
 d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3  musl-libintl.patch"
diff --git a/community/libreoffice/disable-liborcus-unittest.patch b/community/libreoffice/disable-liborcus-unittest.patch
index afdca6bb6a..b6caa59b49 100644
--- a/community/libreoffice/disable-liborcus-unittest.patch
+++ b/community/libreoffice/disable-liborcus-unittest.patch
@@ -1,6 +1,6 @@
---- a/sc/qa/unit/subsequent_filters-test.cxx	2018-02-22 18:45:41.000000000 +0100
-+++ b/sc/qa/unit/subsequent_filters-test.cxx	2018-03-02 11:24:08.616015560 +0100
-@@ -2395,7 +2395,9 @@
+--- a/sc/qa/unit/subsequent_filters-test.cxx
++++ b/sc/qa/unit/subsequent_filters-test.cxx
+@@ -2540,7 +2540,9 @@
      CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute background, but it should have.",
          pStyleSheet->GetItemSet().HasItem(ATTR_BACKGROUND, &pItem));
      const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>(pItem);
diff --git a/community/libreoffice/fix-execinfo.patch b/community/libreoffice/fix-execinfo.patch
index 4c3b359174..cb59cee452 100644
--- a/community/libreoffice/fix-execinfo.patch
+++ b/community/libreoffice/fix-execinfo.patch
@@ -1,5 +1,3 @@
-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 @@
@@ -11,8 +9,6 @@ index 5fafc1c..408c12c 100644
  
  #include <execinfo.h>
  
-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 @@
@@ -24,11 +20,10 @@ index f4c9a9c..da6d9cf 100644
  #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 )
+@@ -279,7 +279,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
      }
  }
  
diff --git a/community/libreoffice/linux-musl.patch b/community/libreoffice/linux-musl.patch
index 5fbf6b31cd..bdd6f8f0f0 100644
--- a/community/libreoffice/linux-musl.patch
+++ b/community/libreoffice/linux-musl.patch
@@ -1,6 +1,6 @@
---- libreoffice-5.3.0.3/configure.ac.orig	2017-01-26 22:22:46.000000000 +0000
-+++ libreoffice-5.3.0.3/configure.ac	2017-02-08 13:14:16.777547599 +0000
-@@ -652,7 +652,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -592,7 +592,7 @@
      fi
      ;;
  
@@ -9,7 +9,7 @@
      test_gtk=yes
      build_gstreamer_1_0=yes
      build_gstreamer_0_10=yes
-@@ -4170,7 +4170,7 @@
+@@ -4149,7 +4149,7 @@
      esac
      ;;
  
@@ -18,7 +18,7 @@
      COM=GCC
      USING_X11=TRUE
      OS=LINUX
-@@ -7197,7 +7197,7 @@
+@@ -7277,7 +7277,7 @@
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
          ;;
  
@@ -27,9 +27,9 @@
          JAVAINC="-I$JAVA_HOME/include"
          JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -9748,21 +9748,6 @@
- fi
- AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
+@@ -9860,21 +9860,6 @@
+ AC_SUBST(ENABLE_LIBNUMBERTEXT)
+ AC_SUBST(LIBNUMBERTEXT_CFLAGS)
  
 -dnl ***************************************
 -dnl testing libc version for Linux...
@@ -47,9 +47,9 @@
 -fi
 -
  dnl =========================================
- dnl Check for the Windows  SDK.
+ dnl Check for uuidgen
  dnl =========================================
-@@ -12775,7 +12760,7 @@
+@@ -12834,7 +12819,7 @@
  
      case "$host_os" in
  
diff --git a/community/libreoffice/musl-stacksize.patch b/community/libreoffice/musl-stacksize.patch
index 9968ccbd20..5e722053d5 100644
--- a/community/libreoffice/musl-stacksize.patch
+++ b/community/libreoffice/musl-stacksize.patch
@@ -1,7 +1,6 @@
-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 @@
+--- a/sal/osl/unx/thread.cxx
++++ b/sal/osl/unx/thread.cxx
+@@ -250,7 +250,7 @@
      short             nFlags)
  {
      Thread_Impl* pImpl;
@@ -10,7 +9,8 @@ diff -Naur libreoffice-6.1.0.3/sal/osl/unx/thread.cxx libreoffice-6.1.0.3-patche
      pthread_attr_t attr;
      size_t stacksize;
  #endif
-@@ -265,7 +265,7 @@
+
+@@ -266,7 +266,7 @@
 
      pthread_mutex_lock (&(pImpl->m_Lock));
 
@@ -19,7 +19,7 @@ diff -Naur libreoffice-6.1.0.3/sal/osl/unx/thread.cxx libreoffice-6.1.0.3-patche
      if (pthread_attr_init(&attr) != 0)
          return nullptr;
 
-@@ -282,7 +282,7 @@
+@@ -283,7 +283,7 @@
 
      if ((nRet = pthread_create (
          &(pImpl->m_hThread),
@@ -28,6 +28,7 @@ diff -Naur libreoffice-6.1.0.3/sal/osl/unx/thread.cxx libreoffice-6.1.0.3-patche
          &attr,
  #else
          PTHREAD_ATTR_DEFAULT,
+
 @@ -301,7 +301,7 @@
          return nullptr;
      }