[ooo-build-commit] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/ooo83878.unopkg.enablelinking.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d52de88fad1fdfe0c93d9f10d8ff3f716d883789
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 28 17:23:04 2010 +0300

    Avoid unopkg.bin crash on non-Unix
    
    * patches/dev300/ooo83878.unopkg.enablelinking.diff: Accept the --link
      switch on all platforms. (But it will not do anything except on
      Unix.)

diff --git a/patches/dev300/ooo83878.unopkg.enablelinking.diff b/patches/dev300/ooo83878.unopkg.enablelinking.diff
index f9c054c..cce3d20 100644
--- a/patches/dev300/ooo83878.unopkg.enablelinking.diff
+++ b/patches/dev300/ooo83878.unopkg.enablelinking.diff
@@ -197,23 +197,23 @@ retrieving revision 1.6.84.1
 diff -u -r1.6.84.1 unopkg_app.cxx
 --- desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
 +++ openoffice.org:desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
-@@ -82,6 +82,9 @@
+@@ -82,6 +82,11 @@
  " -V, --version           version information\n"
  " -v, --verbose           verbose output to stdout\n"
  " -f, --force             force overwriting existing extensions\n"
 +#ifdef UNX
 +" -l, --link              attempt to link to instead of copying extensions\n"
++#else
++" -l, --link              ineffective except on Unix platforms\n"
 +#endif
  " -s, --suppress-license  prevents showing the license provided that\n"
  "                         the extension allows it\n"
  " --log-file <file>       custom log file; default: <cache-dir>/log.txt\n"
-@@ -101,6 +104,9 @@
+@@ -101,6 +104,7 @@
      { RTL_CONSTASCII_STRINGPARAM("version"), 'V', false },
      { RTL_CONSTASCII_STRINGPARAM("verbose"), 'v', false },
      { RTL_CONSTASCII_STRINGPARAM("force"), 'f', false },
-+#ifdef UNX
 +    { RTL_CONSTASCII_STRINGPARAM("link"), 'l', false },
-+#endif
      { RTL_CONSTASCII_STRINGPARAM("log-file"), '\0', true },
      { RTL_CONSTASCII_STRINGPARAM("shared"), '\0', false },
      { RTL_CONSTASCII_STRINGPARAM("deployment-context"), '\0', true },