[PATCH:libXfont-1.4 v2] Require fontsproto < 2.1.3 for matching function prototypes

Alan Coopersmith alan.coopersmith at oracle.com
Mon Apr 21 07:31:59 PDT 2014


Building libXfont-1.4.x against fontsproto 2.1.3 causes clang
complaints of:

patcache.c:130:1: error: conflicting types for 'CacheFontPattern'
CacheFontPattern (FontPatternCachePtr cache,
^
patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern'
FindCachedFontPattern (FontPatternCachePtr cache,
^

due to the constification of arguments not matching.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---

 Oops, sent wrong patch before.

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index cbb540a..4979c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ fi
 AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
 AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
 
-PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc)
+PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto < 2.1.3 fontenc])
 
 # Transport selection macro from xtrans.m4
 XTRANS_CONNECTION_FLAGS
-- 
1.7.9.2



More information about the xorg-devel mailing list