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 7174A138359 for ; Sun, 22 Nov 2020 22:42:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8897BE07D8; Sun, 22 Nov 2020 22:42:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 59D49E07D8 for ; Sun, 22 Nov 2020 22:42:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E0AC8335D9B for ; Sun, 22 Nov 2020 22:42:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64FA6435 for ; Sun, 22 Nov 2020 22:42:20 +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: <1606084927.782f2fad3e4d17b00e76a6412a73f304b709c227.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.4.7.2.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 782f2fad3e4d17b00e76a6412a73f304b709c227 X-VCS-Branch: master Date: Sun, 22 Nov 2020 22:42:20 +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: 6aee7c75-152d-407e-9903-b6d7c86c4b50 X-Archives-Hash: 550a7fbf9ab4720ebb07080686faf751 commit: 782f2fad3e4d17b00e76a6412a73f304b709c227 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 22 22:20:29 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 22 22:42:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782f2fad app-office/libreoffice: 6.4.7.2: Fix Qt5 moc path detect, drop QT_SELECT Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild index e632c848c58..15b973e2b41 100644 --- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild @@ -267,6 +267,7 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" + "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" # 6.4 branch (fixed in 6.4.8) "${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch" @@ -377,11 +378,7 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use kde; then - export QT_SELECT=5 # bug 639620 needs proper fix though - export QT5DIR="$(qt5_get_bindir)/../" - export MOC5="$(qt5_get_bindir)/moc" - fi + use kde && export QT5DIR="$(qt5_get_bindir)/.." local gentoo_buildid="Gentoo official package" if [[ -n ${LOCOREGIT_VERSION} ]]; then