|
|
|
|
Index: pango/opentype/pango-ot-private.h
|
|
|
|
|
--- pango/opentype/pango-ot-private.h.orig 2000-12-20 05:41:36.000000000 +0100
|
|
|
|
|
+++ pango/opentype/pango-ot-private.h 2003-11-16 12:23:42.000000000 +0100
|
|
|
|
|
@@ -22,7 +22,8 @@
|
|
|
|
|
#ifndef __PANGO_OT_PRIVATE_H__
|
|
|
|
|
#define __PANGO_OT_PRIVATE_H__
|
|
|
|
|
|
|
|
|
|
-#include <freetype/freetype.h>
|
|
|
|
|
+#include <ft2build.h>
|
|
|
|
|
+#include FT_FREETYPE_H
|
|
|
|
|
|
|
|
|
|
#include <glib-object.h>
|
|
|
|
|
|
|
|
|
|
Index: pango/opentype/pango-ot-info.c
|
|
|
|
|
--- pango/opentype/pango-ot-info.c.orig 2003-09-15 23:06:04.000000000 +0200
|
|
|
|
|
+++ pango/opentype/pango-ot-info.c 2003-11-16 12:23:42.000000000 +0100
|
|
|
|
|
@@ -22,7 +22,7 @@
|
|
|
|
|
#include "pango-ot-private.h"
|
|
|
|
|
#include "fterrcompat.h"
|
|
|
|
|
#include <freetype/internal/ftobjs.h>
|
|
|
|
|
-#include <freetype/ftmodule.h>
|
|
|
|
|
+#include <freetype/ftmodapi.h>
|
|
|
|
|
|
|
|
|
|
static void pango_ot_info_class_init (GObjectClass *object_class);
|
|
|
|
|
static void pango_ot_info_finalize (GObject *object);
|
|
|
|
|
Index: pango/pango-ot.h
|
|
|
|
|
--- pango/pango-ot.h.orig 2003-08-25 16:10:25.000000000 +0200
|
|
|
|
|
+++ pango/pango-ot.h 2003-11-16 12:23:42.000000000 +0100
|
|
|
|
|
@@ -22,7 +22,8 @@
|
|
|
|
|
#ifndef __PANGO_OT_H__
|
|
|
|
|
#define __PANGO_OT_H__
|
|
|
|
|
|
|
|
|
|
-#include <freetype/freetype.h>
|
|
|
|
|
+#include <ft2build.h>
|
|
|
|
|
+#include FT_FREETYPE_H
|
|
|
|
|
#include <pango/pango-glyph.h>
|
|
|
|
|
|
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
|
Index: pango/pangoft2.c
|
|
|
|
|
--- pango/pangoft2.c.orig 2003-08-08 19:02:22.000000000 +0200
|
|
|
|
|
+++ pango/pangoft2.c 2003-11-16 12:23:42.000000000 +0100
|
|
|
|
|
@@ -28,7 +28,8 @@
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
#include <glib/gprintf.h>
|
|
|
|
|
|
|
|
|
|
-#include <freetype/freetype.h>
|
|
|
|
|
+#include <ft2build.h>
|
|
|
|
|
+#include FT_FREETYPE_H
|
|
|
|
|
|
|
|
|
|
#include "pangoft2.h"
|
|
|
|
|
#include "pangoft2-private.h"
|
|
|
|
|
Index: examples/Makefile.in
|
|
|
|
|
--- examples/Makefile.in.orig 2003-10-24 05:43:19.000000000 +0200
|
|
|
|
|
+++ examples/Makefile.in 2003-11-16 12:23:42.000000000 +0100
|
|
|
|
|
@@ -254,6 +254,7 @@
|
|
|
|
|
|
|
|
|
|
pangoft2topgm_LDADD = \
|
|
|
|
|
../pango/libpango-$(PANGO_API_VERSION).la \
|
|
|
|
|
+ ../pango/libpangox-$(PANGO_API_VERSION).la \
|
|
|
|
|
../pango/libpangoft2-$(PANGO_API_VERSION).la \
|
|
|
|
|
$(FREETYPE_LIBS)
|
|
|
|
|
|
|
|
|
|
Index: pango.pc.in
|
|
|
|
|
--- pango.pc.in.orig 2003-07-24 21:36:50.000000000 +0200
|
|
|
|
|
+++ pango.pc.in 2003-11-16 12:24:12.000000000 +0100
|
|
|
|
|
@@ -10,5 +10,5 @@
|
|
|
|
|
Version: @VERSION@
|
|
|
|
|
Requires: glib-2.0,gobject-2.0,gmodule-2.0
|
|
|
|
|
Libs: -L${libdir} -lpango-@PANGO_API_VERSION@
|
|
|
|
|
-Cflags: -I${includedir}/pango-1.0
|
|
|
|
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir}
|
|
|
|
|
|
|
|
|
|
Index: pangoft2.pc.in
|
|
|
|
|
--- pangoft2.pc.in.orig 2002-06-06 21:28:19.000000000 +0200
|
|
|
|
|
+++ pangoft2.pc.in 2003-11-16 12:24:19.000000000 +0100
|
|
|
|
|
@@ -8,5 +8,5 @@
|
|
|
|
|
Version: @VERSION@
|
|
|
|
|
Requires: pango
|
|
|
|
|
Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
|
|
|
|
|
-Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
|
|
|
|
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
|
|
|
|
|
|
|
|
|
|
Index: pangox.pc.in
|
|
|
|
|
--- pangox.pc.in.orig 2002-03-05 18:20:57.000000000 +0100
|
|
|
|
|
+++ pangox.pc.in 2003-11-16 12:24:29.000000000 +0100
|
|
|
|
|
@@ -8,5 +8,5 @@
|
|
|
|
|
Version: @VERSION@
|
|
|
|
|
Requires: pango
|
|
|
|
|
Libs: -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@
|
|
|
|
|
-Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@
|
|
|
|
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @X_CFLAGS@
|
|
|
|
|
|
|
|
|
|
Index: pangoxft.pc.in
|
|
|
|
|
--- pangoxft.pc.in.orig 2002-06-04 18:14:16.000000000 +0200
|
|
|
|
|
+++ pangoxft.pc.in 2003-11-16 12:24:34.000000000 +0100
|
|
|
|
|
@@ -8,4 +8,4 @@
|
|
|
|
|
Version: @VERSION@
|
|
|
|
|
Requires: pango
|
|
|
|
|
Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
|
|
|
|
|
-Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
|
|
|
|
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @XFT_CFLAGS@
|
|
|
|
|
Index: pango/Makefile.in
|
|
|
|
|
--- pango/Makefile.in.orig 2003-10-24 05:56:54.000000000 +0200
|
|
|
|
|
+++ pango/Makefile.in 2003-11-16 12:28:00.000000000 +0100
|
|
|
|
|
@@ -274,7 +274,7 @@
|
|
|
|
|
|
|
|
|
|
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c
|
|
|
|
|
|
|
|
|
|
-pangoincludedir = $(includedir)/pango-1.0/pango
|
|
|
|
|
+pangoincludedir = $(includedir)/pango-1.0
|
|
|
|
|
|
|
|
|
|
@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
|
|
|
|
|
|
