pango-freetype-includes.patch

   1 --- pango-1.2.5/pango/opentype/ftxopen.c.orig   2003-08-08 19:05:10.000000000 +0200
   2 +++ pango-1.2.5/pango/opentype/ftxopen.c        2003-12-22 22:57:33.266995840 +0100
   3 @@ -15,9 +15,10 @@
   4   *
   5   ******************************************************************/
   6
   7 -#include <freetype/internal/ftstream.h>
   8 -#include <freetype/internal/ftmemory.h>
   9 -#include <freetype/internal/tttypes.h>
  10 +#include <ft2build.h>
  11 +#include FT_INTERNAL_STREAM_H
  12 +#include FT_INTERNAL_MEMORY_H
  13 +#include FT_INTERNAL_TRUETYPE_TYPES_H
  14
  15  #include "fterrcompat.h"
  16
  17 --- pango-1.2.5/pango/opentype/ftxopen.h.orig   2003-08-08 19:05:10.000000000 +0200
  18 +++ pango-1.2.5/pango/opentype/ftxopen.h        2003-12-22 22:57:53.081983504 +0100
  19 @@ -22,7 +22,8 @@
  20  #ifndef FTXOPEN_H
  21  #define FTXOPEN_H
  22
  23 -#include <freetype/freetype.h>
  24 +#include <ft2build.h>
  25 +#include FT_FREETYPE_H
  26
  27  #ifdef __cplusplus
  28  extern "C" {
  29 --- pango-1.2.5/pango/opentype/ftxgdef.c.orig   2003-08-08 19:05:09.000000000 +0200
  30 +++ pango-1.2.5/pango/opentype/ftxgdef.c        2003-12-22 22:58:40.844722464 +0100
  31 @@ -15,11 +15,12 @@
  32   *
  33   ******************************************************************/
  34
  35 -#include <freetype/tttags.h>
  36 +#include <ft2build.h>
  37 +#include FT_TRUETYPE_TAGS_H
  38
  39 -#include <freetype/internal/ftstream.h>
  40 -#include <freetype/internal/ftmemory.h>
  41 -#include <freetype/internal/tttypes.h>
  42 +#include FT_INTERNAL_STREAM_H
  43 +#include FT_INTERNAL_MEMORY_H
  44 +#include FT_INTERNAL_TRUETYPE_TYPES_H
  45
  46  #include "fterrcompat.h"
  47
  48 --- pango-1.2.5/pango/opentype/ftxgpos.c.orig   2003-08-25 16:22:30.000000000 +0200
  49 +++ pango-1.2.5/pango/opentype/ftxgpos.c        2003-12-22 22:59:39.728770728 +0100
  50 @@ -23,11 +23,12 @@
  51
  52  #define TTAG_GPOS  FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
  53
  54 -#include <freetype/tttags.h>
  55 +#include <ft2build.h>
  56 +#include FT_TRUETYPE_TAGS_H
  57
  58 -#include <freetype/internal/ftstream.h>
  59 -#include <freetype/internal/ftmemory.h>
  60 -#include <freetype/internal/tttypes.h>
  61 +#include FT_INTERNAL_STREAM_H
  62 +#include FT_INTERNAL_MEMORY_H
  63 +#include FT_INTERNAL_TRUETYPE_TYPES_H
  64
  65  #include "fterrcompat.h"
  66
  67 --- pango-1.2.5/pango/opentype/ftxgsub.c.orig   2003-08-25 16:22:15.000000000 +0200
  68 +++ pango-1.2.5/pango/opentype/ftxgsub.c        2003-12-22 23:00:05.478856120 +0100
  69 @@ -23,11 +23,12 @@
  70
  71  #define EXPORT_FUNC
  72
  73 -#include <freetype/tttags.h>
  74 +#include <ft2build.h>
  75 +#include FT_TRUETYPE_TAGS_H
  76
  77 -#include <freetype/internal/ftstream.h>
  78 -#include <freetype/internal/ftmemory.h>
  79 -#include <freetype/internal/tttypes.h>
  80 +#include FT_INTERNAL_STREAM_H
  81 +#include FT_INTERNAL_MEMORY_H
  82 +#include FT_INTERNAL_TRUETYPE_TYPES_H
  83
  84  #include "fterrcompat.h"
  85
  86 --- pango-1.2.5/pango/opentype/pango-ot-info.c.orig     2003-04-16 23:48:20.000000000 +0200
  87 +++ pango-1.2.5/pango/opentype/pango-ot-info.c  2003-12-22 23:00:51.777817608 +0100
  88 @@ -21,8 +21,8 @@
  89
  90  #include "pango-ot-private.h"
  91  #include "fterrcompat.h"
  92 -#include <freetype/internal/ftobjs.h>
  93 -#include <freetype/ftmodule.h>
  94 +#include <ft2build.h>
  95 +#include FT_INTERNAL_OBJECTS_H
  96
  97  static void pango_ot_info_class_init (GObjectClass *object_class);
  98  static void pango_ot_info_finalize   (GObject *object);
  99 --- pango-1.2.5/pango/opentype/pango-ot-private.h.orig  2000-12-20 05:41:36.000000000 +0100
 100 +++ pango-1.2.5/pango/opentype/pango-ot-private.h       2003-12-22 23:01:09.436133136 +0100
 101 @@ -22,7 +22,8 @@
 102  #ifndef __PANGO_OT_PRIVATE_H__
 103  #define __PANGO_OT_PRIVATE_H__
 104
 105 -#include <freetype/freetype.h>
 106 +#include <ft2build.h>
 107 +#include FT_FREETYPE_H
 108
 109  #include <glib-object.h>
 110
 111 --- pango-1.2.5/pango/opentype/pango-ot-ruleset.c.orig  2003-07-24 23:04:13.000000000 +0200
 112 +++ pango-1.2.5/pango/opentype/pango-ot-ruleset.c       2003-12-22 23:01:32.846574208 +0100
 113 @@ -19,7 +19,8 @@
 114   * Boston, MA 02111-1307, USA.
 115   */
 116
 117 -#include <freetype/internal/ftmemory.h>
 118 +#include <ft2build.h>
 119 +#include FT_INTERNAL_MEMORY_H
 120
 121  #include <pango/pango-ot.h>
 122  #include "pango-ot-private.h"
 123 --- pango-1.2.5/pango/opentype/ottest.c.orig    2000-12-20 05:41:36.000000000 +0100
 124 +++ pango-1.2.5/pango/opentype/ottest.c 2003-12-22 23:01:51.878680888 +0100
 125 @@ -23,7 +23,8 @@
 126  #include <stdlib.h>
 127
 128  #include "ftxopen.h"
 129 -#include <freetype/internal/ftmemory.h>
 130 +#include <ft2build.h>
 131 +#include FT_INTERNAL_MEMORY_H
 132
 133  #include "disasm.h"
 134
 135 --- pango-1.2.5/pango/pangoft2.h.orig   2002-07-04 00:30:36.000000000 +0200
 136 +++ pango-1.2.5/pango/pangoft2.h        2003-12-22 22:54:03.820836496 +0100
 137 @@ -23,7 +23,8 @@
 138  #ifndef __PANGOFT2_H__
 139  #define __PANGOFT2_H__
 140
 141 -#include <freetype/freetype.h>
 142 +#include <ft2build.h>
 143 +#include FT_FREETYPE_H
 144
 145  #include <fontconfig/fontconfig.h>
 146
 147 --- pango-1.2.5/pango/pangoft2.c.orig   2003-08-08 19:05:05.000000000 +0200
 148 +++ pango-1.2.5/pango/pangoft2.c        2003-12-22 22:54:31.300658928 +0100
 149 @@ -28,7 +28,8 @@
 150  #include <glib.h>
 151  #include <glib/gprintf.h>
 152
 153 -#include <freetype/freetype.h>
 154 +#include <ft2build.h>
 155 +#include FT_FREETYPE_H
 156
 157  #include "pango-utils.h"
 158  #include "pangoft2.h"
 159 --- pango-1.2.5/pango/pango-ot.h.orig   2002-06-04 02:20:47.000000000 +0200
 160 +++ pango-1.2.5/pango/pango-ot.h        2003-12-22 22:54:48.915980992 +0100
 161 @@ -22,7 +22,8 @@
 162  #ifndef __PANGO_OT_H__
 163  #define __PANGO_OT_H__
 164
 165 -#include <freetype/freetype.h>
 166 +#include <ft2build.h>
 167 +#include FT_FREETYPE_H
 168  #include <pango/pango-glyph.h>
 169
 170  G_BEGIN_DECLS
 171 --- pango-1.2.5/modules/indic/indic-ot.h.orig   2003-08-08 19:05:01.000000000 +0200
 172 +++ pango-1.2.5/modules/indic/indic-ot.h        2003-12-22 22:53:40.826332192 +0100
 173 @@ -9,7 +9,8 @@
 174  #ifndef __INDIC_OT_H__
 175  #define __INDIC_OT_H__
 176
 177 -#include <freetype/freetype.h>
 178 +#include <ft2build.h>
 179 +#include FT_FREETYPE_H
 180  #include <pango/pango-glyph.h>
 181  #include <pango/pango-types.h>
 182  #include "mprefixups.h"