[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-4.3.5.2-remove-bashisms.patch

[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-4.3.5.2-remove-bashisms.patch

[Andreas HAttel (dilfridge)]

dilfridge    15/01/04 14:41:22

  Added:                libreoffice-4.3.5.2-remove-bashisms.patch
  Log:
  Fix build with sh=dash, bug 525454
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

Revision  Changes    Path
1.1                  app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch?rev=1.1&content-type=text/plain

Index: libreoffice-4.3.5.2-remove-bashisms.patch
===================================================================
From d93be02c09575926bc3c4d64a122b81df80c243d Mon Sep 17 00:00:00 2001
From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
Date: Sun, 4 Jan 2015 15:33:35 +0100
Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
 sh=dash users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Original patch by Rémi Cardona <remi@gentoo.org>

Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8aa33d0..5dbe640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11483,9 +11483,8 @@ test_font_map()
     FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
 
     TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
-    while true ; do
+    while test "$#" -ge 1 ; do
         MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
-        test -n "$MAPPING" || break
         TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
     done
     if test $TESTEXPR
-- 
2.2.1

[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-4.3.5.2-remove-bashisms.patch

[Andreas HAttel (dilfridge)]

dilfridge    15/02/28 12:15:26

  Modified:             libreoffice-4.3.5.2-remove-bashisms.patch
  Log:
  Use upstream diff, add patch also to live ebuilds
  
  (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

Revision  Changes    Path
1.2                  app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch?r1=1.1&r2=1.2

Index: libreoffice-4.3.5.2-remove-bashisms.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-4.3.5.2-remove-bashisms.patch	4 Jan 2015 14:41:22 -0000	1.1
+++ libreoffice-4.3.5.2-remove-bashisms.patch	28 Feb 2015 12:15:26 -0000	1.2
@@ -1,4 +1,4 @@
-From d93be02c09575926bc3c4d64a122b81df80c243d Mon Sep 17 00:00:00 2001
+From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001
 From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
 Date: Sun, 4 Jan 2015 15:33:35 +0100
 Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
@@ -11,6 +11,9 @@
 
 Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
+Reviewed-on: https://gerrit.libreoffice.org/13731
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
 ---
  configure.ac | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
@@ -31,5 +34,5 @@
      done
      if test $TESTEXPR
 -- 
-2.2.1
+2.3.0