1 |
commit: 553b52c6edde8b456fee47d7b5a923a0bfc4935c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 28 16:07:01 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 30 09:58:22 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553b52c6 |
7 |
|
8 |
app-office/libreoffice: Drop master qt5 patches from stable branch |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 ++---- |
14 |
1 file changed, 2 insertions(+), 4 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 79a08e6a2d5..6dfffd2394c 100644 |
18 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
19 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
20 |
@@ -18,7 +18,7 @@ DEV_URI=" |
21 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
22 |
|
23 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
24 |
-PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz" |
25 |
+# PATCHSET="${P}-patchset-01.tar.xz" |
26 |
|
27 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
28 |
inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg |
29 |
@@ -247,9 +247,7 @@ fi |
30 |
PATCHES=( |
31 |
# master branch |
32 |
"${FILESDIR}/${PN}-6.2-ldap-optional.patch" |
33 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/001-qt5-change-salgraphics-gettextlayout-def.patch |
34 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/002-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch |
35 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/003-qt5-fpicker-honor-autoextension.patch |
36 |
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
37 |
|
38 |
# not upstreamable stuff |
39 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |