diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-01-16 10:40:06 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-01-16 10:40:06 +0000 |
| commit | 3d70804d1ce40c5d785938e4b82e3757e9a2c2ce (patch) | |
| tree | c90cb7f7f06c94f499012544e38a737618a79831 | |
| parent | f59d1523c0d95a08fd3cf28f946a3e628a5ac0f5 (diff) | |
| download | pango-3d70804d1ce40c5d785938e4b82e3757e9a2c2ce.tar.gz | |
Fixes bug #314675, Brian Cameron.
2006-01-16 Behdad Esfahbod <behdad@gnome.org>
Fixes bug #314675, Brian Cameron.
* configure.in: Handle uninstalled cairo.
* pangocairo-uninstalled.pc.in: Fix typo: libpangoxft->libpangocairo.
2006-01-16 Behdad Esfahbod <behdad@gnome.org>
* modules/indic/mprefixups.c (indic_mprefixups_apply): Remove unused
variable clusterSave that was leaking too. (bug #316466, Steve Grubbs)
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | modules/indic/mprefixups.c | 2 | ||||
| -rw-r--r-- | pangocairo-uninstalled.pc.in | 2 |
4 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,16 @@ +2006-01-16 Behdad Esfahbod <behdad@gnome.org> + + Fixes bug #314675, Brian Cameron. + + * configure.in: Handle uninstalled cairo. + + * pangocairo-uninstalled.pc.in: Fix typo: libpangoxft->libpangocairo. + +2006-01-16 Behdad Esfahbod <behdad@gnome.org> + + * modules/indic/mprefixups.c (indic_mprefixups_apply): Remove unused + variable clusterSave that was leaking too. (bug #316466, Steve Grubbs) + 2006-01-14 Behdad Esfahbod <behdad@gnome.org> * pango/pango-utils.h (pango_is_zero_width): Move G_GNUC_CONST to diff --git a/configure.in b/configure.in index 10eabecb..65375bd2 100644 --- a/configure.in +++ b/configure.in @@ -281,7 +281,9 @@ PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.2-head, have_cairo=true, :) if $have_cairo ; then pango_save_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS $CAIRO_LIBS" + m4_pattern_allow([PKG_CONFIG_DISABLE_UNINSTALLED]) + INSTALLED_CAIRO_LIBS=`PKG_CONFIG_DISABLE_UNINSTALLED=yes $PKG_CONFIG --libs cairo` + LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS" AC_CHECK_LIB(cairo, cairo_win32_scaled_font_select_font, have_cairo_win32=true, :) if $have_cairo_win32 && $have_win32; then AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo uses the Win32 GDI for fonts]) diff --git a/modules/indic/mprefixups.c b/modules/indic/mprefixups.c index a3a3d018..ab9de5ac 100644 --- a/modules/indic/mprefixups.c +++ b/modules/indic/mprefixups.c @@ -74,7 +74,6 @@ void indic_mprefixups_apply(MPreFixups *mprefixups, PangoOTBuffer *buffer) PangoOTGlyph *glyphs; int n_glyphs; PangoOTGlyph *mpreSave; - int *clusterSave; /* determine post GSUB location of baseIndex and mpreIndex */ @@ -98,7 +97,6 @@ void indic_mprefixups_apply(MPreFixups *mprefixups, PangoOTBuffer *buffer) mpreDest = baseGlyph - mpreCount; mpreSave = g_new (PangoOTGlyph, mpreCount); - clusterSave = g_new (int, mpreCount); for (i = 0; i < mpreCount; i += 1) { mpreSave[i] = glyphs[mpreGlyph + i]; diff --git a/pangocairo-uninstalled.pc.in b/pangocairo-uninstalled.pc.in index 0c5efbce..0f33669c 100644 --- a/pangocairo-uninstalled.pc.in +++ b/pangocairo-uninstalled.pc.in @@ -2,6 +2,6 @@ Name: Pango Cairo Uninstalled Description: Cairo rendering support for Pango, Not Installed Version: @VERSION@ Requires: pango cairo @PKGCONFIG_CAIRO_REQUIRES@ -Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @PKGCONFIG_CAIRO_LIBS@ +Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangocairo-@PANGO_API_VERSION@.la @PKGCONFIG_CAIRO_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @CAIRO_CFLAGS@ |