GNOME.org
 

ooo-build r15116 - in branches/opensuse-11-1: . patches/dev300

Author: pmladek
Date: Wed Jan 21 18:24:09 2009
New Revision: 15116
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15116&view=rev

Log:
2008-01-21  Petr Mladek  <pmladek suse cz>

	* patches/dev300/buildfix-fmtargs.diff, patches/dev300/apply:
	  printf arguments cleanup; back-port from ooo-build-3-0-1
	  branch; patch by Rafael Cabral  <cabral conectiva com br>



Added:
   branches/opensuse-11-1/patches/dev300/buildfix-fmtargs.diff
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Wed Jan 21 18:24:09 2009
@@ -393,6 +393,9 @@
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
 
+# printf argumetns cleanup
+buildfix-fmtargs.diff, cabral
+
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
 

Added: branches/opensuse-11-1/patches/dev300/buildfix-fmtargs.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/buildfix-fmtargs.diff	Wed Jan 21 18:24:09 2009
@@ -0,0 +1,370 @@
+--- jvmfwk/source/framework.cxx	2008-06-06 04:37:46.000000000 -0400
++++ framework.cxx	2009-01-13 13:02:04.000000000 -0500
+@@ -242,7 +242,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         retVal = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return retVal;
+@@ -420,7 +420,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr,"%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+  
+@@ -629,7 +629,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+  
+@@ -718,7 +718,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -846,7 +846,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+  
+@@ -880,7 +880,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -913,7 +913,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -935,7 +935,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -960,7 +960,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+ 
+@@ -985,7 +985,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -1008,7 +1008,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -1031,7 +1031,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -1055,7 +1055,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+  
+@@ -1081,7 +1081,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     return errcode;
+@@ -1106,7 +1106,7 @@
+     catch (jfw::FrameworkException& e)
+     {
+         errcode = e.errorCode;
+-        fprintf(stderr, e.message.getStr());
++        fprintf(stderr, "%s", e.message.getStr());
+         OSL_ENSURE(0, e.message.getStr());
+     }
+     
+--- setup_native/source/ulfconv/ulfconv.cxx	2008-04-10 06:07:37.000000000 -0400
++++ ulfconv.cxx	2009-01-15 15:15:23.000000000 -0500
+@@ -348,7 +348,7 @@
+ 
+             
+         } else {
+-            fprintf(ostream, buffer);
++            fprintf(ostream, "%s", buffer);
+         }
+     }
+ }
+--- rsc/source/prj/start.cxx	2008-04-11 03:26:42.000000000 -0400
++++ start.cxx	2009-01-13 13:47:42.000000000 -0500
+@@ -244,7 +244,7 @@
+ #ifdef OS2
+ 		fprintf( fRspFile, "%s\n", aSrsName.GetBuffer() );
+ #else
+-		fprintf( fRspFile, aSrsName.GetBuffer() );
++		fprintf( fRspFile, "%s", aSrsName.GetBuffer() );
+ #endif
+ 
+ 		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
+@@ -351,7 +351,7 @@
+ 			}
+             else if( aParam.EqualsIgnoreCaseAscii( "help" ) || aParam.EqualsIgnoreCaseAscii( "?" ) )
+ 			{ // Hilfe
+-				printf( CommandLineSyntax );
++				printf( "%s", CommandLineSyntax );
+ 			}
+             else if( aParam.EqualsIgnoreCaseAscii( "syntax" ) )
+ 			{ // Hilfe
+@@ -391,7 +391,7 @@
+ 	}
+ 	else
+ 	{
+-				printf( CommandLineSyntax );
++				printf( "%s", CommandLineSyntax );
+ 	}
+ 
+     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
+@@ -2044,7 +2044,7 @@
+     fprintf(outf, h02, modname, modver, modextra);
+     fprintf(outf, h09, ttf->psname);
+ 
+-    fprintf(outf, h10);
++    fprintf(outf, "%s", h10);
+     fprintf(outf, h11, fname);
+ /*    fprintf(outf, h12, 4000000); */
+ 
+@@ -2059,17 +2059,17 @@
+      */
+ 
+     fprintf(outf, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs));
+-    fprintf(outf, h13);
++    fprintf(outf, "%s", h13);
+     fprintf(outf, h14, XUnits(UPEm, GetInt16(table, 36, 1)), XUnits(UPEm, GetInt16(table, 38, 1)), XUnits(UPEm, GetInt16(table, 40, 1)), XUnits(UPEm, GetInt16(table, 42, 1)));
+-    fprintf(outf, h15);
++    fprintf(outf, "%s", h15);
+ 
+     for (i = 0; i < nGlyphs; i++) {
+         fprintf(outf, h16, encoding[i], i);
+     }
+ 
+     fprintf(outf, h30, nGlyphs+1);
+-    fprintf(outf, h31);
+-    fprintf(outf, h32);
++    fprintf(outf, "%s", h31);
++    fprintf(outf, "%s", h32);
+ 
+     for (i = 0; i < nGlyphs; i++) {
+         fprintf(outf, h33, i);
+@@ -2113,14 +2113,14 @@
+         }
+         if (n > 0) fprintf(outf, "\tfill\n");     /* if glyph is not a whitespace character */
+ 
+-        fprintf(outf, h34);
++        fprintf(outf, "%s", h34);
+ 
+         free(pa);
+         free(path);
+     }
+-    fprintf(outf, h35);
++    fprintf(outf, "%s", h35);
+ 
+-    fprintf(outf, h40);
++    fprintf(outf, "%s", h40);
+     fprintf(outf, h41, fname);
+ 
+     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
+@@ -543,7 +543,7 @@
+ 	if( !rErrorText.Len() )
+ 		std::fprintf( stderr, "Application Error" );
+ 	else
+-		std::fprintf( stderr, ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
++		std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
+ 	abort();
+ }
+ 
+--- svtools/bmpmaker/bmp.cxx	2008-04-10 14:09:34.000000000 -0400
++++ bmp.cxx	2009-01-15 15:59:42.000000000 -0500
+@@ -159,7 +159,7 @@
+ 
+ 	ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
+ 	aText.Append( "\r\n" );
+-	fprintf( stderr, aText.GetBuffer() );
++	fprintf( stderr, "%s", aText.GetBuffer() );
+ }
+ 
+ // -----------------------------------------------------------------------------
+--- svtools/bmpmaker/g2g.cxx	2008-04-10 14:12:19.000000000 -0400
++++ g2g.cxx	2009-01-15 16:05:10.000000000 -0500
+@@ -128,7 +128,7 @@
+ 
+ 	ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
+ 	aText.Append( "\r\n" );
+-	fprintf( stderr, aText.GetBuffer() );
++	fprintf( stderr, "%s", aText.GetBuffer() );
+ }
+ 
+ // -----------------------------------------------------------------------------
+--- svtools/bmpmaker/bmpgui.cxx	2008-04-10 14:11:26.000000000 -0400
++++ bmpgui.cxx	2009-01-13 14:17:29.000000000 -0500
+@@ -302,7 +302,7 @@
+ #else
+ 	aText.Append( "\n" );
+ #endif
+-	fprintf( stderr, aText.GetBuffer() );
++	fprintf( stderr, "%s", aText.GetBuffer() );
+ }
+ 
+ // -----------------------------------------------------------------------
+--- svtools/bmpmaker/bmpsum.cxx	2008-04-10 14:11:57.000000000 -0400
++++ bmpsum.cxx	2009-01-15 16:08:59.000000000 -0500
+@@ -171,7 +171,7 @@
+ 
+ 	ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
+ 	aText.Append( "\r\n" );
+-	fprintf( stderr, aText.GetBuffer() );
++	fprintf( stderr, "%s", aText.GetBuffer() );
+ }
+ 
+ // -----------------------------------------------------------------------------
+--- extensions/source/logging/consolehandler.cxx	2008-04-11 05:59:54.000000000 -0400
++++ consolehandler.cxx	2009-01-16 05:53:56.000000000 -0500
+@@ -252,9 +252,9 @@
+             return sal_False;
+ 
+         if ( _rRecord.Level >= m_nThreshold )
+-            fprintf( stderr, sEntry.getStr() );
++            fprintf( stderr, "%s", sEntry.getStr() );
+         else
+-            fprintf( stdout, sEntry.getStr() );
++            fprintf( stdout, "%s", sEntry.getStr() );
+ 
+         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
+@@ -134,7 +134,7 @@
+ static inline void out( const sal_Char * pText )
+ {
+     if (! s_quiet)
+-        fprintf( stderr, pText );
++        fprintf( stderr, "%s", pText );
+ }
+ //--------------------------------------------------------------------------------------------------
+ static inline void out( const OUString & rText )
+@@ -142,7 +142,7 @@
+     if (! s_quiet)
+     {
+         OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
+-        fprintf( stderr, aText.getStr() );
++        fprintf( stderr, "%s", aText.getStr() );
+     }
+ }
+
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-20 10:40:09.000000000 -0500
++++ SalGtkFilePicker.cxx      2009-01-20 17:43:26.000000000 -0500
+@@ -1024,7 +1024,7 @@
+                                 GTK_DIALOG_MODAL,
+                                                                GTK_MESSAGE_QUESTION,
+                                                                GTK_BUTTONS_YES_NO,
+-                                  OUStringToOString(
++                                  "\"%s\"", OUStringToOString(
+                                     aResProvider.getResString( FILE_PICKER_OVERWRITE ),
+                                     RTL_TEXTENCODING_UTF8 ).getStr() );
+
+diff -p -up ./icc/mdv-fmtargs-buildfix.patch.orig0 ./icc/mdv-fmtargs-buildfix.patch
+--- /dev/null     2009-01-20 13:40:58.000000000 -0500
++++ icc/mdv-fmtargs-buildfix.patch    2009-01-20 13:37:59.000000000 -0500
+@@ -0,0 +1,21 @@
++--- IccProfLib/IccProfile.cpp  2009-01-20 11:48:36.000000000 -0500
+++++ IccProfile.cpp     2009-01-19 14:41:23.000000000 -0500
++@@ -1155,7 +1155,7 @@
++
++   CIccInfo Info;
++   icChar buf[128];
++-  sprintf(buf, Info.GetSigName(m_Header.deviceClass));
+++  sprintf(buf, "%s", Info.GetSigName(m_Header.deviceClass));
++   if (m_Header.deviceClass!=icSigInputClass && m_Header.deviceClass!=icSigDisplayClass) {
++     if (GetTag(icSigGrayTRCTag) || GetTag(icSigRedTRCTag) || GetTag(icSigGreenTRCTag) ||
++        GetTag(icSigBlueTRCTag) || GetTag(icSigRedColorantTag) || GetTag(icSigGreenColorantTag) ||
++@@ -1230,7 +1230,7 @@
++   for (i=m_Tags->begin(); i!=m_Tags->end(); i++) {
++     tagsig = i->TagInfo.sig;
++     typesig = i->pTag->GetType();
++-    sprintf(buf, Info.GetSigName(tagsig));
+++    sprintf(buf, "%s", Info.GetSigName(tagsig));
++     if (!IsTypeValid(tagsig, typesig)) {
++       sReport += icValidateNonCompliantMsg;
++       sReport += buf;
++
+diff -p -up icc/makefile.mk.orig0 ./icc/makefile.mk.
+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
+@@ -54,7 +54,7 @@ CONVERTFILES= \
+        Contrib$/ICC_utils$/Stubs.h \
+        Contrib$/ICC_utils$/Vetters.cpp
+
+-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip
++CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip && patch -p0 < $(BACK_PATH)..$/mdv-fmtargs-buildfix.patch
+ BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
+
+ # --- Targets ------------------------------------------------------
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]