Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
Date: Mon, 11 Jun 2018 18:45:28
Message-Id: 1528742704.f35c610d7919a72eb4f1840b9225255c5305640f.asturm@gentoo
1 commit: f35c610d7919a72eb4f1840b9225255c5305640f
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 11 18:45:04 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 11 18:45:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35c610d
7
8 app-office/libreoffice: Drop upstreamed patch from 6.0 stable branch
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 --
13 1 file changed, 2 deletions(-)
14
15 diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
16 index 58a7a8a3240..b1c28905c33 100644
17 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
18 +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
19 @@ -247,8 +247,6 @@ PATCHES=(
20 "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
21 "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
22 "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
23 - # 6.1 branch
24 - "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
25
26 # TODO: upstream
27 "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"