ooo-build r13578 - in trunk: . distro-configs patches/dev300 patches/ooxml

[pmladek svn gnome org]

Author: pmladek
Date: Thu Aug 14 18:32:24 2008
New Revision: 13578
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13578&view=rev

Log:
2008-08-14  Petr Mladek  <pmladek suse cz>

	* patches/dev300/split-icons-search-usr-share.diff: port also the vcl
	  part; is needed in the end for the main menu ;-)

	* patches/ooxml/oox-token-deps.diff, patches/dev300/apply: bin;
	  looks obsolete; heh, the current dependecies look evil

	* distro-configs/SUSE.conf.in:
	* distro-configs/SUSE-11.0.conf.in:
	* distro-configs/SUSE-10.2.conf.in:
	* distro-configs/SUSE-10.3.conf.in: add --with-system-dicts,
	  --with-external-dict-dir=/usr/share/myspell,
	  --with-external-hyph-dir=/usr/share/ooo/hyphen,
	  --with-external-thes-dir=/usr/share/ooo/thesaurus
	
	  still need to find the right paths for SUSE-10.1.conf.in and SLED10



Removed:
   trunk/patches/ooxml/oox-token-deps.diff
Modified:
   trunk/ChangeLog
   trunk/distro-configs/SUSE-10.2.conf.in
   trunk/distro-configs/SUSE-10.3.conf.in
   trunk/distro-configs/SUSE-11.0.conf.in
   trunk/distro-configs/SUSE.conf.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/split-icons-search-usr-share.diff

Modified: trunk/distro-configs/SUSE-10.2.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.2.conf.in	(original)
+++ trunk/distro-configs/SUSE-10.2.conf.in	Thu Aug 14 18:32:24 2008
@@ -8,11 +8,15 @@
 --enable-opengl
 --enable-ogltrans
 --with-ant-home=/usr/share/ant
+--with-external-dict-dir=/usr/share/myspell
+--with-external-hyph-dir=/usr/share/ooo/hyphen
+--with-external-thes-dir=/usr/share/ooo/thesaurus
 --with-jdk-home=$JAVA_HOME
 --with-system-boost
 --with-system-cairo
 --with-system-curl
 --with-system-db
+--with-system-dicts
 --with-system-expat
 --with-system-libxslt
 --with-system-mozilla=xulrunner

Modified: trunk/distro-configs/SUSE-10.3.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.3.conf.in	(original)
+++ trunk/distro-configs/SUSE-10.3.conf.in	Thu Aug 14 18:32:24 2008
@@ -8,12 +8,16 @@
 --enable-opengl
 --enable-ogltrans
 --with-ant-home=/usr/share/ant
+--with-external-dict-dir=/usr/share/myspell
+--with-external-hyph-dir=/usr/share/ooo/hyphen
+--with-external-thes-dir=/usr/share/ooo/thesaurus
 --with-java-target-version=1.4
 --with-jdk-home=$JAVA_HOME
 --with-system-boost
 --with-system-cairo
 --with-system-curl
 --with-system-db
+--with-system-dicts
 --without-system-icu
 --with-system-expat
 --with-system-libxslt

Modified: trunk/distro-configs/SUSE-11.0.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-11.0.conf.in	(original)
+++ trunk/distro-configs/SUSE-11.0.conf.in	Thu Aug 14 18:32:24 2008
@@ -7,14 +7,18 @@
 --enable-mono
 --enable-opengl
 --enable-ogltrans
---with-ant-home=/usr/share/ant
 --without-stlport
+--with-ant-home=/usr/share/ant
+--with-external-dict-dir=/usr/share/myspell
+--with-external-hyph-dir=/usr/share/ooo/hyphen
+--with-external-thes-dir=/usr/share/ooo/thesaurus
 --with-java-target-version=1.5
 --with-jdk-home=$JAVA_HOME
 --with-system-boost
 --with-system-cairo
 --with-system-curl
 --with-system-db
+--with-system-dicts
 --with-system-expat
 --with-system-hunspell
 --with-system-icu

Modified: trunk/distro-configs/SUSE.conf.in
==============================================================================
--- trunk/distro-configs/SUSE.conf.in	(original)
+++ trunk/distro-configs/SUSE.conf.in	Thu Aug 14 18:32:24 2008
@@ -7,14 +7,18 @@
 --enable-mono
 --enable-opengl
 --enable-ogltrans
---with-ant-home=/usr/share/ant
 --without-stlport
+--with-ant-home=/usr/share/ant
+--with-external-dict-dir=/usr/share/myspell
+--with-external-hyph-dir=/usr/share/ooo/hyphen
+--with-external-thes-dir=/usr/share/ooo/thesaurus
 --with-java-target-version=1.5
 --with-jdk-home=$JAVA_HOME
 --with-system-boost
 --with-system-cairo
 --with-system-curl
 --with-system-db
