applied_patches/0067-buildfix-fmtargs.diff

   1 --- rsc/source/prj/start.cxx    2008-04-11 03:26:42.000000000 -0400
   2 +++ rsc/source/prj/start.cxx    2009-01-13 13:47:42.000000000 -0500
   3 @@ -244,7 +244,7 @@
   4  #ifdef OS2
   5                 fprintf( fRspFile, "%s\n", aSrsName.GetBuffer() );
   6  #else
   7 -               fprintf( fRspFile, aSrsName.GetBuffer() );
   8 +               fprintf( fRspFile, "%s", aSrsName.GetBuffer() );
   9  #endif
  10
  11                 pString = pInputList->First();
  12 --- idl/source/prj/command.cxx  2008-05-20 15:03:35.000000000 -0400
  13 +++ idl/source/prj/command.cxx  2009-01-13 13:58:16.000000000 -0500
  14 @@ -351,7 +351,7 @@
  15                         }
  16              else if( aParam.EqualsIgnoreCaseAscii( "help" ) || aParam.EqualsIgnoreCaseAscii( "?" ) )
  17                         { // Hilfe
  18 -                               printf( CommandLineSyntax );
  19 +                               printf( "%s", CommandLineSyntax );
  20                         }
  21              else if( aParam.EqualsIgnoreCaseAscii( "syntax" ) )
  22                         { // Hilfe
  23 @@ -391,7 +391,7 @@
  24         }
  25         else
  26         {
  27 -                               printf( CommandLineSyntax );
  28 +                               printf( "%s", CommandLineSyntax );
  29         }
  30
  31      String * pStr = aList.First();
  32 --- psprint/source/fontsubset/sft.c     2008-06-25 10:20:29.000000000 -0400
  33 +++ psprint/source/fontsubset/sft.c     2009-01-13 14:07:50.000000000 -0500
  34 @@ -2044,7 +2044,7 @@
  35      fprintf(outf, h02, modname, modver, modextra);
  36      fprintf(outf, h09, ttf->psname);
  37
  38 -    fprintf(outf, h10);
  39 +    fprintf(outf, "%s", h10);
  40      fprintf(outf, h11, fname);
  41  /*    fprintf(outf, h12, 4000000); */
  42
  43 @@ -2059,17 +2059,17 @@
  44       */
  45
  46      fprintf(outf, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs));
  47 -    fprintf(outf, h13);
  48 +    fprintf(outf, "%s", h13);
  49      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)));
  50 -    fprintf(outf, h15);
  51 +    fprintf(outf, "%s", h15);
  52
  53      for (i = 0; i < nGlyphs; i++) {
  54          fprintf(outf, h16, encoding[i], i);
  55      }
  56
  57      fprintf(outf, h30, nGlyphs+1);
  58 -    fprintf(outf, h31);
  59 -    fprintf(outf, h32);
  60 +    fprintf(outf, "%s", h31);
  61 +    fprintf(outf, "%s", h32);
  62
  63      for (i = 0; i < nGlyphs; i++) {
  64          fprintf(outf, h33, i);
  65 @@ -2113,14 +2113,14 @@
  66          }
  67          if (n > 0) fprintf(outf, "\tfill\n");     /* if glyph is not a whitespace character */
  68
  69 -        fprintf(outf, h34);
  70 +        fprintf(outf, "%s", h34);
  71
  72          free(pa);
  73          free(path);
  74      }
  75 -    fprintf(outf, h35);
  76 +    fprintf(outf, "%s", h35);
  77
  78 -    fprintf(outf, h40);
  79 +    fprintf(outf, "%s", h40);
  80      fprintf(outf, h41, fname);
  81
  82      return SF_OK;
  83 --- vcl/unx/source/plugadapt/salplug.cxx        2009-01-19 14:31:36.000000000 -0500
  84 +++ vcl/unx/source/plugadapt/salplug.cxx        2009-01-13 14:13:28.000000000 -0500
  85 @@ -543,7 +543,7 @@
  86         if( !rErrorText.Len() )
  87                 std::fprintf( stderr, "Application Error" );
  88         else
  89 -               std::fprintf( stderr, ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
  90 +               std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
  91         abort();
  92  }
  93
  94 --- svtools/bmpmaker/bmp.cxx    2008-04-10 14:09:34.000000000 -0400
  95 +++ svtools/bmpmaker/bmp.cxx    2009-01-15 15:59:42.000000000 -0500
  96 @@ -159,7 +159,7 @@
  97
  98         ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
  99         aText.Append( "\r\n" );
 100 -       fprintf( stderr, aText.GetBuffer() );
 101 +       fprintf( stderr, "%s", aText.GetBuffer() );
 102  }
 103
 104  // -----------------------------------------------------------------------------
 105 --- svtools/bmpmaker/g2g.cxx    2008-04-10 14:12:19.000000000 -0400
 106 +++ svtools/bmpmaker/g2g.cxx    2009-01-15 16:05:10.000000000 -0500
 107 @@ -128,7 +128,7 @@
 108
 109         ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
 110         aText.Append( "\r\n" );
 111 -       fprintf( stderr, aText.GetBuffer() );
 112 +       fprintf( stderr, "%s", aText.GetBuffer() );
 113  }
 114
 115  // -----------------------------------------------------------------------------
 116 --- svtools/bmpmaker/bmpsum.cxx 2008-04-10 14:11:57.000000000 -0400
 117 +++ svtools/bmpmaker/bmpsum.cxx 2009-01-15 16:08:59.000000000 -0500
 118 @@ -171,7 +171,7 @@
 119
 120         ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
 121         aText.Append( "\r\n" );
 122 -       fprintf( stderr, aText.GetBuffer() );
 123 +       fprintf( stderr, "%s", aText.GetBuffer() );
 124  }
 125
 126  // -----------------------------------------------------------------------------
 127 --- extensions/source/logging/consolehandler.cxx        2008-04-11 05:59:54.000000000 -0400
 128 +++ extensions/source/logging/consolehandler.cxx        2009-01-16 05:53:56.000000000 -0500
 129 @@ -252,9 +252,9 @@
 130              return sal_False;
 131
 132          if ( _rRecord.Level >= m_nThreshold )
 133 -            fprintf( stderr, sEntry.getStr() );
 134 +            fprintf( stderr, "%s", sEntry.getStr() );
 135          else
 136 -            fprintf( stdout, sEntry.getStr() );
 137 +            fprintf( stdout, "%s", sEntry.getStr() );
 138
 139          return sal_True;
 140      }
 141 --- cpputools/source/unoexe/unoexe.cxx  2008-04-11 07:50:01.000000000 -0400
 142 +++ cpputools/source/unoexe/unoexe.cxx  2009-01-15 14:21:29.000000000 -0500
 143 @@ -134,7 +134,7 @@
 144  static inline void out( const sal_Char * pText )
 145  {
 146      if (! s_quiet)
 147 -        fprintf( stderr, pText );
 148 +        fprintf( stderr, "%s", pText );
 149  }
 150  //--------------------------------------------------------------------------------------------------
 151  static inline void out( const OUString & rText )
 152 @@ -142,7 +142,7 @@
 153      if (! s_quiet)
 154      {
 155          OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
 156 -        fprintf( stderr, aText.getStr() );
 157 +        fprintf( stderr, "%s", aText.getStr() );
 158      }
 159  }
 160
 161 --- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-20 10:40:09.000000000 -0500
 162 +++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx      2009-01-20 17:43:26.000000000 -0500
 163 @@ -1061,7 +1061,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
 164                                  GTK_DIALOG_MODAL,
 165                                                                 GTK_MESSAGE_QUESTION,
 166                                                                 GTK_BUTTONS_YES_NO,
 167 -                                  OUStringToOString(
 168 +                                  "\"%s\"", OUStringToOString(
 169                                      aResProvider.getResString( FILE_PICKER_OVERWRITE ),
 170                                      RTL_TEXTENCODING_UTF8 ).getStr() );
 171
 172 diff -p -up ./icc/mdv-fmtargs-buildfix.patch.orig0 ./icc/mdv-fmtargs-buildfix.patch
 173 --- /dev/null     2009-01-20 13:40:58.000000000 -0500
 174 +++ icc/mdv-fmtargs-buildfix.patch    2009-01-20 13:37:59.000000000 -0500
 175 @@ -0,0 +1,21 @@
 176 +--- IccProfLib/IccProfile.cpp  2009-01-20 11:48:36.000000000 -0500
 177 ++++ IccProfile.cpp     2009-01-19 14:41:23.000000000 -0500
 178 +@@ -1155,7 +1155,7 @@
 179 +
 180 +   CIccInfo Info;
 181 +   icChar buf[128];
 182 +-  sprintf(buf, Info.GetSigName(m_Header.deviceClass));
 183 ++  sprintf(buf, "%s", Info.GetSigName(m_Header.deviceClass));
 184 +   if (m_Header.deviceClass!=icSigInputClass && m_Header.deviceClass!=icSigDisplayClass) {
 185 +     if (GetTag(icSigGrayTRCTag) || GetTag(icSigRedTRCTag) || GetTag(icSigGreenTRCTag) ||
 186 +        GetTag(icSigBlueTRCTag) || GetTag(icSigRedColorantTag) || GetTag(icSigGreenColorantTag) ||
 187 +@@ -1230,7 +1230,7 @@
 188 +   for (i=m_Tags->begin(); i!=m_Tags->end(); i++) {
 189 +     tagsig = i->TagInfo.sig;
 190 +     typesig = i->pTag->GetType();
 191 +-    sprintf(buf, Info.GetSigName(tagsig));
 192 ++    sprintf(buf, "%s", Info.GetSigName(tagsig));
 193 +     if (!IsTypeValid(tagsig, typesig)) {
 194 +       sReport += icValidateNonCompliantMsg;
 195 +       sReport += buf;
 196 +
 197 diff -p -up icc/makefile.mk.orig0 ./icc/makefile.mk.
 198 diff: icc/makefile.mk.: Arquivo ou diretório não encontrado
 199 [cabral@build1 ooo300-m14]$ gendiff . .orig0
 200 diff -p -up ./icc/makefile.mk.orig0 ./icc/makefile.mk
 201 --- icc/makefile.mk.orig0     2009-01-20 15:42:20.000000000 -0500
 202 +++ icc/makefile.mk   2009-01-20 15:42:49.000000000 -0500
 203 @@ -54,7 +54,7 @@ CONVERTFILES= \
 204         Contrib$/ICC_utils$/Stubs.h \
 205         Contrib$/ICC_utils$/Vetters.cpp
 206
 207 -CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip
 208 +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
 209  BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
 210
 211  # --- Targets ------------------------------------------------------