[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf set_soenv.in

[Petr Mladek]

 distro-configs/LibreOfficeLinux.conf  |    1 -
 distro-configs/LibreOfficeMacOSX.conf |    1 +
 distro-configs/LibreOfficeWin32.conf  |    1 +
 set_soenv.in                          |    8 +++++---
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 27540bdcc1b5987e399cff79c5cf88df484e279b
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jun 24 11:47:06 2011 +0200

    Disable the online update for the release.
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 47fa310..2110064 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -42,7 +42,6 @@
 --enable-epm
 --enable-cairo
 --enable-binfilter
---enable-online-update
 --disable-xrender-link
 --disable-unix-qstart-libpng
 --disable-randr-link
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 1fb7e4e..67bf7c2 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -2,6 +2,7 @@
 --enable-epm
 --enable-binfilter
 --with-java-target-version=1.5
+--disable-online-update
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console
 --enable-ext-pdfimport
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index acc6320..4ce461c 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -7,6 +7,7 @@
 --with-java-target-version=1.5
 --disable-xrender-link
 --disable-activex-component
+--disable-online-update
 --enable-binfilter
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript
commit 900baff9ff400a6eba034089ed69362c2c2d61e4
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jun 22 12:05:19 2011 +0200

    fix configure without the optional translations module

diff --git a/set_soenv.in b/set_soenv.in
index f015bab..8e39314 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1068,9 +1068,11 @@ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 $L10N_MODULE = PathFormat($SRC_ROOT."/translations");
 
 # Check for poor help localizations, i.e. no help translation at all...
-opendir(DIR,$L10N_MODULE . "/source");
- at languages = readdir(DIR);
-closedir(DIR);
+ at languages=();
+if (opendir(DIR,$L10N_MODULE . "/source"))
+{  @languages = readdir(DIR);
+   closedir(DIR);
+}
 $WITH_POOR_HELP_LOCALIZATIONS = "";
 
 foreach $language (@languages)