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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E8DF158089 for ; Wed, 8 Dec 2021 15:08:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD62E2BC059; Wed, 8 Dec 2021 15:08:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BB682BC059 for ; Wed, 8 Dec 2021 15:08:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A05D343418 for ; Wed, 8 Dec 2021 15:08:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E87D724E for ; Wed, 8 Dec 2021 15:08:24 +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: <1638976067.cc416d838a3deed2cebc6a0bc646d37150cdc1f3.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-7.2.3.2.ebuild app-office/libreoffice/libreoffice-7.2.9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cc416d838a3deed2cebc6a0bc646d37150cdc1f3 X-VCS-Branch: master Date: Wed, 8 Dec 2021 15:08:24 +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: 291c115f-6d60-434c-8ae1-16facad97812 X-Archives-Hash: 6ac69f058230e36003f72abe9d097794 commit: cc416d838a3deed2cebc6a0bc646d37150cdc1f3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 8 13:55:50 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 8 15:07:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc416d83 app-office/libreoffice: Forward patch to 7.2 stable branch Fix comment of origin. Bug: https://bugs.gentoo.org/821265 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-7.2.3.2.ebuild | 2 +- app-office/libreoffice/libreoffice-7.2.9999.ebuild | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild b/app-office/libreoffice/libreoffice-7.2.3.2.ebuild index 3b60b78183c0..4a18f0401b53 100644 --- a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.2.3.2.ebuild @@ -293,7 +293,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" - # Upstream + # 7.3 branch "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch" ) diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild index 42698197f1cd..b819e767c27d 100644 --- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild @@ -293,6 +293,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" + + # 7.3 branch + "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch" ) S="${WORKDIR}/${PN}-${MY_PV}"