summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-28 20:21:52 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-30 10:58:23 +0100
commitb324a1984c21621342927fd072e7f5b1d5186855 (patch)
treec2d589b0650d5e1e9c9ca8069010a6afbfec66b6 /app-office/libreoffice/libreoffice-6.2.2.2.ebuild
parentapp-office/libreoffice-l10n: 6.2.2.2 version bump (diff)
downloadgentoo-b324a1984c21621342927fd072e7f5b1d5186855.tar.gz
gentoo-b324a1984c21621342927fd072e7f5b1d5186855.tar.bz2
gentoo-b324a1984c21621342927fd072e7f5b1d5186855.zip
app-office/libreoffice: Add 6.2.2.2-patchset-01, build w/ boost-1.69
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/libreoffice/libreoffice-6.2.2.2.ebuild')
-rw-r--r--app-office/libreoffice/libreoffice-6.2.2.2.ebuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/app-office/libreoffice/libreoffice-6.2.2.2.ebuild b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
index 6dfffd2394cb..abd92a269e11 100644
--- a/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
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
@@ -247,7 +247,9 @@ fi
PATCHES=(
# master branch
"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ # 6.2 stable branch
+ "${FILESDIR}/${P}-boost-1.69.patch"
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"