[ooo-build-commit] 2 commits - configure.in NEWS patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Jul 24 02:13:51 PDT 2009
NEWS | 52 +++
configure.in | 2
patches/dev300/apply | 4
patches/dev300/ooo83878.unopkg.enablelinking.diff | 372 ++++++++++++++++++++++
4 files changed, 429 insertions(+), 1 deletion(-)
New commits:
commit 7d8cbb6f5c00caaedfc5a641e1f3a0148529407e
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jul 23 21:21:18 2009 +0200
Release ooo-build-3.1.0.99.1 (3.1.1-beta1)
* version 3.1.0.99.1 (3.1.1-beta1)
* tag OOO_BUILD_3_1_0_99_1
diff --git a/NEWS b/NEWS
index 20d8004..73b8522 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,55 @@
+ooo-build-3.1.0.99.1 (3.1.1-beta1)
+
+ + features:
+ + target ooo310-m16 [Rene]
+ + new unopkg add --link option [Caolan]
+ + new -bulk option to convert documents on the command line [Florian]
+ + common bug fixes:
+ + updated Graphite font technology stuff [Herbert, Rene]
+ + avoid sticky state of fullscreen window (i#103145) [Thorsten]
+ + Calc fixes:
+ + XLS import crasher (bnc#520556) [Kohei]
+ + scrolling with large selection (n#518426) [Kohei]
+ + determine in-line array size more reliably [Kohei]
+ + more on row and flags manipulations (n#516406) [Kohei]
+ + hyperlink strings XLS import (bnc#521447, i#103520) [Kohei]
+ + COUNTIF with external references (bnc#521624, i#102750) [Kohei]
+ + absolute path generation for external doc URI (i#103317) [Kohei]
+ + clink on hyperlinks behavior in Calc (i#103587, n#523005) [Kohei]
+ + document is modified when switching external link (i#103598) [Kohei]
+ + Impress fixes:
+ + no impress layout pane in master page mode (i#73289) [Liang, Thorsten]
+ + Writer fixes:
+ + RTF export crash (bnc#462657) [Kendy]
+ + lost indentation during DOC import (bnc#518731) [Florian]
+ + VBA bits:
+ + ComboBox binding data import in userform [Fong]
+ + create toolbar/menubar in document scope [Fong]
+ + variable as VBA constant (bnc#521820) [Fong, Noel]
+ + set Enabled/Disabled to menu item (i#103486) [Fong]
+ + automation objects, automation bridge wrapper (bnc#507501) [Noel]
+ + WorkBook.PrecisionAsDisplayed, and CommandbarControl.Enabled, support
+ workbook auto_open event, builtin toolbar (bnc#520228) [Fong]
+ + OOXML bits:
+ + shape map crash [Radek]
+ + action buttons PPTX export (bnc#497570) [Radek]
+ + footnote in a table DOCX import crasher (bnc#518741) [Cédric]
+ + l10n bits:
+ + ooo-build.pot update [Petr]
+ + Serbian translation update [Nix, KAMI]
+ + build bits:
+ + dmake and environment variables with space (i#101786) [Kendy]
+ + make target to create ctags file [Cédric]
+ + Go-oo bits:
+ + enable system dictionaries [Petr]
+ + new branding (bnc#493593) [Jakub, Petr]
+ + Experimental:
+ + autolayout code [Dona]
+ + ocrimport extension [Jonathan]
+ + Win32 crosscompilation on Linux [Jesús]
+ + animated border for copied range [Kohei]
+ + slideshow on drawinglayer plus canvas gradients brush-up [Thorsten]
+
ooo-build-3.1.0.98.2 (3.1.1-alpha2)
+ features:
diff --git a/configure.in b/configure.in
index b66fe13..4041bdb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 3.1.0.98.2)
+AC_INIT(ooo-build, 3.1.0.99.1)
AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
commit ab551ed742429d818bdf3d8c3c7741550c338a5a
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jul 23 15:05:49 2009 +0200
Add unopkg add --link option (i#83878, bnc#493994)
* patches/dev300/ooo83878.unopkg.enablelinking.diff:
* patches/dev300/apply: add unopkg add --link option to register uncompressed
extensions; it helps to get automatic depencies when packaging extensions
in RPMs; patch by Caolan
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 99bcc00..c2193a6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2272,6 +2272,10 @@ ooo86080.unopkg.bodge.diff
oooXXXX.partial-revert-ooo95118.diff
+# add unopkg add --link option to register uncompressed extensions
+# it helps to get automatic depencies when packaging extensions in RPMs
+ooo83878.unopkg.enablelinking.diff, i#83878, bnc#493994, caolan
+
[ CairoFonts ]
# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
ooo59127.vcl.honourcairofont.diff
diff --git a/patches/dev300/ooo83878.unopkg.enablelinking.diff b/patches/dev300/ooo83878.unopkg.enablelinking.diff
new file mode 100644
index 0000000..fcc0402
--- /dev/null
+++ b/patches/dev300/ooo83878.unopkg.enablelinking.diff
@@ -0,0 +1,372 @@
+Index: com/sun/star/deployment/makefile.mk
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/deployment/makefile.mk,v
+retrieving revision 1.15
+diff -u -r1.15 makefile.mk
+--- offapi/com/sun/star/deployment/makefile.mk 6 Jul 2007 14:32:11 -0000 1.15
++++ offapi/com/sun/star/deployment/makefile.mk 22 Nov 2007 14:43:47 -0000
+@@ -55,6 +55,7 @@
+ LicenseException.idl \
+ VersionException.idl \
+ InstallException.idl \
++ LinkException.idl \
+ UpdateInformationEntry.idl \
+ XUpdateInformationProvider.idl \
+ UpdateInformationProvider.idl \
+--- /dev/null 2007-10-09 17:51:18.611015998 +0100
++++ offapi/com/sun/star/deployment/LinkException.idl 2007-11-22 13:45:04.000000000 +0000
+@@ -0,0 +1,66 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2006 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_LINKEXCEPTION_IDL
++#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_LINKEXCEPTION_IDL
++
++#include "com/sun/star/uno/Exception.idl"
++
++module com { module sun { module star { module deployment {
++
++interface XPackage;
++
++/**
++ describes the fact that deployment unit is about to be linked.
++
++ <p>This exception is intended to be used with an
++ <type scope="com::sun::star::task">XInteractionHandler</type>.</p>
++
++ @since OOo 2.4
++*/
++exception LinkException: com::sun::star::uno::Exception {
++ /**
++ represents the new deployment unit.
++
++ <p>Must not be <NULL/>.</p>
++ */
++ XPackage New;
++
++
++};
++
++}; }; }; };
++
++#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
+--- 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 @@
+ #include "com/sun/star/ucb/NameClash.hpp"
+ #include "com/sun/star/deployment/VersionException.hpp"
+ #include "com/sun/star/deployment/InstallException.hpp"
++#include "com/sun/star/deployment/LinkException.hpp"
+ #include "com/sun/star/task/XInteractionApprove.hpp"
+ #include "com/sun/star/ucb/UnsupportedCommandException.hpp"
+ #include "boost/bind.hpp"
+@@ -512,6 +513,40 @@
+ return mediaType;
+ }
+
++oslFileError dp_linkFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
++{
++ oslFileError eRet = osl_File_E_invalidError;
++#ifdef UNX
++ OSL_ASSERT( ustrFileURL );
++ OSL_ASSERT( ustrDestURL );
++
++ /* convert source url to system path */
++ rtl::OUString aSrc;
++ eRet = osl_getSystemPathFromFileURL( ustrFileURL, &aSrc.pData );
++ if( eRet != osl_File_E_None )
++ return eRet;
++ rtl::OString aSrcPath = rtl::OUStringToOString( aSrc, osl_getThreadTextEncoding() );
++
++ /* convert destination url to system path */
++ rtl::OUString aDest;
++ osl_getSystemPathFromFileURL( ustrDestURL, &aDest.pData );
++ if( eRet != osl_File_E_None )
++ return eRet;
++ rtl::OString aDestPath = rtl::OUStringToOString( aDest, osl_getThreadTextEncoding() );
++
++ rtl::OString sName = aSrcPath;
++ sal_Int32 nEnd = sName.getLength()-1;
++ if (sName.pData->buffer[nEnd] == '/')
++ --nEnd;
++ sal_Int32 nStart = sName.lastIndexOf( '/', nEnd );
++ sName = sName.copy(nStart, nEnd - nStart + 1);
++
++ int nRet = symlink(aSrcPath.getStr(), (aDestPath + sName).getStr());
++ eRet = nRet != 0 ? osl_File_E_invalidError : osl_File_E_None;
++#endif
++ return eRet;
++}
++
+ //______________________________________________________________________________
+ OUString PackageManagerImpl::insertToActivationLayer(
+ OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
+@@ -536,11 +571,11 @@
+ destFolder = makeURL( m_activePackages, tempEntry );
+ }
+ destFolder += OUSTR("_");
+-
++
+ // prepare activation folder:
+ ::ucbhelper::Content destFolderContent;
+ create_folder( &destFolderContent, destFolder, xCmdEnv );
+-
++
+ // copy content into activation temp dir:
+ if (mediaType.matchIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM(
+@@ -552,19 +587,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() );
++
+ buf.append( static_cast<sal_Unicode>('/') );
+- sourceContent = ::ucbhelper::Content(
+- buf.makeStringAndClear(), xCmdEnv );
++ sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
++ }
++
++ bool bLink = false;
++ Any request( (deployment::LinkException()) );
++ bool approve = false, abort = false;
++ interactContinuation( request, task::XInteractionApprove::static_type(),
++ xCmdEnv, &approve, &abort );
++
++ if (!abort && approve)
++ bLink = true;
++
++ if (bLink)
++ {
++ if (
++ (!sourceContent.isFolder()) ||
++ (osl_File_E_None != dp_linkFile(sourceContent.getURL().pData, destFolderContent.getURL().pData))
++ )
++ {
++ throw RuntimeException( OUSTR("dp_linkFile() failed!"), 0 );
++ }
++ }
++ else
++ {
++ 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;
+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
+--- 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 @@
+ " -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"
++#endif
+ " --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 @@
+ { 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 },
+@@ -210,6 +216,7 @@
+ OUString subCommand;
+ bool option_shared = false;
+ bool option_force = false;
++ bool option_link = false;
+ bool option_verbose = false;
+ bool option_bundled = false;
+ bool subcmd_add = false;
+@@ -218,11 +225,13 @@
+ OUString deploymentContext;
+ OUString cmdArg;
+ ::std::vector<OUString> cmdPackages;
+-
++
+ OptionInfo const * info_shared = getOptionInfo(
+ s_option_infos, OUSTR("shared") );
+ OptionInfo const * info_force = getOptionInfo(
+ s_option_infos, OUSTR("force") );
++ OptionInfo const * info_link = getOptionInfo(
++ s_option_infos, OUSTR("link") );
+ OptionInfo const * info_verbose = getOptionInfo(
+ s_option_infos, OUSTR("verbose") );
+ OptionInfo const * info_log = getOptionInfo(
+@@ -276,6 +285,7 @@
+ !readOption( &option_shared, info_shared, &nPos ) &&
+ !readOption( &option_force, info_force, &nPos ) &&
+ !readOption( &option_bundled, info_bundled, &nPos ) &&
++ !readOption( &option_link, info_link, &nPos ) &&
+ !readArgument( &deploymentContext, info_context, &nPos ) &&
+ !isBootstrapVariable(&nPos))
+ {
+@@ -346,7 +356,7 @@
+
+ Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
+ createCmdEnv( xComponentContext, logFile,
+- option_force, option_verbose, option_bundled) );
++ option_force, option_link, option_verbose, option_bundled) );
+
+ if (subcmd_add ||
+ subCommand.equalsAsciiL(
++++ 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
+--- 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 @@
+ #include "com/sun/star/task/XInteractionAbort.hpp"
+ #include "com/sun/star/task/XInteractionApprove.hpp"
+ #include "com/sun/star/deployment/InstallException.hpp"
++#include "com/sun/star/deployment/LinkException.hpp"
+ #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 @@
+ {
+ sal_Int32 m_logLevel;
+ bool m_option_force_overwrite;
++ bool m_option_link;
+ bool m_option_verbose;
+ bool m_option_bundled;
+ Reference< XComponentContext > m_xComponentContext;
+@@ -112,6 +114,7 @@
+ Reference<XComponentContext> const & xComponentContext,
+ OUString const & log_file,
+ bool option_force_overwrite,
++ bool option_link,
+ bool option_verbose,
+ bool option_bundled);
+
+@@ -137,10 +140,12 @@
+ Reference<XComponentContext> const & xComponentContext,
+ OUString const & log_file,
+ bool option_force_overwrite,
++ bool option_link,
+ bool option_verbose,
+ bool option_bundled)
+ : m_logLevel(0),
+ m_option_force_overwrite( option_force_overwrite ),
++ m_option_link( option_link ),
+ m_option_verbose( option_verbose ),
+ m_option_bundled( option_bundled),
+ m_xComponentContext(xComponentContext)
+@@ -270,6 +275,7 @@
+ lang::WrappedTargetException wtExc;
+ deployment::LicenseException licExc;
+ deployment::InstallException instExc;
++ deployment::LinkException linkExc;
+ deployment::LicenseIndividualAgreementException licAgreementExc;
+ deployment::PlatformException platExc;
+ deployment::VersionException verExc;
+@@ -318,6 +324,10 @@
+ bLicenseException = true;
+ 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.
+@@ -457,11 +467,12 @@
+ Reference< XComponentContext > const & xContext,
+ OUString const & logFile,
+ bool option_force_overwrite,
++ bool option_link,
+ bool option_verbose,
+ bool option_bundled)
+ {
+ return new CommandEnvironmentImpl(
+- xContext, logFile, option_force_overwrite, option_verbose, option_bundled);
++ xContext, logFile, option_force_overwrite, option_link, option_verbose, option_bundled);
+ }
+
+ } // unopkg
+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
+--- 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 @@
+ css::uno::Reference<css::uno::XComponentContext> const & xContext,
+ ::rtl::OUString const & logFile,
+ bool option_force_overwrite,
++ bool option_link,
+ bool option_verbose,
+ bool option_bundled);
+
More information about the ooo-build-commit
mailing list