[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Sturmlechner]

commit:     95bffe595339a4c3ee6459fb5c2a96b9748ec4b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 18:13:13 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 18:14:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bffe59

app-office/libreoffice: Adjust patchset use, apply only non-backported

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libreoffice/libreoffice-6.2.9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild 
b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index fc17e0a1d33..61a6eda8409 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -246,7 +246,11 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-       "${WORKDIR}"/${PATCHSET/.tar.xz/}
+       # master branch
+       
"${WORKDIR}"/${PATCHSET/.tar.xz/}/007-kde5-allow-multiple-mimetypes-clipboard.patch
+       "${WORKDIR}"/${PATCHSET/.tar.xz/}/008-kde5-fix-selection-clipboard.patch
+       
"${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch
+       "${WORKDIR}"/${PATCHSET/.tar.xz/}/012-kde5-no-images-to-clipboard.patch
 
        # not upstreamable stuff
        "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
@@ -306,8 +310,6 @@ src_unpack() {
 }
 
 src_prepare() {
-       rm "${WORKDIR}"/${PATCHSET/.tar.xz/}/00{3,4}*.patch || die # drop 
backported to 6.2
-
        default
 
        # sandbox violations on many systems, we don't need it. Bug #646406