Updated ooo83878.unopkg.enablelinking.diff to the last version from Caolan

* patches/dev300/ooo83878.unopkg.enablelinking.diff: update from
  http://www.openoffice.org/issues/show_bug.cgi?id=83878

1 files changed, 46 insertions, 56 deletions

diff --git a/patches/dev300/ooo83878.unopkg.enablelinking.diff b/patches/dev300/ooo83878.unopkg.enablelinking.diff
index d618e8cde..f9c054c17 100644
--- a/patches/dev300/ooo83878.unopkg.enablelinking.diff
+++ b/patches/dev300/ooo83878.unopkg.enablelinking.diff
@@ -89,7 +89,7 @@ retrieving revision 1.26
 diff -u -r1.26 dp_manager.cxx
 --- desktop/source/deployment/manager/dp_manager.cxx	26 Jul 2007 08:54:34 -0000	1.26
 +++ desktop/source/deployment/manager/dp_manager.cxx	22 Nov 2007 14:45:05 -0000
-@@ -64,6 +64,7 @@
+@@ -57,6 +57,7 @@
  #include "com/sun/star/ucb/NameClash.hpp"
  #include "com/sun/star/deployment/VersionException.hpp"
  #include "com/sun/star/deployment/InstallException.hpp"
@@ -97,7 +97,7 @@ diff -u -r1.26 dp_manager.cxx
  #include "com/sun/star/task/XInteractionApprove.hpp"
  #include "com/sun/star/ucb/UnsupportedCommandException.hpp"
  #include "boost/bind.hpp"
-@@ -512,6 +513,40 @@
+@@ -514,6 +515,40 @@
      return mediaType;
  }
  
@@ -138,7 +138,7 @@ diff -u -r1.26 dp_manager.cxx
  //______________________________________________________________________________
  OUString PackageManagerImpl::insertToActivationLayer(
      OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
-@@ -536,11 +571,11 @@
+@@ -538,11 +573,11 @@
          destFolder = makeURL( m_activePackages, tempEntry );
      }
      destFolder += OUSTR("_");
@@ -152,14 +152,14 @@ diff -u -r1.26 dp_manager.cxx
      // copy content into activation temp dir:
      if (mediaType.matchIgnoreAsciiCaseAsciiL(
              RTL_CONSTASCII_STRINGPARAM(
-@@ -552,13 +587,37 @@
-             buf.append(sourceContent.getURL());
-         }
-         buf.append( static_cast<sal_Unicode>('/') );
--        sourceContent = ::ucbhelper::Content( 
--            buf.makeStringAndClear(), xCmdEnv );
-+         sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
-+    }
+@@ -571,10 +606,33 @@
+         sourceContent = ::ucbhelper::Content( 
+             buf.makeStringAndClear(), xCmdEnv );
+     }
+-    if (! destFolderContent.transferContent(
+-            sourceContent, ::ucbhelper::InsertOperation_COPY,
+-            title, NameClash::OVERWRITE ))
+-        throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
 +
 +    bool bLink = false;
 +    Any request( (deployment::LinkException()) );
@@ -185,14 +185,8 @@ diff -u -r1.26 dp_manager.cxx
 +        if (! destFolderContent.transferContent(
 +                sourceContent, ::ucbhelper::InsertOperation_COPY,
 +                title, NameClash::OVERWRITE ))
-+        {
 +            throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
-+        }
-     }
--    if (! destFolderContent.transferContent(
--            sourceContent, ::ucbhelper::InsertOperation_COPY,
--            title, NameClash::OVERWRITE ))
--        throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
++    }
      
      // write to DB:
      dbData->temporaryName = tempEntry;
@@ -202,18 +196,18 @@ RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_app.cxx,v
 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
-+++ desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
-@@ -86,6 +86,9 @@
++++ openoffice.org:desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
+@@ -82,6 +82,9 @@
+ " -V, --version           version information\n"
+ " -v, --verbose           verbose output to stdout\n"
  " -f, --force             force overwriting existing extensions\n"
