From 873965b49f283ad028dd4e0e5b7e93a758c84993 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 26 Sep 2011 17:04:30 +0200
Subject: fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011

---
 libXft/configure.ac    | 31 +------------------------------
 libXft/src/xftglyphs.c |  2 +-
 libXft/src/xftinit.c   |  2 +-
 3 files changed, 3 insertions(+), 32 deletions(-)

(limited to 'libXft')

diff --git a/libXft/configure.ac b/libXft/configure.ac
index 54d960fa0..8df0cb032 100644
--- a/libXft/configure.ac
+++ b/libXft/configure.ac
@@ -64,36 +64,7 @@ AC_SUBST([XFT_LT_VERSION])
 #
 # Check for Xrender
 #
-PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes],
-                  [xrender_found_with_pkgconfig=no])
-case "$xrender_found_with_pkgconfig" in
-no)
-	PKG_CHECK_MODULES(XRENDER, xrender >= 0, [old_xrender_found_with_pkgconfig=yes],
-			  [old_xrender_found_with_pkgconfig=no])
-	case "$old_xrender_found_with_pkgconfig" in
-	yes)
-		XRENDER_LIBS="$XRENDER_LIBS -lXext -lX11"
-		;;
-	*)
-	        # checks for X
-	        AC_PATH_X
-
-	        XRENDER_CFLAGS="-I$x_includes"
-	        XRENDER_LIBS="-L$x_libraries -lXrender -lXext -lX11"
-
-	        saved_CPPFLAGS="$CPPFLAGS"
-	        CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
-	        AC_CHECK_HEADERS([X11/extensions/Xrender.h], [], [AC_MSG_ERROR([Xrender.h not found.])])
-	        CPPFLAGS="$saved_CPPFLAGS"
-
-	        saved_LIBS="$LIBS"
-	        LIBS="$LIBS $XRENDER_LIBS"
-	        AC_CHECK_FUNCS([XRenderFindStandardFormat], [], [AC_MSG_ERROR([libXrender not found or too old.])])
-	        LIBS="$saved_LIBS"
-		;;
-	esac
-        ;;
-esac
+PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2 x11)
 
 # Check freetype configuration
 AC_ARG_WITH(freetype-config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto)
diff --git a/libXft/src/xftglyphs.c b/libXft/src/xftglyphs.c
index 8e0d247a0..e0cfdea8a 100644
--- a/libXft/src/xftglyphs.c
+++ b/libXft/src/xftglyphs.c
@@ -428,7 +428,7 @@ XftFontLoadGlyphs (Display	    *dpy,
 		{
 		    if (font->info.antialias)
 		    {
-			static char    den[] = { " .:;=+*#" };
+			static const char    den[] = { " .:;=+*#" };
 			for (x = 0; x < pitch; x++)
 			    printf ("%c", den[line[x] >> 5]);
 		    }
diff --git a/libXft/src/xftinit.c b/libXft/src/xftinit.c
index 43efc00e1..0205e4b36 100644
--- a/libXft/src/xftinit.c
+++ b/libXft/src/xftinit.c
@@ -58,7 +58,7 @@ static struct {
 static int  XftAllocCount, XftAllocMem;
 static int  XftFreeCount, XftFreeMem;
 
-static int  XftMemNotice = 1*1024*1024;
+static const int  XftMemNotice = 1*1024*1024;
 
 static int  XftAllocNotify, XftFreeNotify;
 
-- 
cgit v1.2.3