fontconfig required version

fontconfig required version

[Emanuele Giaquinta]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

Hi,

The attached patch bumps the fontconfig required version to 2.2.0
because ftfont.c uses the FC_WIDTH / FC_WEIGHT_REGULAR macros which
are available since 2.2.0 [1].

Emanuele Giaquinta

[1] http://gitweb.freedesktop.org/?p=fontconfig;a=commit;h=81fa16c3366a701255f4e52cdfd716dd06253748

[-- Attachment #2: configure-fontconfig.diff --]
[-- Type: text/x-diff, Size: 712 bytes --]

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.511
diff -u -r1.511 configure.in
--- configure.in	9 Feb 2008 18:03:10 -0000	1.511
+++ configure.in	21 Feb 2008 12:13:17 -0000
@@ -2039,7 +2039,7 @@
 
   PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
   if test "${HAVE_FREETYPE}" = "yes"; then
-    PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FC=yes, HAVE_FC=no)
+    PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
     if test "${HAVE_FC}" = "no"; then
       dnl Witout fontconfig, we can't use freetype at the moment.
       HAVE_FREETYPE=no

Re: fontconfig required version

[Emanuele Giaquinta]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

I didn't notice that the check is done only when xft is not available,
but it should be done regardless since ftfont.c is used in both cases.
Attached patch should be better.

[-- Attachment #2: configure-fontconfig.diff --]
[-- Type: text/x-diff, Size: 1017 bytes --]

--- configure.in.~1.511~	2008-02-21 13:48:06.000000000 +0100
+++ configure.in	2008-02-21 13:51:00.000000000 +0100
@@ -2025,9 +2025,11 @@
 fi
 
 
-HAVE_FREETYPE=no
+PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
+if test "${HAVE_FC}" = "no"; then
+  HAVE_FREETYPE=no
 ### Use -lfreetype if available, unless `--with-freetype=no'.
-if test "${HAVE_XFT}" = "yes"; then
+elif test "${HAVE_XFT}" = "yes"; then
   dnl As we use Xft, we anyway use freetype.
   dnl In this case, there's no need of additional CFLAGS and LIBS.
   HAVE_FREETYPE=yes
@@ -2038,13 +2040,6 @@
   fi
 
   PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
-  if test "${HAVE_FREETYPE}" = "yes"; then
-    PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FC=yes, HAVE_FC=no)
-    if test "${HAVE_FC}" = "no"; then
-      dnl Witout fontconfig, we can't use freetype at the moment.
-      HAVE_FREETYPE=no
-    fi
-  fi
 fi
 
 HAVE_LIBOTF=no


Diffs between working revision and workfile end here.