From 6a41f1fea474953d8ce4084237b5fc39e3310c01 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 18 Oct 2020 18:23:36 +0200 Subject: [PATCH] app-office/libreoffice: Drop unused patches Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner --- .../files/libreoffice-5.4-system-pyuno.patch | 42 ------------------- .../libreoffice-6.4.2.2-poppler-0.86.patch | 15 ------- 2 files changed, 57 deletions(-) delete mode 100644 app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch 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 83b56d1a19272..0000000000000 --- 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 c56ba89ade596..0000000000000 --- 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(pAction)->getURI().c_str(); -+#elif POPPLER_CHECK_VERSION(0, 72, 0) - const char* pURI = static_cast(pAction)->getURI()->c_str(); - #else - const char* pURI = static_cast(pAction)->getURI()->getCString();