From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1069314-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 598A3138334
for <garchives@archives.gentoo.org>; Mon, 28 Jan 2019 19:31:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9B88EE14D2;
Mon, 28 Jan 2019 18:15:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 75919E14D2
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Jan 2019 18:15:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 36D15335D84
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Jan 2019 18:15:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BFA14D7
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Jan 2019 18:15:05 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1548699290.95bffe595339a4c3ee6459fb5c2a96b9748ec4b5.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/libreoffice/libreoffice-6.2.9999.ebuild
X-VCS-Directories: app-office/libreoffice/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 95bffe595339a4c3ee6459fb5c2a96b9748ec4b5
X-VCS-Branch: master
Date: Mon, 28 Jan 2019 18:15:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f5fc77e6-7532-462f-84c1-bd99a1c5a120
X-Archives-Hash: d89180e511f411923da5c9a250551fe0
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