[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - distro-configs/LibreOfficeMacOSX64.conf distro-configs/LibreOfficeMacOSX.conf

[Stephan Bergmann]

 distro-configs/LibreOfficeMacOSX.conf   |    1 -
 distro-configs/LibreOfficeMacOSX64.conf |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 3d5e4c71294fd520308fd0a2dd810affddf85157
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 23 16:26:56 2014 +0100

    "Official" TDF Mac builds are done w/o ext-wiki-publisher
    
    ...since LO 4.1.3, cf.
    <http://lists.freedesktop.org/archives/libreoffice/2013-October/057006.html>
    "minutes of ESC call ...," and the underlying issue (Java extension's Addons.xcu
    causing JVM instantiation upon start of Writer on Mac) has not been addressed
    since, and Norbert confirmed on IRC that he did the disabling by locally
    specifying --disable-ext-wiki-publisher on the build machines and continues to
    use that configuration for all builds since (LO 4.1.4, 4.2.0, 32- and 64-bit),
    so better reflect that directly in distro-configs.
    
    Change-Id: Ib40588a5a6e49f7b9f58df8f1f4eb146de003444
    (cherry picked from commit 1e54386411055b0049760faff2e1374a83191913)
    Reviewed-on: https://gerrit.libreoffice.org/7612
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index a10bbd9..1298b9d 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -2,7 +2,6 @@
 --enable-epm
 --enable-scripting-beanshell
 --enable-scripting-javascript
---enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-extension-integration
 --enable-online-update
diff --git a/distro-configs/LibreOfficeMacOSX64.conf b/distro-configs/LibreOfficeMacOSX64.conf
index 73a50b5..c93ed7c 100644
--- a/distro-configs/LibreOfficeMacOSX64.conf
+++ b/distro-configs/LibreOfficeMacOSX64.conf
@@ -3,7 +3,6 @@
 --enable-epm
 --enable-scripting-beanshell
 --enable-scripting-javascript
---enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-extension-integration
 --enable-online-update