| 1 |
commit: 95bffe595339a4c3ee6459fb5c2a96b9748ec4b5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 28 18:13:13 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 28 18:14:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bffe59 |
| 7 |
|
| 8 |
app-office/libreoffice: Adjust patchset use, apply only non-backported |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 8 +++++--- |
| 14 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 17 |
index fc17e0a1d33..61a6eda8409 100644 |
| 18 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 19 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 20 |
@@ -246,7 +246,11 @@ DEPEND="${COMMON_DEPEND} |
| 21 |
" |
| 22 |
|
| 23 |
PATCHES=( |
| 24 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 25 |
+ # master branch |
| 26 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/007-kde5-allow-multiple-mimetypes-clipboard.patch |
| 27 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/008-kde5-fix-selection-clipboard.patch |
| 28 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch |
| 29 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/012-kde5-no-images-to-clipboard.patch |
| 30 |
|
| 31 |
# not upstreamable stuff |
| 32 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 33 |
@@ -306,8 +310,6 @@ src_unpack() { |
| 34 |
} |
| 35 |
|
| 36 |
src_prepare() { |
| 37 |
- rm "${WORKDIR}"/${PATCHSET/.tar.xz/}/00{3,4}*.patch || die # drop backported to 6.2 |
| 38 |
- |
| 39 |
default |
| 40 |
|
| 41 |
# sandbox violations on many systems, we don't need it. Bug #646406 |
Archives