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

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jan 22 20:23:34 2009
New Revision: 15142
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15142&view=rev

Log:
2009-01-22  Petr Mladek  <pmladek suse cz>

	* patches/dev300/buildfix-fmtargs.diff: fix to apply also in the
	  split build



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/buildfix-fmtargs.diff

Modified: trunk/patches/dev300/buildfix-fmtargs.diff
==============================================================================
--- trunk/patches/dev300/buildfix-fmtargs.diff	(original)
+++ trunk/patches/dev300/buildfix-fmtargs.diff	Thu Jan 22 20:23:34 2009
@@ -1,5 +1,5 @@
 --- jvmfwk/source/framework.cxx	2008-06-06 04:37:46.000000000 -0400
-+++ framework.cxx	2009-01-13 13:02:04.000000000 -0500
++++ jvmfwk/source/framework.cxx	2009-01-13 13:02:04.000000000 -0500
 @@ -242,7 +242,7 @@
      catch (jfw::FrameworkException& e)
      {
@@ -136,7 +136,7 @@
      }
      
 --- setup_native/source/ulfconv/ulfconv.cxx	2008-04-10 06:07:37.000000000 -0400
-+++ ulfconv.cxx	2009-01-15 15:15:23.000000000 -0500
++++ setup_native/source/ulfconv/ulfconv.cxx	2009-01-15 15:15:23.000000000 -0500
 @@ -348,7 +348,7 @@
  
              
@@ -147,7 +147,7 @@
      }
  }
 --- rsc/source/prj/start.cxx	2008-04-11 03:26:42.000000000 -0400
-+++ start.cxx	2009-01-13 13:47:42.000000000 -0500
++++ rsc/source/prj/start.cxx	2009-01-13 13:47:42.000000000 -0500
 @@ -244,7 +244,7 @@
  #ifdef OS2
  		fprintf( fRspFile, "%s\n", aSrsName.GetBuffer() );
@@ -158,7 +158,7 @@
  
  		pString = pInputList->First();
 --- idl/source/prj/command.cxx	2008-05-20 15:03:35.000000000 -0400
-+++ command.cxx	2009-01-13 13:58:16.000000000 -0500
++++ idl/source/prj/command.cxx	2009-01-13 13:58:16.000000000 -0500
 @@ -351,7 +351,7 @@
  			}
              else if( aParam.EqualsIgnoreCaseAscii( "help" ) || aParam.EqualsIgnoreCaseAscii( "?" ) )
@@ -178,7 +178,7 @@
  
      String * pStr = aList.First();
 --- psprint/source/fontsubset/sft.c	2008-06-25 10:20:29.000000000 -0400
-+++ sft.c	2009-01-13 14:07:50.000000000 -0500
++++ psprint/source/fontsubset/sft.c	2009-01-13 14:07:50.000000000 -0500
 @@ -2044,7 +2044,7 @@
      fprintf(outf, h02, modname, modver, modextra);
      fprintf(outf, h09, ttf->psname);
@@ -229,7 +229,7 @@
  
      return SF_OK;
 --- vcl/unx/source/plugadapt/salplug.cxx	2009-01-19 14:31:36.000000000 -0500
-+++ salplug.cxx	2009-01-13 14:13:28.000000000 -0500
++++ vcl/unx/source/plugadapt/salplug.cxx	2009-01-13 14:13:28.000000000 -0500
 @@ -543,7 +543,7 @@
  	if( !rErrorText.Len() )
  		std::fprintf( stderr, "Application Error" );
@@ -240,7 +240,7 @@
  }
  
 --- svtools/bmpmaker/bmp.cxx	2008-04-10 14:09:34.000000000 -0400
-+++ bmp.cxx	2009-01-15 15:59:42.000000000 -0500
++++ svtools/bmpmaker/bmp.cxx	2009-01-15 15:59:42.000000000 -0500
 @@ -159,7 +159,7 @@
  
  	ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
@@ -251,7 +251,7 @@
  
  // -----------------------------------------------------------------------------
 --- svtools/bmpmaker/g2g.cxx	2008-04-10 14:12:19.000000000 -0400
-+++ g2g.cxx	2009-01-15 16:05:10.000000000 -0500
++++ svtools/bmpmaker/g2g.cxx	2009-01-15 16:05:10.000000000 -0500
 @@ -128,7 +128,7 @@
  
  	ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
@@ -262,7 +262,7 @@
  
  // -----------------------------------------------------------------------------
 --- svtools/bmpmaker/bmpsum.cxx	2008-04-10 14:11:57.000000000 -0400
-+++ bmpsum.cxx	2009-01-15 16:08:59.000000000 -0500
++++ svtools/bmpmaker/bmpsum.cxx	2009-01-15 16:08:59.000000000 -0500
 @@ -171,7 +171,7 @@
  
  	ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
@@ -273,7 +273,7 @@
  
  // -----------------------------------------------------------------------------
 --- extensions/source/logging/consolehandler.cxx	2008-04-11 05:59:54.000000000 -0400
-+++ consolehandler.cxx	2009-01-16 05:53:56.000000000 -0500
++++ extensions/source/logging/consolehandler.cxx	2009-01-16 05:53:56.000000000 -0500
 @@ -252,9 +252,9 @@
              return sal_False;
  
@@ -287,7 +287,7 @@
          return sal_True;
      }
 --- cpputools/source/unoexe/unoexe.cxx	2008-04-11 07:50:01.000000000 -0400
-+++ unoexe.cxx	2009-01-15 14:21:29.000000000 -0500
++++ cpputools/source/unoexe/unoexe.cxx	2009-01-15 14:21:29.000000000 -0500
 @@ -134,7 +134,7 @@
  static inline void out( const sal_Char * pText )
  {
@@ -307,7 +307,7 @@
  }
 
 --- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-20 10:40:09.000000000 -0500
-+++ SalGtkFilePicker.cxx      2009-01-20 17:43:26.000000000 -0500
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx      2009-01-20 17:43:26.000000000 -0500
 @@ -1024,7 +1024,7 @@
                                  GTK_DIALOG_MODAL,
                                                                 GTK_MESSAGE_QUESTION,
@@ -346,8 +346,8 @@
 diff: icc/makefile.mk.: Arquivo ou diretÃrio nÃo encontrado
 [cabral build1 ooo300-m14]$ gendiff . .orig0
 diff -p -up ./icc/makefile.mk.orig0 ./icc/makefile.mk
---- ./icc/makefile.mk.orig0     2009-01-20 15:42:20.000000000 -0500
-+++ ./icc/makefile.mk   2009-01-20 15:42:49.000000000 -0500
+--- icc/makefile.mk.orig0     2009-01-20 15:42:20.000000000 -0500
++++ icc/makefile.mk   2009-01-20 15:42:49.000000000 -0500
 @@ -54,7 +54,7 @@ CONVERTFILES= \
         Contrib$/ICC_utils$/Stubs.h \
         Contrib$/ICC_utils$/Vetters.cpp