diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-01 20:48:37 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-01 20:48:37 +0000 |
| commit | 4b092ae98111aa6c74d8fa21ed4e42cd46fa6f7a (patch) | |
| tree | 2251f44321cbf83a2543dfc6b15b51773913ffab | |
| parent | 97d609b5bfea75944ef1c4b65ea1fd4048c4b5cd (diff) | |
| download | pango-4b092ae98111aa6c74d8fa21ed4e42cd46fa6f7a.tar.gz | |
Build fixes from Andrew P. Lentvorski, Jr, #164655
2005-03-01 Owen Taylor <otaylor@redhat.com>
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.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 12 | ||||
| -rw-r--r-- | examples/Makefile.am | 3 | ||||
| -rw-r--r-- | pango/pangoft2-render.c | 5 |
4 files changed, 31 insertions, 1 deletions
@@ -1,5 +1,17 @@ 2005-03-01 Owen Taylor <otaylor@redhat.com> + 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 <otaylor@redhat.com> + * 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 aa92b9c8..381ecd6d 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,17 @@ 2005-03-01 Owen Taylor <otaylor@redhat.com> + 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 <otaylor@redhat.com> + * 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 a5a87214..252d289b 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) ################################################### if CROSS_COMPILING 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)) |