[ooo-build-commit] patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Fri Nov 27 00:03:16 PST 2009
patches/dev300/apply | 6 -
patches/dev300/buildfix-fmtargs-m5.diff | 187 ++++++++++++++++++++++++++++++++
patches/dev300/buildfix-fmtargs.diff | 4
3 files changed, 194 insertions(+), 3 deletions(-)
New commits:
commit a9e8ef3aae5770bcc2637a3ed59f81dfde259a57
Author: Rene Engelhard <rene at debian.org>
Date: Fri Nov 27 08:58:12 2009 +0100
update buildfix-fmtargs.diff for m6
* patches/dev300/buildfix-fmtargs-m5.diff: copy
* patches/dev300/buildfix-fmtargs.diff: add -o to unzip
* patches/dev300/apply: adapt
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 57ebfd6..81ed876 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -414,10 +414,14 @@ sdext-noarch-identifier.diff, pmladek
# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
build-ant-1.6.diff, i#90830, pmladek
-[ Fixes ]
+[ Fixes < ooo320-m6 ]
+# printf arguments cleanup
+buildfix-fmtargs-m5.diff, cabral
+[ Fixes >= ooo320-m6 ]
# printf arguments cleanup
buildfix-fmtargs.diff, cabral
+[ Fixes ]
# more intelligent nsplugin seeking
nsplugin-path.diff, i#49590, michael
diff --git a/patches/dev300/buildfix-fmtargs-m5.diff b/patches/dev300/buildfix-fmtargs-m5.diff
new file mode 100644
index 0000000..130af2b
--- /dev/null
+++ b/patches/dev300/buildfix-fmtargs-m5.diff
@@ -0,0 +1,187 @@
+--- rsc/source/prj/start.cxx 2008-04-11 03:26:42.000000000 -0400
++++ 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() );
+ #else
+- fprintf( fRspFile, aSrsName.GetBuffer() );
++ fprintf( fRspFile, "%s", aSrsName.GetBuffer() );
+ #endif
+
+ pString = pInputList->First();
+--- vcl/source/fontsubset/sft.cxx
++++ vcl/source/fontsubset/sft.cxx
+@@ -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
++++ 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" );
+ 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
++++ svtools/bmpmaker/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
++++ svtools/bmpmaker/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/bmpsum.cxx 2008-04-10 14:11:57.000000000 -0400
++++ svtools/bmpmaker/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
++++ extensions/source/logging/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
++++ 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 )
+ {
+ 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
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-20 17:43:26.000000000 -0500
+@@ -1061,7 +1061,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
+ 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;
++
+--- icc/makefile.mk.orig0
++++ icc/makefile.mk
+@@ -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 && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
+
+ # --- Targets ------------------------------------------------------
diff --git a/patches/dev300/buildfix-fmtargs.diff b/patches/dev300/buildfix-fmtargs.diff
index 130af2b..970e763 100644
--- a/patches/dev300/buildfix-fmtargs.diff
+++ b/patches/dev300/buildfix-fmtargs.diff
@@ -180,8 +180,8 @@ diff -p -up ./icc/mdv-fmtargs-buildfix.patch.orig0 ./icc/mdv-fmtargs-buildfix.pa
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
+-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
++CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip && patch -p0 < $(BACK_PATH)..$/mdv-fmtargs-buildfix.patch
BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
# --- Targets ------------------------------------------------------
More information about the ooo-build-commit
mailing list