ooo-build r13577 - in trunk: . bin patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Thu Aug 14 16:55:42 2008
New Revision: 13577
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13577&view=rev

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

	* patches/dev300/split-icons-search-usr-share.diff:
	* patches/dev300/apply: port for dev300; prefer /usr/share in the 
	  xmlhelp part; it seems that the vcl part is not longer needed

	* download.in, bin/unpack: the prebuilt cli_uretypes.dll is needed
	  instead of cli_types.dll and cli_types_bridgetest.dll now



Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/split-icons-search-usr-share.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Thu Aug 14 16:55:42 2008
@@ -252,11 +252,11 @@
 
 # copy in misc Mono related dlls if we need to
 # we can't build them on Unix.
-CLI_TYPES=cli_types.dll
+CLI_TYPES=cli_uretypes.dll
 if test "z$PIECE" = "z"; then
 if test -f "$SRCDIR/$CLI_TYPES"; then
     mkdir -p $OOBUILDDIR/external/cli
-    $GNUCP -af $SRCDIR/$CLI_TYPES $SRCDIR/cli_types_bridgetest.dll $OOBUILDDIR/external/cli
+    $GNUCP -af $SRCDIR/$CLI_TYPES $OOBUILDDIR/external/cli
 fi
 fi
 

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Thu Aug 14 16:55:42 2008
@@ -45,7 +45,7 @@
     'extras-.*'				 => '@MIRROR@/SRC680',
     'ooo_custom_images.*'                => '@MIRROR@/SRC680',
     'ooo_crystal_images.*'               => '@MIRROR@/SRC680',
-    'cli_types.*'                        => '@MIRROR@/@MWS@',
+    'cli_uretypes.dll'                   => '@MIRROR@/@MWS@',
     'mdbtools.*'                         => '@MIRROR@/SRC680',
     'libpixman-.*'			 => '@MIRROR@/SRC680',
     'glitz-.*'			         => '@MIRROR@/SRC680',
@@ -238,8 +238,7 @@
 else
 {
     if ('@ENABLE_MONO@' ne 'FALSE') {
-	push @files, ( 'cli_types.dll' );
-	push @files, ( 'cli_types_bridgetest.dll' );
+	push @files, ( 'cli_uretypes.dll' );
     }
 }
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 14 16:55:42 2008
@@ -939,7 +939,7 @@
 # search also /usr/share for icons
 # it is a temporary hack; we should do more clean FHS compliant installation
 # we need a good plan before, though ;-)
-#FIXME dev300-m10: split-icons-search-usr-share.diff, n#296502, pmladek
+split-icons-search-usr-share.diff, n#296502, pmladek
 
 [ BrokenSystemNSS ]
 

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 16:55:42 2008
@@ -1,38 +1,6 @@
---- vcl/source/gdi/impimagetree.cxx.old	2007-07-24 12:11:00.000000000 +0200
-+++ vcl/source/gdi/impimagetree.cxx	2007-08-09 18:54:33.000000000 +0200
-@@ -234,10 +234,25 @@ bool ImplImageTree::implInit()
- 				
- 					if( !mxFileAccess->exists( aRet = aZipURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
- 					{
--						if ( bWithStyle && maSymbolsStyle.getLength() > 0 )
--							aRet = implGetZipFileURL( false ); // Try without style
--						else
--							aRet = ::rtl::OUString();
-+						// 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
-+						sal_Int32 nLibDirPos = aRet.indexOf( aLibDir );
-+
-+						if ( nLibDirPos >= 0 )
-+						{
-+							if( !mxFileAccess->exists( aRet = aRet.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir ) ) )
-+							{
-+								if ( bWithStyle && maSymbolsStyle.getLength() > 0 )
-+									aRet = implGetZipFileURL( false ); // Try without style
-+								else
-+									aRet = ::rtl::OUString();
-+							}
-+						}
- 					}
- 				}
- 			}
---- xmlhelp/source/cxxhelp/provider/provider.cxx.old	2007-06-05 20:28:52.000000000 +0200
-+++ xmlhelp/source/cxxhelp/provider/provider.cxx	2007-08-09 19:10:44.000000000 +0200
-@@ -368,7 +368,7 @@ void ContentProvider::init()
+--- 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()
          setupextension );
  	rtl::OUString vendorshort = vendorname;
  	
@@ -41,23 +9,23 @@
      xHierAccess = getHierAccess( sProvider,	 "org.openoffice.Office.Common" );
  	
      rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) );
-@@ -378,6 +378,19 @@ void ContentProvider::init()
-     aPath = getKey( xHierAccess, "Path/Current/Config" );
-     subst( aPath );
-     aImagesZipPaths[ 1 ] = aPath;
-+
-+    // try also /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
-+    sal_Int32 nLibDirPos = aPath.indexOf( aLibDir );
-+
-+    if ( nLibDirPos >= 0 )
-+	    aPath = aPath.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir );
+@@ -357,6 +357,19 @@ void ContentProvider::init()
+ 
+ 	aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config"));
+ 	rtl::Bootstrap::expandMacros(aPath);
 +    aImagesZipPaths[ 2 ] = aPath;
- 	
-     sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic");
-     m_pDatabases = new Databases( showBasic, 
++
++    // try also /usr/share and even before /usr/lib
++    ::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 
++    sal_Int32 nLibDirPos = aPath.indexOf( aLibDir ); 
++ 
++    if ( nLibDirPos >= 0 ) 
++	aPath = aPath.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir ); 
+     aImagesZipPaths[ 1 ] = aPath;
+ 
+ 	uno::Reference< uno::XComponentContext > xContext;