summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-23 16:26:56 +0100
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-01-23 16:13:45 +0000
commit23b4c7f045ec572c9f885a6c111300ed6efc335a (patch)
tree722f0a90aca3bc26e045ff1f6614d679238ce6b1
parent7a0eec199901962b03f04371e9474caf8c408c01 (diff)
"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@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
-rw-r--r--distro-configs/LibreOfficeMacOSX.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 367d4c80fe95..faf89d2eb078 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