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 7885F1382C5 for ; Fri, 21 May 2021 14:28:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 973BDE0817; Fri, 21 May 2021 14:28:45 +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 7F5AFE0817 for ; Fri, 21 May 2021 14:28:45 +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 8AEC3340D48 for ; Fri, 21 May 2021 14:28:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAEEA737 for ; Fri, 21 May 2021 14:28:42 +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: <1621606879.ed90a6e8daf6a9ec03b4c62e9d17ee7422a6cc0c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch app-office/libreoffice/libreoffice-7.1.3.2.ebuild X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ed90a6e8daf6a9ec03b4c62e9d17ee7422a6cc0c X-VCS-Branch: master Date: Fri, 21 May 2021 14:28:42 +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: bfc16537-b04d-4fe5-be0b-84a85b1db78e X-Archives-Hash: b3af281a15d8349474d4794bee543aa2 commit: ed90a6e8daf6a9ec03b4c62e9d17ee7422a6cc0c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 21 14:19:47 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 21 14:21:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed90a6e8 app-office/libreoffice: Fix configure.ac bashism Upstream commit 2c4dd73c4c9f471fa2083f9f99dd27a7148f3175 Thanks-to: Matt Whitlock mattwhitlock.name> Closes: https://bugs.gentoo.org/780432 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libreoffice-7.1.3.2-bashism.patch | 33 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 3 ++ 2 files changed, 36 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch b/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch new file mode 100644 index 00000000000..36d43f29d39 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch @@ -0,0 +1,33 @@ +From 2c4dd73c4c9f471fa2083f9f99dd27a7148f3175 Mon Sep 17 00:00:00 2001 +From: Julien Nabet +Date: Mon, 17 May 2021 18:43:48 +0200 +Subject: tdf#142335: fix bashism in configure.ac + +Thanks to Matt Whitlock! + +(also reported in https://bugs.gentoo.org/show_bug.cgi?id=780432) + +Change-Id: I38fec6faf9a929adf1f300b8c369ec6c16a91ed8 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115716 +Tested-by: Jenkins +Reviewed-by: Heiko Tietze +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d7b831435713..3d14c5e4258c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2682,7 +2682,7 @@ AC_SUBST(ENABLE_RELEASE_BUILD) + AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT) + + AC_MSG_CHECKING([whether to build a Community flavor]) +-if test -z "$enable_community_flavor" -o "$enable_community_flavor" == "yes"; then ++if test -z "$enable_community_flavor" -o "$enable_community_flavor" = "yes"; then + AC_DEFINE(HAVE_FEATURE_COMMUNITY_FLAVOR) + AC_MSG_RESULT([yes]) + else +-- +cgit v1.2.1 + diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild index 43efb5a6625..57948352e89 100644 --- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild @@ -292,6 +292,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" + + # master branch + "${FILESDIR}/${P}-bashism.patch" # bug 780432 ) S="${WORKDIR}/${PN}-${MY_PV}"