- " -s, --suppress-license  prevents showing the license provided that\n"
- "                         the extension allows it\n"
 +#ifdef UNX
 +" -l, --link              attempt to link to instead of copying extensions\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"
- " --shared                expert feature: operate on shared installation\n"
- "                                         deployment context;\n"
-@@ -103,6 +106,9 @@
+@@ -101,6 +104,9 @@
      { RTL_CONSTASCII_STRINGPARAM("version"), 'V', false },
      { RTL_CONSTASCII_STRINGPARAM("verbose"), 'v', false },
      { RTL_CONSTASCII_STRINGPARAM("force"), 'f', false },
@@ -223,7 +217,7 @@ diff -u -r1.6.84.1 unopkg_app.cxx
      { RTL_CONSTASCII_STRINGPARAM("log-file"), '\0', true },
      { RTL_CONSTASCII_STRINGPARAM("shared"), '\0', false },
      { RTL_CONSTASCII_STRINGPARAM("deployment-context"), '\0', true },
-@@ -210,6 +216,7 @@
+@@ -208,6 +214,7 @@
      OUString subCommand;
      bool option_shared = false;
      bool option_force = false;
@@ -231,7 +225,7 @@ diff -u -r1.6.84.1 unopkg_app.cxx
      bool option_verbose = false;
      bool option_bundled = false;
      bool option_suppressLicense = false;
-@@ -218,11 +225,13 @@
+@@ -217,11 +224,13 @@
      OUString deploymentContext;
      OUString cmdArg;
      ::std::vector<OUString> cmdPackages;
@@ -246,26 +240,24 @@ diff -u -r1.6.84.1 unopkg_app.cxx
      OptionInfo const * info_verbose = getOptionInfo(
          s_option_infos, OUSTR("verbose") );
      OptionInfo const * info_log = getOptionInfo(
-@@ -276,6 +285,7 @@
+@@ -278,6 +287,7 @@
+                      !readOption( &option_shared, info_shared, &nPos ) &&
                       !readOption( &option_force, info_force, &nPos ) &&
                       !readOption( &option_bundled, info_bundled, &nPos ) &&
-                      !readOption( &option_suppressLicense, info_suppressLicense, &nPos ) &&
 +                     !readOption( &option_link, info_link, &nPos ) &&
+                      !readOption( &option_suppressLicense, info_suppressLicense, &nPos ) &&
                       !readArgument( &deploymentContext, info_context, &nPos ) &&
                       !isBootstrapVariable(&nPos))
