package/x11/wxwidgets24/freetype.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../wxwidgets24/freetype.patch
   5 # Copyright (C) 2007 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- wxPythonSrc-2.4.2.4/src/generic/dcpsg.cpp_orig      2007-03-16 11:14:45.000000000 +0100
  18 +++ wxPythonSrc-2.4.2.4/src/generic/dcpsg.cpp   2007-03-16 11:14:55.000000000 +0100
  19 @@ -1146,8 +1146,13 @@
  20    FILE *file;
  21  };
  22
  23 +#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
  24 +static int paps_move_to( const FT_Vector* to,
  25 +                        void *user_data)
  26 +#else
  27  static int paps_move_to( FT_Vector* to,
  28                          void *user_data)
  29 +#endif
  30  {
  31    OutlineInfo *outline_info = (OutlineInfo*)user_data;
  32    fprintf(outline_info->file, "%d %d moveto\n",
  33 @@ -1156,8 +1161,13 @@
  34    return 0;
  35  }
  36
  37 +#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
  38 +static int paps_line_to( const FT_Vector*  to,
  39 +                        void *user_data)
  40 +#else
  41  static int paps_line_to( FT_Vector*  to,
  42                          void *user_data)
  43 +#endif
  44  {
  45    OutlineInfo *outline_info = (OutlineInfo*)user_data;
  46    fprintf(outline_info->file, "%d %d lineto\n",
  47 @@ -1166,9 +1176,15 @@
  48    return 0;
  49  }
  50
  51 +#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
  52 +static int paps_conic_to( const FT_Vector*  control,
  53 +                         const FT_Vector*  to,
  54 +                         void *user_data)
  55 +#else
  56  static int paps_conic_to( FT_Vector*  control,
  57                           FT_Vector*  to,
  58                           void *user_data)
  59 +#endif
  60  {
  61    OutlineInfo *outline_info = (OutlineInfo*)user_data;
  62    fprintf(outline_info->file, "%d %d %d %d conicto\n",
  63 @@ -1179,10 +1195,17 @@
  64    return 0;
  65  }
  66
  67 +#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
  68 +static int paps_cubic_to( const FT_Vector*  control1,
  69 +                         const FT_Vector*  control2,
  70 +                         const FT_Vector*  to,
  71 +                         void *user_data)
  72 +#else
  73  static int paps_cubic_to( FT_Vector*  control1,
  74                           FT_Vector*  control2,
  75                           FT_Vector*  to,
  76                           void *user_data)
  77 +#endif
  78  {
  79    OutlineInfo *outline_info = (OutlineInfo*)user_data;
  80    fprintf(outline_info->file,