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