| 1 |
commit: 0f3b29bb1e019af4afd5b3bc34abb03ddf4f509b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 24 23:12:25 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 25 21:52:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3b29bb |
| 7 |
|
| 8 |
app-office/libreoffice: Allow alternatives to kioclient:4 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch | 11 +++++++++++ |
| 13 |
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 3 ++- |
| 14 |
app-office/libreoffice/libreoffice-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 15 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..a6e732f7f37 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch |
| 22 |
@@ -0,0 +1,11 @@ |
| 23 |
+--- a/shell/source/unix/misc/senddoc.sh 2017-06-15 15:44:22.000000000 +0200 |
| 24 |
++++ b/shell/source/unix/misc/senddoc.sh 2017-06-25 01:00:08.525435930 +0200 |
| 25 |
+@@ -389,6 +389,8 @@ |
| 26 |
+ elif [ -n "$DESKTOP_LAUNCH" ]; then |
| 27 |
+ # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html |
| 28 |
+ MAILER=${DESKTOP_LAUNCH} |
| 29 |
++ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then |
| 30 |
++ MAILER=/usr/bin/kde-open5 |
| 31 |
+ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then |
| 32 |
+ MAILER=/usr/bin/kde-open |
| 33 |
+ elif [ -x /usr/bin/xdg-open ] ; then |
| 34 |
|
| 35 |
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild |
| 36 |
index 5f6ac8e8e0d..186bd71a3a3 100644 |
| 37 |
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild |
| 38 |
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild |
| 39 |
@@ -181,8 +181,8 @@ RDEPEND="${COMMON_DEPEND} |
| 40 |
media-fonts/liberation-fonts |
| 41 |
media-fonts/libertine |
| 42 |
media-fonts/urw-fonts |
| 43 |
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) ) |
| 44 |
java? ( >=virtual/jre-1.6 ) |
| 45 |
- kde? ( $(add_kdeapps_dep kioclient) ) |
| 46 |
vlc? ( media-video/vlc ) |
| 47 |
" |
| 48 |
|
| 49 |
@@ -243,6 +243,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 50 |
PATCHES=( |
| 51 |
# not upstreamable stuff |
| 52 |
"${FILESDIR}/${PN}-5.3-system-pyuno.patch" |
| 53 |
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 54 |
|
| 55 |
# TODO: upstream |
| 56 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 57 |
|
| 58 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 59 |
index ccb30f204f7..ca3407b6f01 100644 |
| 60 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 61 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 62 |
@@ -184,8 +184,8 @@ RDEPEND="${COMMON_DEPEND} |
| 63 |
media-fonts/liberation-fonts |
| 64 |
media-fonts/libertine |
| 65 |
media-fonts/urw-fonts |
| 66 |
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) ) |
| 67 |
java? ( >=virtual/jre-1.6 ) |
| 68 |
- kde? ( $(add_kdeapps_dep kioclient) ) |
| 69 |
vlc? ( media-video/vlc ) |
| 70 |
" |
| 71 |
|
| 72 |
@@ -246,6 +246,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 73 |
PATCHES=( |
| 74 |
# not upstreamable stuff |
| 75 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 76 |
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 77 |
|
| 78 |
# TODO: upstream |
| 79 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
Archives