-             {
-@@ -350,8 +360,8 @@ extern "C" int unopkg_main()
+@@ -350,7 +360,7 @@
          
          Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
              createCmdEnv( xComponentContext, logFile,
 -                          option_force, option_verbose, option_bundled, 
--                          option_suppressLicense) );
-+                          option_force, option_link, option_verbose,
-+                          option_bundled, option_suppressLicense) );
++                          option_force, option_link, option_verbose, option_bundled, 
+                           option_suppressLicense) );
          
          if (subcmd_add ||
-             subCommand.equalsAsciiL(
-+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx	22 Nov 2007 14:46:24 -0000
++++ desktop/source/pkgchk/unopkg/unopkg_app.cxx	22 Nov 2007 14:46:24 -0000
 Index: source/pkgchk/unopkg/unopkg_cmdenv.cxx
 ===================================================================
 RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx,v
@@ -273,7 +265,7 @@ retrieving revision 1.8
 diff -u -r1.8 unopkg_cmdenv.cxx
 --- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx	26 Jun 2007 11:13:26 -0000	1.8
 +++ desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx	22 Nov 2007 14:46:24 -0000
-@@ -46,6 +46,7 @@
+@@ -43,6 +43,7 @@
  #include "com/sun/star/task/XInteractionAbort.hpp"
  #include "com/sun/star/task/XInteractionApprove.hpp"
  #include "com/sun/star/deployment/InstallException.hpp"
@@ -281,7 +273,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
  #include "com/sun/star/container/ElementExistException.hpp"
  #include "com/sun/star/deployment/LicenseException.hpp"
  #include "com/sun/star/deployment/VersionException.hpp"
-@@ -98,6 +99,7 @@
+@@ -84,6 +85,7 @@
  {
      sal_Int32 m_logLevel;
      bool m_option_force_overwrite;
@@ -289,7 +281,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
      bool m_option_verbose;
      bool m_option_bundled;
      bool m_option_suppressLicense;
-@@ -112,6 +114,7 @@
+@@ -99,6 +101,7 @@
          Reference<XComponentContext> const & xComponentContext,
          OUString const & log_file,
          bool option_force_overwrite,
@@ -297,7 +289,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
          bool option_verbose,
          bool option_bundled,
          bool option_suppressLicense);
-@@ -137,11 +140,13 @@
+@@ -125,11 +128,13 @@
      Reference<XComponentContext> const & xComponentContext,
      OUString const & log_file,
      bool option_force_overwrite,
@@ -311,7 +303,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
        m_option_verbose( option_verbose ),
        m_option_bundled( option_bundled),
        m_option_suppressLicense( option_suppressLicense),
-@@ -270,6 +275,7 @@
+@@ -246,6 +251,7 @@
      lang::WrappedTargetException wtExc;
  	deployment::LicenseException licExc;
      deployment::InstallException instExc;
@@ -319,18 +311,18 @@ diff -u -r1.8 unopkg_cmdenv.cxx
      deployment::LicenseIndividualAgreementException licAgreementExc;
      deployment::PlatformException platExc;
      deployment::VersionException verExc;
-@@ -303,6 +309,10 @@ void CommandEnvironmentImpl::handle(
+@@ -303,6 +309,10 @@
          else
              printLicense(licExc.Text, approve, abort);
-     }
-+        else if (request >>= linkExc)
-+	{
-+            approve = m_option_link;
-+	}
-        else if (request >>= instExc)
-     {
-         //Only if the unopgk was started with gui + extension then we user is asked.
-@@ -445,13 +455,14 @@ Reference< XCommandEnvironment > createC
+ 	}
++    else if (request >>= linkExc)
++    {
++        approve = m_option_link;
++    }
+    	else if (request >>= instExc)
+ 	{
+ 		//Only if the unopgk was started with gui + extension then we user is asked.
+@@ -445,12 +455,13 @@
      Reference< XComponentContext > const & xContext,
      OUString const & logFile,
      bool option_force_overwrite,
@@ -341,12 +333,10 @@ diff -u -r1.8 unopkg_cmdenv.cxx
  {
      return new CommandEnvironmentImpl(
 -        xContext, logFile, option_force_overwrite, option_verbose, option_bundled,
--        option_suppressLicense);
-+        xContext, logFile, option_force_overwrite, option_link, option_verbose,
-+        option_bundled, option_suppressLicense);
++        xContext, logFile, option_force_overwrite, option_link, option_verbose, option_bundled,
+         option_suppressLicense);
  }
  
- } // unopkg
 Index: source/pkgchk/unopkg/unopkg_shared.h
 ===================================================================
 RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_shared.h,v
@@ -354,7 +344,7 @@ retrieving revision 1.2.130.1
 diff -u -r1.2.130.1 unopkg_shared.h
 --- desktop/source/pkgchk/unopkg/unopkg_shared.h	10 Aug 2007 15:04:16 -0000	1.2.130.1
 +++ desktop/source/pkgchk/unopkg/unopkg_shared.h	22 Nov 2007 14:46:24 -0000
-@@ -131,6 +131,7 @@
+@@ -162,6 +162,7 @@
      css::uno::Reference<css::uno::XComponentContext> const & xContext,
      ::rtl::OUString const & logFile,
      bool option_force_overwrite,