From c63801bd14a3ad1508c8683860f461fe3b4a9873 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 1 Mar 2005 20:48:51 +0000 Subject: Build fixes from Andrew P. Lentvorski, Jr, #164655 2005-03-01 Owen Taylor Build fixes from Andrew P. Lentvorski, Jr, #164655 * pango/pangoft2-render.c: Duplicate the FT_LOAD_TARGET_MONO/FT_LOAD_MONOCHROME back-compat define from pangoft2.c here * examples/Makefile.am (pango_xftview_LDADD): Add X_LIBS to pango_xftview_LDADD since some old versions of xft.pc didn't add -lX11. --- ChangeLog | 14 +++++++++++++- ChangeLog.pre-1-10 | 14 +++++++++++++- examples/Makefile.am | 3 ++- pango/pangoft2-render.c | 5 +++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3630ec4..e25b6e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2005-03-01 Owen Taylor - + + Build fixes from Andrew P. Lentvorski, Jr, #164655 + + * pango/pangoft2-render.c: Duplicate the + FT_LOAD_TARGET_MONO/FT_LOAD_MONOCHROME back-compat + define from pangoft2.c here + + * examples/Makefile.am (pango_xftview_LDADD): Add + X_LIBS to pango_xftview_LDADD since some old versions + of xft.pc didn't add -lX11. + +2005-03-01 Owen Taylor + * configure.in: Use PKG_CHECK_MODULES not AM_PATH_GLIB_2_0 to avoid a problem where older verisons of AM_PATH_GLIB_2_0 silently ignored gmodule-no-export causing mysterious diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c3630ec4..e25b6e1f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,17 @@ 2005-03-01 Owen Taylor - + + Build fixes from Andrew P. Lentvorski, Jr, #164655 + + * pango/pangoft2-render.c: Duplicate the + FT_LOAD_TARGET_MONO/FT_LOAD_MONOCHROME back-compat + define from pangoft2.c here + + * examples/Makefile.am (pango_xftview_LDADD): Add + X_LIBS to pango_xftview_LDADD since some old versions + of xft.pc didn't add -lX11. + +2005-03-01 Owen Taylor + * configure.in: Use PKG_CHECK_MODULES not AM_PATH_GLIB_2_0 to avoid a problem where older verisons of AM_PATH_GLIB_2_0 silently ignored gmodule-no-export causing mysterious diff --git a/examples/Makefile.am b/examples/Makefile.am index dce8b604..f655b45f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -50,7 +50,8 @@ pango_xftview_LDADD = \ ../pango/libpango-$(PANGO_API_VERSION).la \ ../pango/libpangoft2-$(PANGO_API_VERSION).la \ ../pango/libpangoxft-$(PANGO_API_VERSION).la \ - $(XFT_LIBS) + $(XFT_LIBS) \ + $(X_LIBS) ################################################### ################################################### diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c index b716c0aa..49908ca5 100644 --- a/pango/pangoft2-render.c +++ b/pango/pangoft2-render.c @@ -24,6 +24,11 @@ #include "pangoft2-private.h" +/* for compatibility with older freetype versions */ +#ifndef FT_LOAD_TARGET_MONO +#define FT_LOAD_TARGET_MONO FT_LOAD_MONOCHROME +#endif + typedef struct _PangoFT2RendererClass PangoFT2RendererClass; #define PANGO_FT2_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FT2_RENDERER, PangoFT2RendererClass)) -- cgit v1.2.1