Attachment 2392 Details for Bug 2774 – proposed patch to allow both correct build and later use by other products

[patch] proposed patch to allow both correct build and later use by other products

fontconfig.iconv.patch (text/plain), 2.53 KB, created by Luc.Maisonobe on 2005-04-11 11:19:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luc.Maisonobe

Created: 2005-04-11 11:19:38 UTC

Size: 2.53 KB

patch

obsolete

>diff -c -r fontconfig-2.3.1.orig/configure.in fontconfig-2.3.1/configure.in
>*** fontconfig-2.3.1.orig/configure.in	Wed Mar  9 00:39:02 2005
>--- fontconfig-2.3.1/configure.in	Mon Apr 11 17:54:18 2005
>***************
>*** 144,149 ****
>--- 144,155 ----
>  # Checks for library functions.
>  AC_FUNC_VPRINTF
>  AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long iconv])
>+ if test x$ac_cv_func_iconv = xyes ; then
>+   ICONVLIB=-liconv
>+ else
>+   ICONVLIB=
>+ fi
>+ AC_SUBST(ICONVLIB)
>  
>  #
>  # Checks for FreeType
>diff -c -r fontconfig-2.3.1.orig/fontconfig.pc.in fontconfig-2.3.1/fontconfig.pc.in
>*** fontconfig-2.3.1.orig/fontconfig.pc.in	Wed Mar  5 07:09:14 2003
>--- fontconfig-2.3.1/fontconfig.pc.in	Mon Apr 11 17:56:23 2005
>***************
>*** 6,10 ****
>  Name: Fontconfig
>  Description: Font configuration and customization library
>  Version: @VERSION@
>! Libs: -L${libdir} -lfontconfig
>  Cflags: -I${includedir}
>--- 6,10 ----
>  Name: Fontconfig
>  Description: Font configuration and customization library
>  Version: @VERSION@
>! Libs: -L${libdir} -lfontconfig @ICONVLIB@
>  Cflags: -I${includedir}
>diff -c -r 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	Tue Dec  7 02:14:45 2004
>--- fontconfig-2.3.1/fc-cache/Makefile.am	Mon Apr 11 17:55:03 2005
>***************
>*** 33,39 ****
>  
>  EXTRA_DIST=$(SGML)
>  
>! fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
>  
>  if USEDOCBOOK
>  
>--- 33,39 ----
>  
>  EXTRA_DIST=$(SGML)
>  
>! fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la @ICONVLIB@
>  
>  if USEDOCBOOK
>  
>diff -c -r 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	Tue Dec  7 02:14:46 2004
>--- fontconfig-2.3.1/fc-list/Makefile.am	Mon Apr 11 17:55:30 2005
>***************
>*** 33,39 ****
>  
>  EXTRA_DIST=$(SGML)
>  
>! fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
>  
>  
>  if USEDOCBOOK
>--- 33,39 ----
>  
>  EXTRA_DIST=$(SGML)
>  
>! fc_list_LDADD = ${top_builddir}/src/libfontconfig.la @ICONVLIB@
>  
>  
>  if USEDOCBOOK
>diff -c -r 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	Tue Dec  7 02:14:46 2004
>--- fontconfig-2.3.1/fc-match/Makefile.am	Mon Apr 11 17:56:01 2005
>***************
>*** 29,32 ****
>  
>  EXTRA_DIST=$(man_MANS)
>  
>! fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
>--- 29,32 ----
>  
>  EXTRA_DIST=$(man_MANS)
>  
>! 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.