[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - 2 commits - distro-configs/CPOSX.conf

[Tor Lillqvist]

 distro-configs/CPOSX.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c6ffdd069cdb2102e6d8fa5b61b3f35e2df99021
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 4 11:11:55 2013 +0300

    Don't build help
    
    The construction of helppacks for OS X seems broken anyway, ERROR:
    Could not find Apple script osx_install_helppack.applescript! at
    .../solenv/bin/modules/installer/simplepackage.pm line 372.
    
    Change-Id: I8241705d7263bff9a32525916182536b71afec47

diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index 15add0e..8a152e4 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -7,7 +7,6 @@
 --with-startcenter-rtl-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_left.png
 --with-startcenter-rtl-right-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_right.png
 --with-startcenter-space-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_space.png
---with-help
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
commit 9fbc75842810a7e736400fc3c7d5b19fdba7c2de
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 4 09:38:33 2013 +0300

    Nah, was not a good idea
    
    Change-Id: Ic7f463c99c97c907b0312d51465ea0d6e8a96ef1

diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index 9d22921..15add0e 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -9,6 +9,7 @@
 --with-startcenter-space-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_space.png
 --with-help
 --without-junit
+--without-helppack-integration
 --enable-extension-integration
 --disable-online-update
 --disable-odk