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 C2CD11581D3 for ; Tue, 21 May 2024 15:14:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF871E2A1C; Tue, 21 May 2024 15:14:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB6E1E2A1C for ; Tue, 21 May 2024 15:14:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B9C08335DC0 for ; Tue, 21 May 2024 15:14:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50FB6AAF for ; Tue, 21 May 2024 15:14:16 +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: <1716304437.05375d418d2b826c23438985d3f75e6c85d8f86a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-24.2.3.2-fix-bashism.patch app-office/libreoffice/libreoffice-24.2.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: 05375d418d2b826c23438985d3f75e6c85d8f86a X-VCS-Branch: master Date: Tue, 21 May 2024 15:14:16 +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: a5705141-1d11-4255-9e29-fe74760c98dc X-Archives-Hash: 3e5451acdf3057c94e807613a0a70923 commit: 05375d418d2b826c23438985d3f75e6c85d8f86a Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 21 15:08:42 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 21 15:13:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05375d41 app-office/libreoffice: Fix bashism Closes: https://bugs.gentoo.org/928733 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libreoffice-24.2.3.2-fix-bashism.patch | 55 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-24.2.3.2.ebuild | 3 ++ 2 files changed, 58 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-24.2.3.2-fix-bashism.patch b/app-office/libreoffice/files/libreoffice-24.2.3.2-fix-bashism.patch new file mode 100644 index 000000000000..e46339492110 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-24.2.3.2-fix-bashism.patch @@ -0,0 +1,55 @@ +From 4dd9e8fd585210a31bd8a99630a4d958d794ab28 Mon Sep 17 00:00:00 2001 +From: Chris Mayo +Date: Sat, 18 May 2024 17:13:31 +0100 +Subject: Fix bashism in configure tests for curl and libcmis + +When /bin/sh is dash: + +./configure: 35165: test: yes: unexpected operator +checking whether to enable breakpad... no +./configure: 35218: test: yes: unexpected operator + +Causing HAVE_FEATURE_CURL not to be set to 1 and build to fail: + +sw/source/ui/misc/translatelangselect.cxx:160:24: error: no member named 'TranslateDocumentCancellable' in namespace 'SwTranslateHelper' + 160 | SwTranslateHelper::TranslateDocumentCancellable(m_rWrtSh, aConfig, m_bCancelTranslation); + | ~~~~~~~~~~~~~~~~~~~^ + +Introduced in: + +5bf7c2fa5794 ("Fix --disable-curl build", 2023-09-14) + +Change-Id: Ifbc4bc1a7cde86101ff13b05ec7cee6836798605 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167831 +Tested-by: Ilmari Lauhakangas +Reviewed-by: Ilmari Lauhakangas +Tested-by: Jenkins +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fbd6196921a5..59f1c97dbef7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11079,7 +11079,7 @@ AC_SUBST(ICU_MINOR) + dnl ================================================================== + dnl CURL + dnl ================================================================== +-if test "$enable_curl" == "yes"; then ++if test "$enable_curl" = "yes"; then + AC_DEFINE([HAVE_FEATURE_CURL]) + fi + +@@ -11125,7 +11125,7 @@ AC_SUBST(DEFAULT_CRASHDUMP_VALUE) + dnl ================================================================== + dnl libcmis + dnl ================================================================== +-if test "$enable_libcmis" == "yes"; then ++if test "$enable_libcmis" = "yes"; then + if test "$enable_curl" != "yes"; then + AC_MSG_ERROR([--disable-libcmis must be used when --disable-curl is used]) + fi +-- +cgit v1.2.3 + diff --git a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild b/app-office/libreoffice/libreoffice-24.2.3.2.ebuild index b2b4c6c66ef4..8125839e6cda 100644 --- a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.3.2.ebuild @@ -322,6 +322,9 @@ PATCHES=( # TODO: upstream "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" "${FILESDIR}/${PN}-24.2-unused-qt6network.patch" + + # git master + "${FILESDIR}/${P}-fix-bashism.patch" # bug #928733 ) S="${WORKDIR}/${PN}-${MY_PV}"