From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 939F6138239 for ; Sat, 30 Mar 2019 10:00:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1231BE085D; Sat, 30 Mar 2019 09:59:59 +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 DE8ECE085A for ; Sat, 30 Mar 2019 09:59:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9E4BB335D3C for ; Sat, 30 Mar 2019 09:59:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59CCE58A for ; Sat, 30 Mar 2019 09:59:54 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1553939902.553b52c6edde8b456fee47d7b5a923a0bfc4935c.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: 553b52c6edde8b456fee47d7b5a923a0bfc4935c X-VCS-Branch: master Date: Sat, 30 Mar 2019 09:59:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67222334-0bf3-4755-ae5a-056092efa3e6 X-Archives-Hash: 221d9baefc493f63ab03bc73e984aea6 commit: 553b52c6edde8b456fee47d7b5a923a0bfc4935c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 28 16:07:01 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 30 09:58:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553b52c6 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 gentoo.org> app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 ++---- 1 file 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"