Attachment 5469 Details for Bug 4083 – patch

[patch] patch

fontconfig-iconv.patch (text/plain), 2.98 KB, created by Behdad Esfahbod on 2006-04-25 21:19:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Behdad Esfahbod

Created: 2006-04-25 21:19:40 UTC

Size: 2.98 KB

patch

obsolete

>? confdefs.h
>? dddd
>? src/.fcfreetype.c.swp
>Index: configure.in
>===================================================================
>RCS file: /cvs/fontconfig/fontconfig/configure.in,v
>retrieving revision 1.66.2.11
>diff -u -p -d -r1.66.2.11 configure.in
>--- configure.in	19 Apr 2006 16:17:19 -0000	1.66.2.11
>+++ configure.in	25 Apr 2006 11:18:00 -0000
>@@ -135,7 +135,7 @@ dnl ====================================
> # Checks for header files.
> AC_HEADER_DIRENT
> AC_HEADER_STDC
>-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h iconv.h])
>+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
> 
> # Checks for typedefs, structures, and compiler characteristics.
> AC_C_CONST
>@@ -145,7 +145,40 @@ AC_TYPE_PID_T
> # Checks for library functions.
> AC_FUNC_VPRINTF
> AC_FUNC_MMAP
>-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long iconv sysconf ftruncate chsize rand_r])
>+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand_r])
>+
>+#
>+# Checks for iconv
>+#
>+AC_MSG_CHECKING([for a usable iconv])
>+ICONV_LIBS=""
>+AC_TRY_LINK([#include <iconv.h>],
>+	    [iconv_open ("from", "to");],
>+	    [use_iconv=1],
>+	    [use_iconv=0])
>+if test x$use_iconv = x1; then
>+	AC_MSG_RESULT([libc])
>+else
>+	# try using libiconv
>+	fontconfig_save_libs="$LIBS"
>+	LIBS="$LIBS -liconv"
>+
>+	AC_TRY_LINK([#include <iconv.h>],
>+		    [iconv_open ("from", "to");],
>+		    [use_iconv=true],
>+		    [use_iconv=false])
>+	
>+	if test x$use_iconv = x1; then
>+		ICONV_LIBS="-liconv"
>+		AC_MSG_RESULT([libiconv])
>+	else
>+		AC_MSG_RESULT([no])
>+	fi
>+
>+	LIBS="$fontconfig_save_libs"
>+fi
>+AC_SUBST(ICONV_LIBS)
>+AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])
> 
> #
> # Checks for FreeType
>Index: src/Makefile.am
>===================================================================
>RCS file: /cvs/fontconfig/fontconfig/src/Makefile.am,v
>retrieving revision 1.12.4.5
>diff -u -p -d -r1.12.4.5 Makefile.am
>--- src/Makefile.am	9 Dec 2005 16:36:45 -0000	1.12.4.5
>+++ src/Makefile.am	25 Apr 2006 11:18:00 -0000
>@@ -106,7 +106,7 @@ lib_LTLIBRARIES = libfontconfig.la
> libfontconfig_la_LDFLAGS =			\
> 	-version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
> 
>-libfontconfig_la_LIBADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
>+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
> 
> install-data-local: install-ms-import-lib install-libtool-import-lib
> 
>Index: src/fcfreetype.c
>===================================================================
>RCS file: /cvs/fontconfig/fontconfig/src/fcfreetype.c,v
>retrieving revision 1.60.2.25
>diff -u -p -d -r1.60.2.25 fcfreetype.c
>--- src/fcfreetype.c	12 Apr 2006 14:36:36 -0000	1.60.2.25
>+++ src/fcfreetype.c	25 Apr 2006 11:18:01 -0000
>@@ -554,8 +554,7 @@ FcFontCapabilities(FT_Face face);
> 
> #define NUM_FC_MAC_ROMAN_FAKE	(int) (sizeof (fcMacRomanFake) / sizeof (fcMacRomanFake[0]))
> 
>-#if HAVE_ICONV && HAVE_ICONV_H
>-#define USE_ICONV 1
>+#if USE_ICONV
> #include <iconv.h>
> #endif
>

Actions: View | Splinter Review

Attachments on bug 4083: 5469 | 8148

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.