[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - bin/unpack download.in patches/dev300

[Petr Mladek]

 bin/unpack                                   |    2 +-
 download.in                                  |    2 +-
 patches/dev300/sfx-check-real-help-path.diff |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2efc788ae83581a106519c074269bce54d341305
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Feb 7 22:50:06 2011 +0100

    fix sfx-check-real-help-path.diff to apply again

diff --git a/patches/dev300/sfx-check-real-help-path.diff b/patches/dev300/sfx-check-real-help-path.diff
index d4fe62c..131b6d2 100644
--- a/patches/dev300/sfx-check-real-help-path.diff
+++ b/patches/dev300/sfx-check-real-help-path.diff
@@ -20,8 +20,8 @@ index d5e6f24..df94b19 100644
  #include <unotools/pathoptions.hxx>
  #include <rtl/ustring.hxx>
 @@ -126,13 +126,13 @@ rtl::OUString HelpLocaleString()
-         bool bOk = aLocaleStr.getLength() != 0;
-         if ( impl_hasHelpInstalled() && bOk )
+             aLocaleStr = aEnglish;
+         else
          {
 -            rtl::OUString aBaseInstallPath;
 -            // utl::Bootstrap::PathStatus aBaseLocateResult =
commit 436be2be2afbffcf35ca53d030ff0dd43999fc43
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Feb 7 21:39:09 2011 +0100

    update setup_native_packinfo for the split build
    
    does not affect normal build => need not be signed off

diff --git a/bin/unpack b/bin/unpack
index 91d72ec..e6d2964 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -289,7 +289,7 @@ if test "z$OOO_GIT" = "z" ; then
             fi
             # ugly hack around odd positioning of this info
             echo "Unpacking setup_native .txt pieces"
-            ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.0.2.tar.bz2 | $GNUTAR xf - ) || exit
+            ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.1.1.tar.bz2 | $GNUTAR xf - ) || exit
             # hack to patch new files in the root dir
             if test "z$PIECE" = "zbootstrap" ; then
                 touch $OOBUILDDIR/boost.m4
diff --git a/download.in b/download.in
index e6c93fb..410bdd7 100755
--- a/download.in
+++ b/download.in
@@ -538,7 +538,7 @@ if ( $download_all || ( '@OOO_LANGS@' ne '' && '@OOO_LANGS@' ne 'en-US' ) || '@B
 }
 
 if ('@PIECE@' eq 'bootstrap') {
-   source_file( 'setup_native_packinfo-3.3.0.2.tar.bz2' );
+   source_file( 'setup_native_packinfo-3.3.1.1.tar.bz2' );
 }
 
 if ('@OOOP_FONTS_PACK@' ne '') {