[Libreoffice-commits] .: 3 commits - bin/build-ooo bin/setup.in bin/unpack distro-configs/LibreOfficeOpenBSD.conf.in

[René Engelhard]

 bin/build-ooo                             |    2 +-
 bin/setup.in                              |    2 +-
 bin/unpack                                |    2 +-
 distro-configs/LibreOfficeOpenBSD.conf.in |    5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 9e377d362195dc19a5dd00bb80c8d85b520dcbd6
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 00:43:54 2010 +0100

    make LibreOffice boostrap on OpenBSD

diff --git a/distro-configs/LibreOfficeOpenBSD.conf.in b/distro-configs/LibreOfficeOpenBSD.conf.in
index f3e62c6..cf2556c 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf.in
+++ b/distro-configs/LibreOfficeOpenBSD.conf.in
@@ -19,7 +19,6 @@
 --disable-build-mozilla
 --disable-nss-module
 --without-system-mozilla
---with-system-freetype
 --with-system-jpeg
 --with-system-libxml
 --with-system-libxslt
@@ -32,7 +31,6 @@
 --disable-xrender-link
 --disable-randr-link
 --without-openldap
---with-system-xrender-headers
 --with-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
@@ -43,14 +41,13 @@
 --enable-wiki-publisher
 --enable-report-builder
 --with-extension-integration
---with-linker-hash-style=both
 --with-ant-home=/usr/local/ant/lib
 --with-dict=ALL
 --with-lang=en_US
 --with-system-openssl
 --disable-unix-qstart
 --enable-broffice
---disable-pasf
 --with-alloc=system
 --without-junit
 --with-gnu-cp=/usr/local/bin/gcp
+--with-system-boost
commit e1d3232335714936a17ebda04c96fd787a128aa4
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 00:21:28 2010 +0100

    remove misplaced ; from test

diff --git a/bin/build-ooo b/bin/build-ooo
index 361e8f0..e4ab354 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -11,7 +11,7 @@ fi
 
 export TARFILE_LOCATION
 
-if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin"; -a "z`uname -s`" != "zOpenBSD"; then
+if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin" -a "z`uname -s`" != "zOpenBSD"; then
     if ! test -f /proc/cpuinfo; then
         echo "Looks like proc isn't mounted - this means almost certain"
         echo "Java related weird build failure: please check /proc"
commit 269a7485d5bb6ae04855922d99777b00e054c59e
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 00:19:09 2010 +0100

    gunzip will always decompress, there's no need for gunzip -d

diff --git a/bin/setup.in b/bin/setup.in
index 6133d77..a802598 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -284,7 +284,7 @@ export SUSE_ASNEEDED=0
 OOO_SCALED_ICONS_VER=ooo-scaled-icons
 OOO_SCALED_ICONS_TARBALL=$OOO_SCALED_ICONS_VER.tar.gz
 OOO_SCALED_ICONS_UNTAR_OPTIONS=xzf
-OOO_SCALED_ICONS_DECOMPRESS_CMD="gunzip -dc"
+OOO_SCALED_ICONS_DECOMPRESS_CMD="gunzip -c"
 
 #
 # up-stream changed the split and names at random
diff --git a/bin/unpack b/bin/unpack
index a576f25..e87e8f7 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -638,7 +638,7 @@ fi
 
 if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
     $echo_n "Extracting ant $echo_c"
-    (gunzip -dc $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xf - )|| exit 1;
+    (gunzip -c $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xf - )|| exit 1;
     echo "done";
 else
     echo "Don't need to unpack ant";