gentoo resync : 25.11.2020

7 files changed, 254 insertions, 57 deletions

diff --git a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
deleted file mode 100644
index 83b56d1a1927..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/desktop/scripts/soffice.sh	
-+++ a/desktop/scripts/soffice.sh	
-@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "$(uname -s)" in
- NetBSD|OpenBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
---- a/pyuno/source/module/uno.py	
-+++ a/pyuno/source/module/uno.py	
-@@ -16,11 +16,16 @@ 
- #   except in compliance with the License. You may obtain a copy of
- #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
-+import os
- import pyuno
- import sys
- import traceback
- import warnings
- 
-+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
-+
- # since on Windows sal3.dll no longer calls WSAStartup
- import socket
- 
---- a/pyuno/source/officehelper.py	
-+++ a/pyuno/source/officehelper.py	
-@@ -45,7 +45,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"):
-             sOffice += ".exe"
diff --git a/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch
deleted file mode 100644
index c56ba89ade59..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index e9c2a407c279..16ad04bf660a 100644
---- 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/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
new file mode 100644
index 000000000000..9c9d417cde9f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
@@ -0,0 +1,75 @@
+From 188ddcd482150b5fdeb44d97e57831e3e27b3f5b Mon Sep 17 00:00:00 2001
+From: Justin Luth <justin_luth@sil.org>
+Date: Mon, 28 Sep 2020 20:21:52 +0300
+Subject: tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
+
+This is a partial revert of LO 6.2
+commit 2ec0cf500222aef55d02df80154b47fbb92970c9
+
+I can't think of any excuse for how I possibly missed that
+xDocProps was being defined/used outside of this clause.
+Just plain stupid and blind.
+
+The good news is that the create and modified date still
+seem to be getting saved somehow/somewhere. So it isn't
+the disaster that it looks like it could have been.
+
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
+Tested-by: Jenkins
+Reviewed-by: Justin Luth <justin_luth@sil.org>
+(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+(cherry picked from commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547)
+
+Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104497
+Tested-by: Jenkins
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+---
+ sw/qa/extras/ww8export/ww8export3.cxx | 5 +++++
+ sw/source/filter/ww8/wrtww8.cxx       | 6 +++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx
+index 764ae66a20fa..9c83b6f62fa9 100644
+--- a/sw/qa/extras/ww8export/ww8export3.cxx
++++ b/sw/qa/extras/ww8export/ww8export3.cxx
+@@ -14,6 +14,7 @@
+ #include <com/sun/star/container/XIndexAccess.hpp>
+ #include <com/sun/star/drawing/FillStyle.hpp>
+ #include <com/sun/star/drawing/LineDash.hpp>
++#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+ #include <com/sun/star/graphic/XGraphic.hpp>
+ #include <com/sun/star/text/XFormField.hpp>
+ #include <com/sun/star/text/XTextTable.hpp>
+@@ -49,6 +50,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection, "tdf37778_readonlySection.d
+     // tdf#127862: page fill color (in this case white) was lost
+     uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+     CPPUNIT_ASSERT(drawing::FillStyle_NONE != getProperty<drawing::FillStyle>(xStyle, "FillStyle"));
++
++    // tdf#136983
++    uno::Reference<document::XDocumentPropertiesSupplier> xDPS(mxComponent, uno::UNO_QUERY);
++    CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009), xDPS->getDocumentProperties()->getPrintDate().Year);
+ }
+ 
+ DECLARE_WW8EXPORT_TEST(testTdf122429_header, "tdf122429_header.doc")
+diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
+index e908cab35162..8d4add7b34bf 100644
+--- a/sw/source/filter/ww8/wrtww8.cxx
++++ b/sw/source/filter/ww8/wrtww8.cxx
+@@ -501,7 +501,11 @@ static void WriteDop( WW8Export& rWrt )
+     uno::Reference<beans::XPropertySet> xProps;
+     if ( pDocShell )
+     {
+-        xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
++        uno::Reference<lang::XComponent> xModelComp(pDocShell->GetModel(), uno::UNO_QUERY);
++        xProps.set(xModelComp, uno::UNO_QUERY);
++        uno::Reference<document::XDocumentPropertiesSupplier> xDPS(xModelComp, uno::UNO_QUERY_THROW);
++        xDocProps = xDPS->getDocumentProperties();
++        OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
+ 
+         rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
+     }
+-- 
+cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
new file mode 100644
index 000000000000..fe20e3435d2a
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
@@ -0,0 +1,46 @@
+From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Sun, 1 Nov 2020 18:30:49 +0100
+Subject: fix build with ICU 68
+
+use standard true.
+
+/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)':
+/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope
+  363 |     body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
+      |                                        ^~~~
+
+/usr/include/unicode/umachine.h says:
+
+@deprecated ICU 68 Use standard "true" instead.
+
+Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057
+Tested-by: Jenkins
+Reviewed-by: Eike Rathke <erack@redhat.com>
+---
+ i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
+index b7ae49fbd96e..59ee46fa0e0f 100644
+--- a/i18npool/source/calendar/calendar_gregorian.cxx
++++ b/i18npool/source/calendar/calendar_gregorian.cxx
+@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
+             "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
+     int32_t nZoneOffset, nDSTOffset;
+     UErrorCode status = U_ZERO_ERROR;
+-    body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
++    body->getTimeZone().getOffset( fR,
++#if U_ICU_VERSION_MAJOR_NUM >= 68
++    true,
++#else
++    TRUE,
++#endif
++    nZoneOffset, nDSTOffset, status );
++
+     if ( !U_SUCCESS(status) ) throw ERROR;
+     status = U_ZERO_ERROR;
+     body->setTime( fR - (nZoneOffset + nDSTOffset), status );
+-- 
+cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
new file mode 100644
index 000000000000..bd7dc04cffe5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
@@ -0,0 +1,28 @@
+From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 6 Nov 2020 02:43:07 +0100
+Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing
+ from 0b14b9ec)
+
+Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ svx/source/dialog/fntctrl.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
+index d312d7ad5f49..10c84ca95222 100644
+--- a/svx/source/dialog/fntctrl.cxx
++++ b/svx/source/dialog/fntctrl.cxx
+@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
+          rCTLFont.SetFillColor( rColor );
+     }
+     else
+-        bTransparent = TRUE;
++        bTransparent = true;
+ 
+     rFont.SetTransparent( bTransparent );
+     rCJKFont.SetTransparent( bTransparent );
+-- 
+2.29.2
+
diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
new file mode 100644
index 000000000000..346699d5527c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
@@ -0,0 +1,82 @@
+From b9e5d5347e5dece693fe56b88570abc07a30a8ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Thu, 29 Oct 2020 15:45:01 +0000
+Subject: [PATCH] fix --disable-pdfium build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I580972220bc39abe16288fa62c717e4ab25833d9
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105015
+Tested-by: Jenkins
+Tested-by: René Engelhard <rene@debian.org>
+Reviewed-by: René Engelhard <rene@debian.org>
+Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
+---
+ vcl/source/filter/ipdf/pdfread.cxx       |  2 +-
+ xmlsecurity/source/pdfio/pdfdocument.cxx | 11 +++++++----
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
+index 3066c4deba4a..bf11578089e0 100644
+--- a/vcl/source/filter/ipdf/pdfread.cxx
++++ b/vcl/source/filter/ipdf/pdfread.cxx
+@@ -218,7 +218,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
+     (void)rBitmaps;
+     (void)nFirstPage;
+     (void)nPages;
+-    (void)fResolutionDPI;
++    (void)pSizeHint;
+     return 0;
+ #endif // HAVE_FEATURE_PDFIUM
+ }
+diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
+index c132d02cc2b0..b229206391f2 100644
+--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
++++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
+@@ -138,10 +138,10 @@ bool IsCompleteSignature(SvStream& rStream, vcl::filter::PDFDocument& rDocument,
+     return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != rAllEOFs.end();
+ }
+ 
++#if HAVE_FEATURE_PDFIUM
+ /// Collects the checksum of each page of one version of the PDF.
+ void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector<BitmapChecksum>& rPageChecksums)
+ {
+-#if HAVE_FEATURE_PDFIUM
+     auto pPdfium = vcl::pdf::PDFiumLibrary::get();
+     vcl::pdf::PDFiumDocument aPdfDocument(
+         FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), /*password=*/nullptr));
+@@ -158,10 +158,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector<BitmapChecksum
+         BitmapChecksum nPageChecksum = pPdfPage->getChecksum();
+         rPageChecksums.push_back(nPageChecksum);
+     }
+-#else
+-    (void)rStream;
+-#endif
+ }
++#endif
+ 
+ /**
+  * Checks if incremental updates after singing performed valid modifications only.
+@@ -175,6 +173,7 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu
+         return false;
+     }
+ 
++#if HAVE_FEATURE_PDFIUM
+     SvMemoryStream aSignatureStream;
+     sal_uInt64 nPos = rStream.Tell();
+     rStream.Seek(0);
+@@ -196,6 +195,10 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu
+     // Fail if any page looks different after signing and at the end. Annotations/commenting doesn't
+     // count, though.
+     return aSignedPages == aAllPages;
++#else
++    (void)rStream;
++    return true;
++#endif
+ }
+ }
+ 
+-- 
+2.26.2
+
diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch b/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch
new file mode 100644
index 000000000000..cc4e8e41df2e
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch
@@ -0,0 +1,23 @@
+Don't let PATH get in the way of proper Qt5 detection.
+It could lead to broken configure due to mismanaged qtchooser config.
+
+--- a/configure.ac	2020-11-21 16:35:58.433794709 +0100
++++ b/configure.ac	2020-11-21 18:02:41.835207197 +0100
+@@ -11819,7 +11819,7 @@
+     qt5_test_library="libQt5Widgets.so"
+ 
+     dnl Check for qmake5
+-    AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH])
++    AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin])
+     if test "$QMAKE5" = "no"; then
+         AC_MSG_ERROR([Qmake not found.  Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
+     else
+@@ -11886,7 +11886,7 @@
+ 
+     dnl Check for Meta Object Compiler
+ 
+-    AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH])
++    AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
+     if test "$MOC5" = "no"; then
+         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+ the root of your Qt installation by exporting QT5DIR before running "configure".])