[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - bin/unpack distro-configs/LibreOfficeMacOSX.conf.in

[Thorsten Behrens]

 bin/unpack                               |    2 +-
 distro-configs/LibreOfficeMacOSX.conf.in |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 85e13757f6f65e33d1a121b4bc526c64439da145
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Mon Dec 13 18:42:39 2010 +0100

    Disable ogl transitions for Mac -3-3

diff --git a/distro-configs/LibreOfficeMacOSX.conf.in b/distro-configs/LibreOfficeMacOSX.conf.in
index 2eacfad..add6794 100644
--- a/distro-configs/LibreOfficeMacOSX.conf.in
+++ b/distro-configs/LibreOfficeMacOSX.conf.in
@@ -1,6 +1,5 @@
 --with-vendor=\"The Document Foundation\"
 --enable-hids
---enable-opengl
 --enable-binfilter
 --with-fonts
 --with-java-target-version=1.5
commit 4d0eaff7dde9bec78ab4f5b26a8ae13b87a2a18c
Author: Bernhard Rosenkraenzer <bero at arklinux.org>
Date:   Fri Dec 10 23:02:38 2010 +0100

    Fix unzip asking for overwrite
    
    In 3.3.0-rc1 (not available in the version list in bugzilla),
    passing --enable-extra-templates causes unzip to prompt whether
    or not it may overwrite already existing files - making life
    unnecessarily hard for packagers.
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>

diff --git a/bin/unpack b/bin/unpack
index 53e6322..722021b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -853,7 +853,7 @@ fi
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_file $SRCDIR/$pack
     echo "Unpacking $pack"
-    unzip -q $SRCDIR/$pack -d $OOBUILDDIR/extras/source
+    unzip -o -q $SRCDIR/$pack -d $OOBUILDDIR/extras/source
 done
 
 # Sun Professional Templates Pack