grim/guifications2

added a version check wrapper around deprecated api

2013-01-16, Gary Kramlich
e29a2a0afc69
Parents 687fb7edee45
Children 1b5432ae2861
added a version check wrapper around deprecated api
2 files changed, 13 insertions(+), 3 deletions(-)
  • +7 -2
    INSTALL
  • +6 -1
    src/gf_item_text.c
    • --- a/INSTALL Tue Jan 17 19:09:55 2012 -0600
    +++ b/INSTALL Wed Jan 16 22:18:55 2013 -0600
    @@ -1,8 +1,8 @@
    Installation Instructions
    *************************
    -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
    -2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
    +Inc.
    Copying and distribution of this file, with or without modification,
    are permitted in any medium without royalty provided the copyright
    @@ -226,6 +226,11 @@
    and if that doesn't work, install pre-built binaries of GCC for HP-UX.
    + HP-UX `make' updates targets which have the same time stamps as
    +their prerequisites, which makes it generally unusable when shipped
    +generated files such as `configure' are involved. Use GNU `make'
    +instead.
    +
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
    parse its `<wchar.h>' header file. The option `-nodtk' can be used as
    a workaround. If GNU CC is not installed, it is therefore recommended
    --- a/src/gf_item_text.c Tue Jan 17 19:09:55 2012 -0600
    +++ b/src/gf_item_text.c Wed Jan 16 22:18:55 2013 -0600
    @@ -113,7 +113,12 @@
    # endif
    pango_ft2_font_map_set_resolution(PANGO_FT2_FONT_MAP(map), xdpi, ydpi);
    #endif
    +
    +#if PANGO_VERSION_CHECK(1,22,0)
    + context = pango_font_map_create_context(map);
    +#else
    context = pango_ft2_font_map_create_context(PANGO_FT2_FONT_MAP(map));
    +#endif
    }
    void
    @@ -124,7 +129,7 @@
    g_object_unref(G_OBJECT(context));
    }
    -/*******************************************************************************
    +/*******************************************************************************
    * API
    ******************************************************************************/
    void