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

[Stephan Bergmann]

 distro-configs/LibreOfficeMacOSX.conf |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 23b4c7f045ec572c9f885a6c111300ed6efc335a
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.
    
    (cherry picked from commit 1e54386411055b0049760faff2e1374a83191913)
    Conflicts:
    	distro-configs/LibreOfficeMacOSX.conf
    	distro-configs/LibreOfficeMacOSX64.conf
    
    Change-Id: Ib40588a5a6e49f7b9f58df8f1f4eb146de003444
    Reviewed-on: https://gerrit.libreoffice.org/7614
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 367d4c8..faf89d2 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -3,7 +3,6 @@
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-presenter-minimizer
---enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-extension-integration
 --enable-online-update