rpms/openoffice.org/devel openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.10, 1.11
Caolan McNamara
caolanm at fedoraproject.org
Fri Apr 30 08:41:00 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31460
Modified Files:
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
Log Message:
fix this thing again
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:
desktop/source/deployment/manager/dp_manager.cxx | 81 +++++++++-
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 12 +
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 13 +
desktop/source/pkgchk/unopkg/unopkg_shared.h | 1
javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java | 10 +
offapi/com/sun/star/deployment/makefile.mk | 1
openoffice.org.orig/offapi/com/sun/star/deployment/LinkException.idl | 66 ++++++++
7 files changed, 173 insertions(+), 11 deletions(-)
Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 22 Apr 2010 08:41:20 -0000 1.10
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 30 Apr 2010 08:40:59 -0000 1.11
@@ -82,13 +82,35 @@ diff -u -r1.15 makefile.mk
+}; }; }; };
+
+#endif
-Index: source/deployment/manager/dp_manager.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/deployment/manager/dp_manager.cxx,v
-retrieving revision 1.26
-diff -u -r1.26 dp_manager.cxx
---- openoffice.org.orig/desktop/source/deployment/manager/dp_manager.cxx 26 Jul 2007 08:54:34 -0000 1.26
-+++ openoffice.org/desktop/source/deployment/manager/dp_manager.cxx 22 Nov 2007 14:45:05 -0000
+--- openoffice.org.orig/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java 2010-02-11 13:42:37.000000000 +0000
++++ openoffice.org/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java 2010-02-22 15:43:34.000000000 +0000
+@@ -35,6 +35,7 @@
+ import com.sun.star.uno.XComponentContext;
+ import com.sun.star.lang.XServiceInfo;
+ import com.sun.star.ucb.XCommandEnvironment;
++import com.sun.star.uno.AnyConverter;
+
+ /** This service is for use by the smoketest which checks the installation of
+ * extensions. The service provides the XCommandEnvironment interface, which
+@@ -113,6 +114,15 @@
+ // approve = true;
+ // }
+
++ try {
++ Object link_Exception =
++ AnyConverter.toObject(
++ com.sun.star.deployment.LinkException.class, request);
++ if (link_Exception != null)
++ approve = false;
++ } catch( Exception e ) {
++ }
++
+ com.sun.star.task.XInteractionContinuation[] conts = xRequest.getContinuations();
+ for (int i = 0; i < conts.length; i++)
+ {
+diff -r 03068afc23c6 desktop/source/deployment/manager/dp_manager.cxx
+--- openoffice.org.orig/desktop/source/deployment/manager/dp_manager.cxx Sun Apr 25 15:43:24 2010 +0100
++++ openoffice.org/desktop/source/deployment/manager/dp_manager.cxx Fri Apr 30 09:36:02 2010 +0100
@@ -57,6 +57,7 @@
#include "com/sun/star/ucb/NameClash.hpp"
#include "com/sun/star/deployment/VersionException.hpp"
@@ -97,7 +119,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"
-@@ -514,6 +515,40 @@
+@@ -502,6 +503,40 @@
return mediaType;
}
@@ -138,23 +160,27 @@ diff -u -r1.26 dp_manager.cxx
//______________________________________________________________________________
OUString PackageManagerImpl::insertToActivationLayer(
OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
-@@ -538,11 +573,11 @@
- destFolder = makeURL( m_activePackages, tempEntry );
- }
- destFolder += OUSTR("_");
--
+@@ -542,19 +577,49 @@
+ {
+ // inflate content:
+ ::rtl::OUStringBuffer buf;
+- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
+- buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
++ if (!sourceContent.isFolder())
++ {
++ buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
++ buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
+ rtl_UriCharClassRegName,
+ rtl_UriEncodeIgnoreEscapes,
+ RTL_TEXTENCODING_UTF8 ) );
++ }
++ else
++ buf.append( sourceContent.getURL() );
+
- // prepare activation folder:
- ::ucbhelper::Content destFolderContent;
- create_folder( &destFolderContent, destFolder, xCmdEnv );
--
-+
- // copy content into activation temp dir:
- if (mediaType.matchIgnoreAsciiCaseAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
-@@ -571,10 +606,33 @@
- sourceContent = ::ucbhelper::Content(
- buf.makeStringAndClear(), xCmdEnv );
+ buf.append( static_cast<sal_Unicode>('/') );
+- sourceContent = ::ucbhelper::Content(
+- buf.makeStringAndClear(), xCmdEnv );
++ sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
}
- if (! destFolderContent.transferContent(
- sourceContent, ::ucbhelper::InsertOperation_COPY,
@@ -185,39 +211,35 @@ diff -u -r1.26 dp_manager.cxx
+ if (! destFolderContent.transferContent(
+ sourceContent, ::ucbhelper::InsertOperation_COPY,
+ title, NameClash::OVERWRITE ))
++ {
+ throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
++ }
+ }
// write to DB:
dbData->temporaryName = tempEntry;
-Index: source/pkgchk/unopkg/unopkg_app.cxx
-===================================================================
-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
---- openoffice.org.orig/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
+diff -r 03068afc23c6 desktop/source/pkgchk/unopkg/unopkg_app.cxx
+--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_app.cxx Sun Apr 25 15:43:24 2010 +0100
++++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx Fri Apr 30 09:36:02 2010 +0100
@@ -82,6 +82,9 @@
" -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"
++" -l, --link attempt to link to an unpacked extension instead of copying it\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 },
-@@ -208,6 +214,7 @@
+@@ -208,6 +212,7 @@
OUString subCommand;
bool option_shared = false;
bool option_force = false;
@@ -225,7 +247,7 @@ diff -u -r1.6.84.1 unopkg_app.cxx
bool option_verbose = false;
bool option_bundled = false;
bool option_suppressLicense = false;
-@@ -217,11 +224,13 @@
+@@ -217,11 +222,13 @@
OUString deploymentContext;
OUString cmdArg;
::std::vector<OUString> cmdPackages;
@@ -240,15 +262,15 @@ diff -u -r1.6.84.1 unopkg_app.cxx
OptionInfo const * info_verbose = getOptionInfo(
s_option_infos, OUSTR("verbose") );
OptionInfo const * info_log = getOptionInfo(
-@@ -278,6 +287,7 @@
- !readOption( &option_shared, info_shared, &nPos ) &&
+@@ -279,6 +286,7 @@
!readOption( &option_force, info_force, &nPos ) &&
!readOption( &option_bundled, info_bundled, &nPos ) &&
-+ !readOption( &option_link, info_link, &nPos ) &&
!readOption( &option_suppressLicense, info_suppressLicense, &nPos ) &&
++ !readOption( &option_link, info_link, &nPos ) &&
!readArgument( &deploymentContext, info_context, &nPos ) &&
!isBootstrapVariable(&nPos))
-@@ -350,7 +360,7 @@
+ {
+@@ -350,7 +358,7 @@
Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
createCmdEnv( xComponentContext, logFile,
@@ -257,14 +279,9 @@ diff -u -r1.6.84.1 unopkg_app.cxx
option_suppressLicense) );
if (subcmd_add ||
-+++ openoffice.org/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
-retrieving revision 1.8
-diff -u -r1.8 unopkg_cmdenv.cxx
---- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 26 Jun 2007 11:13:26 -0000 1.8
-+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 22 Nov 2007 14:46:24 -0000
+diff -r 03068afc23c6 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx Sun Apr 25 15:43:24 2010 +0100
++++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx Fri Apr 30 09:36:02 2010 +0100
@@ -43,6 +43,7 @@
#include "com/sun/star/task/XInteractionAbort.hpp"
#include "com/sun/star/task/XInteractionApprove.hpp"
@@ -315,10 +332,10 @@ diff -u -r1.8 unopkg_cmdenv.cxx
else
printLicense(licExc.Text, approve, abort);
}
-+ else if (request >>= linkExc)
-+ {
-+ approve = m_option_link;
-+ }
++ 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.
@@ -337,13 +354,9 @@ diff -u -r1.8 unopkg_cmdenv.cxx
option_suppressLicense);
}
-Index: source/pkgchk/unopkg/unopkg_shared.h
-===================================================================
-RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_shared.h,v
-retrieving revision 1.2.130.1
-diff -u -r1.2.130.1 unopkg_shared.h
---- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_shared.h 10 Aug 2007 15:04:16 -0000 1.2.130.1
-+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_shared.h 22 Nov 2007 14:46:24 -0000
+diff -r 03068afc23c6 desktop/source/pkgchk/unopkg/unopkg_shared.h
+--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_shared.h Sun Apr 25 15:43:24 2010 +0100
++++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_shared.h Fri Apr 30 09:36:02 2010 +0100
@@ -162,6 +162,7 @@
css::uno::Reference<css::uno::XComponentContext> const & xContext,
::rtl::OUString const & logFile,
@@ -352,29 +365,3 @@ diff -u -r1.2.130.1 unopkg_shared.h
bool option_verbose,
bool option_bundled,
bool option_suppressLicense);
---- openoffice.org.orig/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java 2010-02-11 13:42:37.000000000 +0000
-+++ openoffice.org/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java 2010-02-22 15:43:34.000000000 +0000
-@@ -35,6 +35,7 @@
- import com.sun.star.uno.XComponentContext;
- import com.sun.star.lang.XServiceInfo;
- import com.sun.star.ucb.XCommandEnvironment;
-+import com.sun.star.uno.AnyConverter;
-
- /** This service is for use by the smoketest which checks the installation of
- * extensions. The service provides the XCommandEnvironment interface, which
-@@ -113,6 +114,15 @@
- // approve = true;
- // }
-
-+ try {
-+ Object link_Exception =
-+ AnyConverter.toObject(
-+ com.sun.star.deployment.LinkException.class, request);
-+ if (link_Exception != null)
-+ approve = false;
-+ } catch( Exception e ) {
-+ }
-+
- com.sun.star.task.XInteractionContinuation[] conts = xRequest.getContinuations();
- for (int i = 0; i < conts.length; i++)
- {
More information about the scm-commits
mailing list