| 1 |
commit: d09290006a6203b3fad5375584a98b2ce46ad8f1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 18:35:53 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 18:37:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0929000 |
| 7 |
|
| 8 |
app-office/libreoffice: Fix system-pyuno patch, missing deps |
| 9 |
|
| 10 |
--disable-pdfium until it is packaged |
| 11 |
|
| 12 |
Thanks-to: jospezial <jospezial <AT> gmx.de> |
| 13 |
Gentoo-bug: 609050, 609054 |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 16 |
|
| 17 |
.../files/libreoffice-5.4-system-pyuno.patch | 42 ++++++++++++++++++++++ |
| 18 |
app-office/libreoffice/libreoffice-9999.ebuild | 10 ++++-- |
| 19 |
2 files changed, 49 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch |
| 22 |
new file mode 100644 |
| 23 |
index 0000000000..83b56d1a19 |
| 24 |
--- /dev/null |
| 25 |
+++ b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch |
| 26 |
@@ -0,0 +1,42 @@ |
| 27 |
+--- a/desktop/scripts/soffice.sh |
| 28 |
++++ a/desktop/scripts/soffice.sh |
| 29 |
+@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then |
| 30 |
+ exit 1; |
| 31 |
+ fi |
| 32 |
+ |
| 33 |
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} |
| 34 |
++export PYTHONPATH |
| 35 |
++ |
| 36 |
+ case "$(uname -s)" in |
| 37 |
+ NetBSD|OpenBSD|DragonFly) |
| 38 |
+ # this is a temporary hack until we can live with the default search paths |
| 39 |
+--- a/pyuno/source/module/uno.py |
| 40 |
++++ a/pyuno/source/module/uno.py |
| 41 |
+@@ -16,11 +16,16 @@ |
| 42 |
+ # except in compliance with the License. You may obtain a copy of |
| 43 |
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 . |
| 44 |
+ # |
| 45 |
++import os |
| 46 |
+ import pyuno |
| 47 |
+ import sys |
| 48 |
+ import traceback |
| 49 |
+ import warnings |
| 50 |
+ |
| 51 |
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') |
| 52 |
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: |
| 53 |
++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" |
| 54 |
++ |
| 55 |
+ # since on Windows sal3.dll no longer calls WSAStartup |
| 56 |
+ import socket |
| 57 |
+ |
| 58 |
+--- a/pyuno/source/officehelper.py |
| 59 |
++++ a/pyuno/source/officehelper.py |
| 60 |
+@@ -45,7 +45,7 @@ def bootstrap(): |
| 61 |
+ if "UNO_PATH" in os.environ: |
| 62 |
+ sOffice = os.environ["UNO_PATH"] |
| 63 |
+ else: |
| 64 |
+- sOffice = "" # lets hope for the best |
| 65 |
++ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" |
| 66 |
+ sOffice = os.path.join(sOffice, "soffice") |
| 67 |
+ if platform.startswith("win"): |
| 68 |
+ sOffice += ".exe" |
| 69 |
|
| 70 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 71 |
index edc20fcdbb..c2b9b736ca 100644 |
| 72 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 73 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 74 |
@@ -89,7 +89,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
| 75 |
COMMON_DEPEND="${PYTHON_DEPS} |
| 76 |
app-arch/unzip |
| 77 |
app-arch/zip |
| 78 |
- app-crypt/gpgme |
| 79 |
+ app-crypt/gpgme[cxx] |
| 80 |
app-text/hunspell |
| 81 |
>=app-text/libabw-0.1.0 |
| 82 |
>=app-text/libebook-0.1 |
| 83 |
@@ -112,6 +112,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 84 |
dev-libs/expat |
| 85 |
dev-libs/hyphen |
| 86 |
dev-libs/icu:= |
| 87 |
+ dev-libs/libassuan |
| 88 |
+ dev-libs/libgpg-error |
| 89 |
>=dev-libs/liborcus-0.12.1 |
| 90 |
dev-libs/librevenge |
| 91 |
dev-libs/nspr |
| 92 |
@@ -244,7 +246,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 93 |
|
| 94 |
PATCHES=( |
| 95 |
# not upstreamable stuff |
| 96 |
- "${FILESDIR}/${PN}-5.3-system-pyuno.patch" |
| 97 |
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 98 |
|
| 99 |
# TODO: upstream |
| 100 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 101 |
@@ -434,6 +436,7 @@ src_configure() { |
| 102 |
# --disable-report-builder: too much java packages pulled in without pkgs |
| 103 |
# --without-system-sane: just sane.h header that is used for scan in writer, |
| 104 |
# not linked or anything else, worthless to depend on |
| 105 |
+ # --disable-pdfium: not yet packaged |
| 106 |
econf \ |
| 107 |
--with-system-dicts \ |
| 108 |
--with-system-epoxy \ |
| 109 |
@@ -454,6 +457,7 @@ src_configure() { |
| 110 |
--disable-fetch-external \ |
| 111 |
--disable-gstreamer-0-10 \ |
| 112 |
--disable-online-update \ |
| 113 |
+ --disable-pdfium \ |
| 114 |
--disable-report-builder \ |
| 115 |
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ |
| 116 |
--with-build-version="Gentoo official package" \ |
| 117 |
@@ -471,7 +475,7 @@ src_configure() { |
| 118 |
--without-myspell-dicts \ |
| 119 |
--without-help \ |
| 120 |
--with-helppack-integration \ |
| 121 |
- --with-system-gpgme \ |
| 122 |
+ --with-system-gpgmepp \ |
| 123 |
--without-system-sane \ |
| 124 |
$(use_enable bluetooth sdremote-bluetooth) \ |
| 125 |
$(use_enable coinmp) \ |
Archives