ChangeLog addition: 2007-12-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; * configure.ac : Check for FcConfigGetRescanInterval, FcConfigSetRescanInterval. src/ChangeLog addition: 2007-12-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; * config.h.in: Make the results of the checks for FcConfigGetRescanInterval, FcConfigSetRescanInterval available. * font-mgr.h: If FcConfigSetRescanInterval and FcConfigGetRescanInterval are not available as functions, #define them to map to their old misspelled names. * font-mgr.c (Ffc_config_get_rescan_interval): * font-mgr.c (Ffc_config_set_rescan_interval): Use the correct spelling in FcConfigGetRescanInterval, FcConfigSetRescanInterval XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/font-mgr.c =================================================================== RCS src/config.h.in =================================================================== RCS src/font-mgr.h =================================================================== RCS configure.ac =================================================================== RCS Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.62 diff -u -r1.62 configure.ac --- configure.ac 2007/08/29 06:19:54 1.62 +++ configure.ac 2007/12/12 10:33:19 ＠＠ -3532,6 +3532,9 ＠＠ [XE_DIE(["Unable to find libfontconfig for --with-xft"])]) AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x), [XE_DIE(["Unable to find libXft for --with-xft"])]) + + AC_CHECK_FUNCS(FcConfigGetRescanInterval) + AC_CHECK_FUNCS(FcConfigSetRescanInterval) dnl #### detect fontconfig properly!!!! with_fontconfig=yes AC_DEFINE(HAVE_FONTCONFIG) Index: src/font-mgr.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/font-mgr.h,v retrieving revision 1.6 diff -u -r1.6 font-mgr.h --- src/font-mgr.h 2007/04/30 16:46:36 1.6 +++ src/font-mgr.h 2007/12/12 10:33:19 ＠＠ -90,6 +90,17 ＠＠ #endif /* FONTCONFIG_EXPOSE_CONFIG */ #ifdef USE_XFT + +#ifndef HAVE_FCCONFIGGETRESCANINTERVAL +/* Older fontconfig versions misspell this function name. */ +#define FcConfigGetRescanInterval FcConfigGetRescanInverval +#endif /* */ + +#ifndef HAVE_FCCONFIGSETRESCANINTERVAL +/* Older fontconfig versions misspell this function name. */ +#define FcConfigSetRescanInterval FcConfigSetRescanInverval +#endif /* */ + /* The format of a fontname (as returned by fontconfig) is not well-documented, But the character repertoire is represented in an ASCII-compatible way. See Index: src/config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.112 diff -u -r1.112 config.h.in --- src/config.h.in 2007/05/17 15:42:48 1.112 +++ src/config.h.in 2007/12/12 10:33:20 ＠＠ -209,6 +209,14 ＠＠ /* Compile with support for fontconfig? */ #undef HAVE_FONTCONFIG +/* Was the spelling of FcConfigGetRescanInterval corrected in this + fontconfig version? */ +#undef HAVE_FCCONFIGGETRESCANINTERVAL + +/* Was the spelling of FcConfigSetRescanInterval corrected in this + fontconfig version? */ +#undef HAVE_FCCONFIGSETRESCANINTERVAL + /* Compile with support for Xft? */ #undef USE_XFT /* Per-widget stuff will go away? */ Index: src/font-mgr.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/font-mgr.c,v retrieving revision 1.7 diff -u -r1.7 font-mgr.c --- src/font-mgr.c 2007/05/01 14:22:38 1.7 +++ src/font-mgr.c 2007/12/12 10:33:20 ＠＠ -898,10 +898,8 ＠＠ intern ("fc-config-get-blanks")); } -/* The misspelling in the fontconfig function name accurately corresponds to - the version of fontconfig.h I had on 2007-04-13. -- sjt */ DEFUN("fc-config-get-rescan-interval", Ffc_config_get_rescan_interval, 1, 1, 0, /* - -- Function: int FcConfigGetRescanInverval (FcConfig *config) + -- Function: int FcConfigGetRescanInterval (FcConfig *config) Returns the interval between automatic checks of the configuration (in seconds) specified in 'config'. The configuration is checked during a call to FcFontList when this interval has passed since ＠＠ -909,13 +907,11 ＠＠ (config)) { CHECK_FCCONFIG (config); - return make_int (FcConfigGetRescanInverval (XFCCONFIG_PTR (config))); + return make_int (FcConfigGetRescanInterval (XFCCONFIG_PTR (config))); } -/* The misspelling in the fontconfig function name accurately corresponds to - the version of fontconfig.h I had on 2007-04-13. -- sjt */ DEFUN("fc-config-set-rescan-interval", Ffc_config_set_rescan_interval, 2, 2, 0, /* - -- Function: FcBool FcConfigSetRescanInverval (FcConfig *config, int + -- Function: FcBool FcConfigSetRescanInterval (FcConfig *config, int rescanInterval) Sets the rescan interval; returns FcFalse if an error occurred. XEmacs: signal such error, or return nil on success. */ ＠＠ -923,7 +919,7 ＠＠ { CHECK_FCCONFIG (config); CHECK_INT (rescan_interval); - if (FcConfigSetRescanInverval (XFCCONFIG_PTR (config), + if (FcConfigSetRescanInterval (XFCCONFIG_PTR (config), XINT (rescan_interval)) == FcFalse) signal_error (Qio_error, "FcConfigSetRescanInverval barfed", intern ("fc-config-set-rescan-interval")); -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches