summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-28 17:07:01 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-30 10:58:22 +0100
commit553b52c6edde8b456fee47d7b5a923a0bfc4935c (patch)
tree2c4230b81150508692cbf47fee5c23291a1703a3
parentapp-office/libreoffice: Drop offlinehelp hacks, use --with-help=html (diff)
downloadgentoo-553b52c6edde8b456fee47d7b5a923a0bfc4935c.tar.gz
gentoo-553b52c6edde8b456fee47d7b5a923a0bfc4935c.tar.bz2
gentoo-553b52c6edde8b456fee47d7b5a923a0bfc4935c.zip
app-office/libreoffice: Drop master qt5 patches from stable branch
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--app-office/libreoffice/libreoffice-6.2.9999.ebuild6
1 files changed, 2 insertions, 4 deletions
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 79a08e6a2d5..6dfffd2394c 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.2.1.1-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,9 +247,7 @@ fi
PATCHES=(
# master branch
"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/001-qt5-change-salgraphics-gettextlayout-def.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/002-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/003-qt5-fpicker-honor-autoextension.patch
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"