community/libreoffice: upgrade to 6.4.1.2

5 files changed, 30 insertions, 15 deletions

diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index ac92b37934..dc471ad99e 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.4.0.3
-pkgrel=1
+pkgver=6.4.1.2
+pkgrel=0
 pkgdesc="LibreOffice - Meta package for the full office suite"
 url="https://www.libreoffice.org/"
 arch="all !s390x"
@@ -134,6 +134,7 @@ source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-
 	disable-liborcus-unittest.patch
 	musl-stacksize.patch
 	musl-libintl.patch
+	fix-poppler.patch
 	"
 
 # secfixes:
@@ -430,9 +431,9 @@ sdk_doc() {
 	_split sdk_doc
 }
 
-sha512sums="1ea4b5865b7ad7d7400a775e153b00aa01d188844b580b26adb0d513db5f29a880cac145a746f139d236fff8fb5e8ed316943551de2e2eea218ab96bf177ca42  libreoffice-6.4.0.3.tar.xz
-6e6bd33c86b6fe0744b9db70982aca8032011ceda55db30a8214b822dd77ad4760518f58aa42fed10996081ce91bf791fc332a8273664d5dd2141cc88eaaba97  libreoffice-dictionaries-6.4.0.3.tar.xz
-168800ec5526f69febf6f37df4d04c0c42d26595587339721141c40c9812d9398bef7618732244759d65b4ccf46072b65536504c37c95f73e1ab91e6582ee75d  libreoffice-translations-6.4.0.3.tar.xz
+sha512sums="24be7af0f8f9a6e679a5c2af7ebbe19533d3ad9835494a98fb12ee99acd3b5bb2e52b3fe8deb44c25d7d549aa7ea02a286b2c5bda3fafeb33eb59f293c04808e  libreoffice-6.4.1.2.tar.xz
+6d0317d74b033ba6d0323398a1ec466cb4de9a7532daaec1bb7f0f1c25221fb44a2c0ad9fba4d2a8c5bb956e70ed8f2e1e05efb1320792aca5a8b83482a32883  libreoffice-dictionaries-6.4.1.2.tar.xz
+8565020d210d865d518133746a2757cf9e84c2852007736c58fca462610af499774b06b6bf2a4933f12fe2b13187d04511341bc299f8ab0d62deb451eb97554b  libreoffice-translations-6.4.1.2.tar.xz
 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44  3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a  35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -454,8 +455,9 @@ b4f47cf210314de3ab5a7cfb913ea6109894d3c6bd6ac0d3aed3629e6bf733ef0f6af122bd8b8a47
 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0  QR-Code-generator-1.4.0.tar.gz
 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c  185d60944ea767075d27247c3162b3bc-unowinreg.dll
 ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8  884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
-e82eae19462f089ba37ffac3ee5e5834fa0fe93ed3e4b2cd2cb46546cc84137c9cb377910e0d91cc0727892cd93e2d957e144ec31139e76d9dc4a2f2609acec9  linux-musl.patch
-c2970c482b3d6557272fe07eda236613176662dd0b789a24dbbea17a33cb6aa55d981feb96a650298828d5cb3e7f51040ca7577ea6fde595321dc22e99e14248  fix-execinfo.patch
-83081b999cedb631122d59d77f74b60adf97e412de924306e35d8d7975e5f5d17694907166136cb865f30c51d8669b79e871d6e8450c8b0038e7d6cdee5cdc02  disable-liborcus-unittest.patch
+d5e4b5cc2b1528d474dc60e4f9c65f679c199dcf48495b4bef8187edaccf13cfaf2be667344f303cd3a19d46bbc99b0014656c6eb4d20739e87d46bd62ac48ca  linux-musl.patch
+417ad2849ff9e189ec0247bbd5fe241988e6377a17a0842013eebf1879627fb520408ce97088827eaff8b4c37b702c9946bde2799d2ac61fac6f040ad078de8f  fix-execinfo.patch
+121827c1eaa0d09a8ccc757e18c7306fef0b8a22335a1910606d1a59891b8ae33fbe85581baa8b2da79dafd27d952d89c4402f0ffb37cb4f702418d50abf0c90  disable-liborcus-unittest.patch
 9abb0b14b7c408705569f26f6ed6519630ee7b98ff9c959eb53bb5efec6c08cae906f3c82943aee21098ab09c6caf58443a0dbe347d7dc5c8b6637f3665abca2  musl-stacksize.patch
-d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3  musl-libintl.patch"
+d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3  musl-libintl.patch
+9f4755f5773e6c98f675dd4082878b4a4c32b6706f8ff669b231cea682394f921eab9392ca3681e63512bfb19bff69ced5ee0ff8fd300995303b4b3eeef561df  fix-poppler.patch"
diff --git a/community/libreoffice/disable-liborcus-unittest.patch b/community/libreoffice/disable-liborcus-unittest.patch
index b6caa59b49..318d5084c8 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
 +++ b/sc/qa/unit/subsequent_filters-test.cxx
-@@ -2540,7 +2540,9 @@
+@@ -2546,7 +2546,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 cb59cee452..fa2edad408 100644
--- a/community/libreoffice/fix-execinfo.patch
+++ b/community/libreoffice/fix-execinfo.patch
@@ -11,7 +11,7 @@
  
 --- a/sal/osl/unx/signal.cxx
 +++ b/sal/osl/unx/signal.cxx
-@@ -35,7 +35,7 @@
+@@ -36,7 +36,7 @@
  
  #endif /* MACOSX */
  
diff --git a/community/libreoffice/fix-poppler.patch b/community/libreoffice/fix-poppler.patch
new file mode 100644
index 0000000000..feac54d5c4
--- /dev/null
+++ b/community/libreoffice/fix-poppler.patch
@@ -0,0 +1,13 @@
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+     if (!(pAction && pAction->getKind() == actionURI))
+         return;
+ 
+-#if POPPLER_CHECK_VERSION(0, 72, 0)
++#if POPPLER_CHECK_VERSION(0, 86, 0)
++    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
++#elif POPPLER_CHECK_VERSION(0, 72, 0)
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ #else
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
diff --git a/community/libreoffice/linux-musl.patch b/community/libreoffice/linux-musl.patch
index 97e1de3e11..fd71d9748e 100644
--- a/community/libreoffice/linux-musl.patch
+++ b/community/libreoffice/linux-musl.patch
@@ -9,7 +9,7 @@
      build_gstreamer_1_0=yes
      test_kf5=yes
      test_gtk3_kde5=yes
-@@ -4341,7 +4341,7 @@
+@@ -4353,7 +4353,7 @@
      esac
      ;;
  
@@ -18,7 +18,7 @@
      COM=GCC
      USING_X11=TRUE
      OS=LINUX
-@@ -7644,7 +7644,7 @@
+@@ -7672,7 +7672,7 @@
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
          ;;
  
@@ -27,7 +27,7 @@
          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"
-@@ -10232,21 +10232,6 @@
+@@ -10260,21 +10260,6 @@
  AC_SUBST(ENABLE_LIBNUMBERTEXT)
  AC_SUBST(LIBNUMBERTEXT_CFLAGS)
  
@@ -49,7 +49,7 @@
  dnl =========================================
  dnl Check for uuidgen
  dnl =========================================
-@@ -12799,7 +12784,7 @@
+@@ -12812,7 +12812,7 @@
  
      case "$host_os" in