+--with-system-dicts
 --with-system-expat
 --with-system-hunspell
 --with-system-icu

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 14 18:32:24 2008
@@ -1610,10 +1610,6 @@
 
 buildfix-oox-depends-on-unotools.diff
 
-# fix build dependencies
-#FIXME still necessary? oox-token-deps.diff, pmladek
-
-
 [ CalcFixes ]
 
 # Support several different formula syntax, and add a formula syntax

Modified: trunk/patches/dev300/split-icons-search-usr-share.diff
==============================================================================
--- trunk/patches/dev300/split-icons-search-usr-share.diff	(original)
+++ trunk/patches/dev300/split-icons-search-usr-share.diff	Thu Aug 14 18:32:24 2008
@@ -1,3 +1,70 @@
+--- vcl/source/gdi/impimagetree.cxx.old	2008-06-16 16:29:33.000000000 +0200
++++ vcl/source/gdi/impimagetree.cxx	2008-07-02 21:04:02.000000000 +0200
+@@ -105,6 +105,19 @@ void ImplZipAccessor::Update( const ::rt
+     rtl::Bootstrap::expandMacros( aBrandPath );
+     rtl::Bootstrap::expandMacros( aOOOPath );
+ 
++    // try /usr/share
++    ::rtl::OUString aDataDir = ::rtl::OUString::createFromAscii ( "/usr/share/" );
++#ifdef X86_64
++    ::rtl::OUString aLibDir = ::rtl::OUString::createFromAscii ( "/usr/lib64/" );
++#else
++    ::rtl::OUString aLibDir = ::rtl::OUString::createFromAscii ( "/usr/lib/" );
++#endif
++
++    rtl::OUString aOOOPathInShare;
++    sal_Int32 nLibDirPos = aOOOPath.indexOf( aLibDir );
++    if ( nLibDirPos >= 0 )
++	aOOOPathInShare = aOOOPath.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir );
++
+     // Theme Branding Zip
+     if( rSymbolsStyle.getLength() )
+     {
+@@ -120,6 +133,8 @@ void ImplZipAccessor::Update( const ::rt
+             aTmpURLVector.push_back( aThemeBrandURL.GetMainURL( INetURLObject::NO_DECODE ) );
+     }
+ 
++
++
+     // Branding Zip
+     INetURLObject   aBrandURL( aBrandPath );
+     ::rtl::OUString aBrandZip( aZipFileName );
+@@ -135,27 +150,35 @@ void ImplZipAccessor::Update( const ::rt
+     if( rSymbolsStyle.getLength() )
+     {
+         INetURLObject   aThemeURL( aOOOPath );
++        INetURLObject   aThemeInShareURL( aOOOPathInShare );
+         ::rtl::OUString aThemeZip( aZipFileName );
+ 
+         ( aThemeZip += ::rtl::OUString::createFromAscii( "_" ) ) += rSymbolsStyle;
+         aThemeZip += ::rtl::OUString::createFromAscii( IMAGES_ZIPFILENAME_SUFFIX );
+         aThemeURL.Append( aThemeZip );
++        aThemeInShareURL.Append( aThemeZip );
+ 
+         if( mxFileAccess->exists( aThemeURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
+             aTmpURLVector.push_back( aThemeURL.GetMainURL( INetURLObject::NO_DECODE ) );
++        if( mxFileAccess->exists( aThemeInShareURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
++            aTmpURLVector.push_back( aThemeInShareURL.GetMainURL( INetURLObject::NO_DECODE ) );
+     }
+ 
+     // Default Zip
+     if( rSymbolsStyle.getLength() )
+     {
+         INetURLObject   aDefaultURL( aOOOPath );
++        INetURLObject   aDefaultInShareURL( aOOOPath );
+         ::rtl::OUString aDefaultZip( aZipFileName );
+ 
+         aDefaultZip += ::rtl::OUString::createFromAscii( IMAGES_ZIPFILENAME_SUFFIX );
+         aDefaultURL.Append( aDefaultZip );
++        aDefaultInShareURL.Append( aDefaultZip );
+ 
+         if( mxFileAccess->exists( aDefaultURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
+             aTmpURLVector.push_back( aDefaultURL.GetMainURL( INetURLObject::NO_DECODE ) );
++        if( mxFileAccess->exists( aDefaultInShareURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
++            aTmpURLVector.push_back( aDefaultInShareURL.GetMainURL( INetURLObject::NO_DECODE ) );
+     }
+ 
+     if( xFactory.is() )
 --- xmlhelp/source/cxxhelp/provider/provider.cxx.old	2008-07-02 11:35:38.000000000 +0200
 +++ xmlhelp/source/cxxhelp/provider/provider.cxx	2008-08-14 18:27:47.000000000 +0200
 @@ -348,7 +348,7 @@ void ContentProvider::init()