GNOME.org
 

ooo-build r13121 - in trunk: . patches/dev300

Author: rengelhard
Date: Wed Jul  9 01:40:06 2008
New Revision: 13121
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13121&view=rev

Log:
2008-07-09  Rene Engelhard  <rene debian org>

        * patches/dev300/apply: add missing < beb300-m0's for beros updates
        * patches/dev300/svg-import-filter.diff: remove removal of svguno.cxx
          from the diff as it otherwise doesn't apply
        * patches/dev300/apply: move vcl-pluggable-mtf-renderer.diff to the
          end of EMFPlus section as the patch needs it to apply
        * configure.in: support upstream tarbslls for BEB300_m2 and _


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/svg-import-filter.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jul  9 01:40:06 2008
@@ -1126,6 +1126,10 @@
    UPSTREAM_VERSION=2.3.1
 elif test "$with_tag" = "OOH680_m12" ; then
    UPSTREAM_VERSION=2.4.0
+elif test "$with_tag" = "BEB300_m2" ; then
+   UPSTREAM_VERSION=3.0.0beta2rc
+elif test "$with_tag" = "BEB300_m3" ; then
+   UPSTREAM_VERSION=3.0.0beta2
 fi
 if test -n "$UPSTREAM_VERSION"; then
    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul  9 01:40:06 2008
@@ -64,7 +64,7 @@
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
-Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, Gcc43
+Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, Gcc43, EMFPlus
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
 UbuntuBased : DebianBase, UbuntuOnly
@@ -946,7 +946,7 @@
 # even when it is built with JDK 1.5
 build-java-target-m21.diff, pmladek
 
-[ BuildBits >= dev300-m22 ]
+[ BuildBits >= dev300-m22 < beb300-m0 ]
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5
 build-java-target.diff, pmladek
@@ -1700,7 +1700,7 @@
 [ OpenGLTransitions <= dev300-m21 ]
 transogl-transitions-slideshow-m21.diff
 
-[ OpenGLTransitions >= dev300-m22 ]
+[ OpenGLTransitions >= dev300-m22 < beb300-m0 ]
 transogl-transitions-slideshow.diff
 
 [ OpenGLTransitions ]
@@ -1717,7 +1717,7 @@
 transogl-dispose-fix-m21.diff
 transogl-sync-fix-m21.diff
 
-[ OpenGLTransitions >= dev300-m22 ]
+[ OpenGLTransitions >= dev300-m22 < beb300-m0 ]
 transogl-more-transitions.diff
 transogl-vsync.diff
 transogl-shader-transitions.diff
@@ -1795,7 +1795,7 @@
 [ FedoraLinuxOnlyFixes <= dev300-m21 ]
 ooo64508.vcl.honourfontconfighinting-m21.diff
 
-[ FedoraLinuxOnlyFixes >= dev300-m22 ]
+[ FedoraLinuxOnlyFixes >= dev300-m22 < beb300-m0 ]
 ooo64508.vcl.honourfontconfighinting.diff
 
 [ FedoraCommonFixes ]
@@ -1928,7 +1928,7 @@
 [ Store <= dev300-m21 ]
 store-registry-m21.diff
 
-[ Store >= dev300-m22 ]
+[ Store >= dev300-m22 < beb300-m0 ]
 store-registry.diff
 
 [ Store ]
@@ -2048,7 +2048,7 @@
 [ UnitTesting <= dev300-m21 ]
 unittesting-testtools-m21.diff
 
-[ UnitTesting >= dev300-m22 ]
+[ UnitTesting >= dev300-m22 < beb300-m0 ]
 unittesting-testtools.diff
 
 [ UnitTesting ]
@@ -2184,6 +2184,7 @@
 emf+-multipart-objects.diff, rodo
 emf+-use-canvas-only-for-emf+.diff, rodo
 emf+-embedded-mf-image.diff, rodo
+vcl-pluggable-mtf-renderer.diff, thorsten
 
 [ EMFPlus < dev300-m22 >= beb300-m1 ]
 emf+-offapi.diff
@@ -2382,7 +2383,7 @@
 [ Fixes <= dev300-m21 ]
 vcl-linking-randr-m21.diff, i#89718, n#398244, thorsten
 
-[ Fixes >= dev300-m22 ]
+[ Fixes >= dev300-m22 < beb300-m0 ]
 vcl-linking-randr.diff, i#89718, n#398244, thorsten
 
 [ Fixes ]
@@ -2390,7 +2391,6 @@
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
 slideshow-animated-bmp-fix.diff, i#73914, jlcheng
 sd-more-title-styles.diff, i#23221, thorsten
-vcl-pluggable-mtf-renderer.diff, thorsten
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 

Modified: trunk/patches/dev300/svg-import-filter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter.diff	(original)
+++ trunk/patches/dev300/svg-import-filter.diff	Wed Jul  9 01:40:06 2008
@@ -3984,117 +3984,6 @@
 +} // namespace svgi
 +
 +#endif
-diff --git a/filter/source/svg/svguno.cxx b/filter/source/svg/svguno.cxx
-deleted file mode 100644
-index 22f3215..0000000
---- filter/source/svg/svguno.cxx
-+++ /dev/null
-@@ -1,105 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile$
-- * $Revision$
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org 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 version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--
--// MARKER(update_precomp.py): autogen include statement, do not remove
--#include "precompiled_filter.hxx"
--
--#include <stdio.h>
--#include <osl/mutex.hxx>
--#include <osl/thread.h>
--#include <cppuhelper/factory.hxx>
--#include <com/sun/star/lang/XSingleServiceFactory.hpp>
--
--#include <svgfilter.hxx>
--
--using ::rtl::OUString;
--using namespace ::cppu;
--using namespace ::com::sun::star::uno;
--using namespace ::com::sun::star::lang;
--using namespace ::com::sun::star::registry;
--
--extern "C"
--{
--    //==================================================================================================
--    void SAL_CALL component_getImplementationEnvironment(
--	    const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
--    {
--	    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
--    }
--    //==================================================================================================
--    sal_Bool SAL_CALL component_writeInfo(
--	    void * /* pServiceManager */, void * pRegistryKey )
--    {
--	    if (pRegistryKey)
--	    {
--		    try
--		    {
--			    Reference< XRegistryKey > xNewKey(
--				    reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SVGFilter_getImplementationName() ) ); 
--                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
--			    
--			    const Sequence< OUString > & rSNL = SVGFilter_getSupportedServiceNames();
--			    const OUString * pArray = rSNL.getConstArray();
--			    for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
--				    xNewKey->createKey( pArray[nPos] );
--
--			    return sal_True;
--		    }
--		    catch (InvalidRegistryException &)
--		    {
--			    OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
--		    }
--	    }
--	    return sal_False;
--    }
--    //==================================================================================================
--    void * SAL_CALL component_getFactory(
--	    const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
--    {
--	    void * pRet = 0;
--	    
--        OUString implName = OUString::createFromAscii( pImplName );
--	    if ( pServiceManager && implName.equals(SVGFilter_getImplementationName()) )
--	    {
--		    Reference< XSingleServiceFactory > xFactory( createSingleFactory(
--			    reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
--			    OUString::createFromAscii( pImplName ),
--			    SVGFilter_createInstance, SVGFilter_getSupportedServiceNames() ) );
--		    
--		    if (xFactory.is())
--		    {
--			    xFactory->acquire();
--			    pRet = xFactory.get();
--		    }
--	    }
--	    
--	    return pRet;
--    }
--}
 diff --git a/filter/source/svg/test/makefile.mk b/filter/source/svg/test/makefile.mk
 new file mode 100644
 index 0000000..c3adda5
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]