[lfs-patches] r3545 - trunk/fontconfig

dj at higgs.linuxfromscratch.org dj at higgs.linuxfromscratch.org
Fri Apr 28 16:24:31 PDT 2017


Author: dj
Date: Fri Apr 28 16:24:31 2017
New Revision: 3545

Log:
Rename fontconfig-2.12.1-gperf-3.1-1.patch.

Added:
   trunk/fontconfig/fontconfig-2.12.1-gperf-3.1-1.patch
      - copied unchanged from r3544, trunk/fontconfig/fontconfig-2.12.1-gperf-3.1.patch
Deleted:
   trunk/fontconfig/fontconfig-2.12.1-gperf-3.1.patch

Copied: trunk/fontconfig/fontconfig-2.12.1-gperf-3.1-1.patch (from r3544, trunk/fontconfig/fontconfig-2.12.1-gperf-3.1.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/fontconfig/fontconfig-2.12.1-gperf-3.1-1.patch	Fri Apr 28 16:24:31 2017	(r3545, copy of r3544, trunk/fontconfig/fontconfig-2.12.1-gperf-3.1.patch)
@@ -0,0 +1,56 @@
+Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date:                    2017-04-02
+Initial Package Version: 2.12.1
+Upstream Status:         Comitted
+Origin:                  Upstream
+Description:             Fixes build issue with gperf >= 3.1
+
+
+diff --git a/configure.ac b/configure.ac
+index 4948816..8fbf3d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -193,6 +193,26 @@
+ AC_CHECK_MEMBERS([struct dirent.d_type],,,
+ 	[#include <dirent.h>])
+ 
++# Check the argument type of the gperf hash/lookup function
++AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function])
++fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++	#include <string.h>
++
++	const char *in_word_set(register const char *, register size_t);
++	$fc_gperf_test
++	]])], [FC_GPERF_SIZE_T=size_t],
++	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++		#include <string.h>
++
++		const char *in_word_set(register const char *, register unsigned int);
++		$fc_gperf_test
++	]])], [FC_GPERF_SIZE_T="unsigned int"],
++	[AC_MSG_ERROR([Unable to determine the type of the len parameter of the gperf hash/lookup function])]
++)])
++AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len parameter of the gperf hash/lookup function])
++AC_MSG_RESULT($FC_GPERF_SIZE_T)
++
+ #
+ # Checks for iconv
+ #
+diff --git a/src/fcobjs.c b/src/fcobjs.c
+index 16ff31c..33bba8d 100644
+--- a/src/fcobjs.c
++++ b/src/fcobjs.c
+@@ -25,10 +25,10 @@
+ #include "fcint.h"
+ 
+ static unsigned int
+-FcObjectTypeHash (register const char *str, register unsigned int len);
++FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
+ 
+ static const struct FcObjectTypeInfo *
+-FcObjectTypeLookup (register const char *str, register unsigned int len);
++FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
+ 
+ #include "fcobjshash.h"
+


More information about the patches mailing list