[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ed90a6e8daf6a9ec03b4c62e9d17ee7422a6cc0c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 21 14:19:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <gentoo <AT> mattwhitlock.name>
Closes: https://bugs.gentoo.org/780432
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 <serval2412@yahoo.fr>
+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 <heiko.tietze@documentfoundation.org>
+---
+ 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}"