Attachment 2346 Details for Bug 2774 – this patch should correct the bug which also appears on Solaris 2.8

[patch] this patch should correct the bug which also appears on Solaris 2.8

fontconfig.iconv.patch (text/plain), 1.90 KB, created by Luc.Maisonobe on 2005-04-07 11:11:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luc.Maisonobe

Created: 2005-04-07 11:11:40 UTC

Size: 1.90 KB

patch

obsolete

>diff -u -r -N fontconfig-2.3.1.orig/configure.in fontconfig-2.3.1/configure.in
>--- fontconfig-2.3.1.orig/configure.in	2005-03-09 00:39:02.000000000 +0100
>+++ fontconfig-2.3.1/configure.in	2005-04-07 18:08:21.424355536 +0200
>@@ -144,6 +144,7 @@
> # Checks for library functions.
> AC_FUNC_VPRINTF
> AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long iconv])
>+AM_CONDITIONAL(ICONV, test x$ac_cv_func_iconv = xyes)
> 
> #
> # Checks for FreeType
>diff -u -r -N fontconfig-2.3.1.orig/fc-cache/Makefile.am fontconfig-2.3.1/fc-cache/Makefile.am
>--- fontconfig-2.3.1.orig/fc-cache/Makefile.am	2004-12-07 02:14:45.000000000 +0100
>+++ fontconfig-2.3.1/fc-cache/Makefile.am	2005-04-07 18:08:21.429354776 +0200
>@@ -33,7 +33,12 @@
> 
> EXTRA_DIST=$(SGML)
> 
>-fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
>+if ICONV
>+ICONVLIB = -liconv
>+else
>+ICONVLIB =
>+endif
>+fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la $(ICONVLIB)
> 
> if USEDOCBOOK
> 
>diff -u -r -N fontconfig-2.3.1.orig/fc-list/Makefile.am fontconfig-2.3.1/fc-list/Makefile.am
>--- fontconfig-2.3.1.orig/fc-list/Makefile.am	2004-12-07 02:14:46.000000000 +0100
>+++ fontconfig-2.3.1/fc-list/Makefile.am	2005-04-07 18:08:21.434354016 +0200
>@@ -33,7 +33,12 @@
> 
> EXTRA_DIST=$(SGML)
> 
>-fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
>+if ICONV
>+ICONVLIB = -liconv
>+else
>+ICONVLIB =
>+endif
>+fc_list_LDADD = ${top_builddir}/src/libfontconfig.la $(ICONVLIB)
> 
> 
> if USEDOCBOOK
>diff -u -r -N fontconfig-2.3.1.orig/fc-match/Makefile.am fontconfig-2.3.1/fc-match/Makefile.am
>--- fontconfig-2.3.1.orig/fc-match/Makefile.am	2004-12-07 02:14:46.000000000 +0100
>+++ fontconfig-2.3.1/fc-match/Makefile.am	2005-04-07 18:08:21.439353256 +0200
>@@ -29,4 +29,9 @@
> 
> EXTRA_DIST=$(man_MANS)
> 
>-fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
>+if ICONV
>+ICONVLIB = -liconv
>+else
>+ICONVLIB =
>+endif
>+fc_match_LDADD = ${top_builddir}/src/libfontconfig.la $(ICONVLIB)

Actions: View | Splinter Review

Attachments on bug 2774: 2346 | 2392

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.