summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-01-28 19:13:13 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-01-28 19:14:50 +0100
commit95bffe595339a4c3ee6459fb5c2a96b9748ec4b5 (patch)
tree06700d726e19849b131368ac4e5c991dbea8f4df /app-office
parentapp-office/kmymoney: 5.0.3 version bump (diff)
downloadgentoo-95bffe595339a4c3ee6459fb5c2a96b9748ec4b5.tar.gz
gentoo-95bffe595339a4c3ee6459fb5c2a96b9748ec4b5.tar.bz2
gentoo-95bffe595339a4c3ee6459fb5c2a96b9748ec4b5.zip
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@gentoo.org>
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/libreoffice-6.2.9999.ebuild8
1 files 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