2
0
mirror of https://codeberg.org/kiss-community/repo synced 2025-01-21 01:44:41 -07:00

fontcofig: 2.16.0

This commit is contained in:
Owen Rafferty 2025-01-18 21:48:47 -06:00
parent aaa5d4c9e2
commit cdd19cde70
No known key found for this signature in database
6 changed files with 216 additions and 179 deletions

View File

@ -1,19 +1,15 @@
#!/bin/sh -e
# Make the build system run /bin/true to generate
# a dummy file so our pre-generated one is used.
sed 's/fcobjshash\.h/fcjunk.h/' src/Makefile.in > _
mv -f _ src/Makefile.in
patch -p1 < no-gperf.patch
./configure \
GPERF=/bin/true \
--prefix=/usr \
--localstatedir=/var \
--sysconfdir=/etc \
--with-xmldir=/etc/fonts \
--enable-static \
--disable-docs \
--disable-nls
export DESTDIR="$1"
make
make DESTDIR="$1" install
meson setup \
-Dprefix=/usr \
-Dxml-dir=/etc/fonts \
-Ddoc=disabled \
-Dnls=disabled \
output
ninja -C output
ninja -C output install

View File

@ -1,2 +1,3 @@
f724c512a04997f17bc7dba807a6a58c2e8178d013bde56fab2fa579f7c50bdf33
8b565cca39fa9203a6c8b0a88abc0fb0ff9aad48536a96e7e618f9d2c515b34a63
5c95d48f5b9150f4a06d8acac12c25edaac956007df95a3bf527df02a5908f0e17
2455be3dc7de24ebb547c9443dfbe64b31617152a88fe1b979c0e5bdfafec38a80
95181d79c3f92e862cb81792ced0539486aa1bb9e17946ec6ba183f0d33665818e

View File

@ -1,5 +1,5 @@
/* ANSI-C code produced by gperf version 3.1 */
/* Command-line: gperf --pic -m 100 fcobjshash.gperf */
/* Command-line: /usr/bin/gperf --pic -m 100 --output-file src/fcobjshash.h src/fcobjshash.gperf */
/* Computed positions: -k'3,5' */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@ -29,15 +29,15 @@
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
#endif
#line 1 "fcobjshash.gperf"
#line 1 "src/fcobjshash.gperf"
#line 13 "fcobjshash.gperf"
#line 13 "src/fcobjshash.gperf"
struct FcObjectTypeInfo {
int name;
int id;
};
#include <string.h>
/* maximum key range = 55, duplicates = 0 */
/* maximum key range = 57, duplicates = 0 */
#ifdef __GNUC__
__inline
@ -51,32 +51,32 @@ FcObjectTypeHash (register const char *str, register size_t len)
{
static const unsigned char asso_values[] =
{
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 2, 19, 30,
14, 31, 34, 51, 13, 7, 61, 61, 18, 5,
10, 40, 17, 61, 18, 2, 6, 38, 28, 46,
23, 8, 3, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 2, 19, 10,
21, 36, 37, 20, 13, 7, 63, 63, 18, 4,
10, 46, 17, 63, 21, 2, 6, 32, 34, 41,
24, 8, 3, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, 63, 63, 63, 63, 63
};
register unsigned int hval = len;
@ -115,39 +115,41 @@ struct FcObjectTypeNamePool_t
char FcObjectTypeNamePool_str25[sizeof("charheight")];
char FcObjectTypeNamePool_str26[sizeof("weight")];
char FcObjectTypeNamePool_str27[sizeof("autohint")];
char FcObjectTypeNamePool_str28[sizeof("variable")];
char FcObjectTypeNamePool_str29[sizeof("family")];
char FcObjectTypeNamePool_str30[sizeof("lcdfilter")];
char FcObjectTypeNamePool_str31[sizeof("namelang")];
char FcObjectTypeNamePool_str32[sizeof("width")];
char FcObjectTypeNamePool_str33[sizeof("familylang")];
char FcObjectTypeNamePool_str28[sizeof("family")];
char FcObjectTypeNamePool_str29[sizeof("prgname")];
char FcObjectTypeNamePool_str30[sizeof("namelang")];
char FcObjectTypeNamePool_str31[sizeof("variable")];
char FcObjectTypeNamePool_str32[sizeof("familylang")];
char FcObjectTypeNamePool_str33[sizeof("aspect")];
char FcObjectTypeNamePool_str34[sizeof("fonthashint")];
char FcObjectTypeNamePool_str35[sizeof("minspace")];
char FcObjectTypeNamePool_str36[sizeof("fullname")];
char FcObjectTypeNamePool_str37[sizeof("order")];
char FcObjectTypeNamePool_str38[sizeof("scale")];
char FcObjectTypeNamePool_str39[sizeof("verticallayout")];
char FcObjectTypeNamePool_str37[sizeof("lcdfilter")];
char FcObjectTypeNamePool_str38[sizeof("namedinstance")];
char FcObjectTypeNamePool_str39[sizeof("width")];
char FcObjectTypeNamePool_str40[sizeof("fullnamelang")];
char FcObjectTypeNamePool_str41[sizeof("color")];
char FcObjectTypeNamePool_str42[sizeof("index")];
char FcObjectTypeNamePool_str43[sizeof("rasterizer")];
char FcObjectTypeNamePool_str44[sizeof("style")];
char FcObjectTypeNamePool_str41[sizeof("decorative")];
char FcObjectTypeNamePool_str42[sizeof("verticallayout")];
char FcObjectTypeNamePool_str43[sizeof("scale")];
char FcObjectTypeNamePool_str44[sizeof("color")];
char FcObjectTypeNamePool_str45[sizeof("embolden")];
char FcObjectTypeNamePool_str46[sizeof("capability")];
char FcObjectTypeNamePool_str47[sizeof("embeddedbitmap")];
char FcObjectTypeNamePool_str48[sizeof("stylelang")];
char FcObjectTypeNamePool_str49[sizeof("fontversion")];
char FcObjectTypeNamePool_str50[sizeof("pixelsize")];
char FcObjectTypeNamePool_str51[sizeof("symbol")];
char FcObjectTypeNamePool_str52[sizeof("fontvariations")];
char FcObjectTypeNamePool_str53[sizeof("aspect")];
char FcObjectTypeNamePool_str54[sizeof("fontformat")];
char FcObjectTypeNamePool_str55[sizeof("globaladvance")];
char FcObjectTypeNamePool_str56[sizeof("fontfeatures")];
char FcObjectTypeNamePool_str57[sizeof("charwidth")];
char FcObjectTypeNamePool_str58[sizeof("decorative")];
char FcObjectTypeNamePool_str59[sizeof("foundry")];
char FcObjectTypeNamePool_str60[sizeof("prgname")];
char FcObjectTypeNamePool_str47[sizeof("order")];
char FcObjectTypeNamePool_str48[sizeof("rasterizer")];
char FcObjectTypeNamePool_str49[sizeof("style")];
char FcObjectTypeNamePool_str50[sizeof("index")];
char FcObjectTypeNamePool_str51[sizeof("pixelsize")];
char FcObjectTypeNamePool_str52[sizeof("charwidth")];
char FcObjectTypeNamePool_str53[sizeof("stylelang")];
char FcObjectTypeNamePool_str54[sizeof("embeddedbitmap")];
char FcObjectTypeNamePool_str55[sizeof("fontversion")];
char FcObjectTypeNamePool_str56[sizeof("symbol")];
char FcObjectTypeNamePool_str57[sizeof("fontformat")];
char FcObjectTypeNamePool_str58[sizeof("fontvariations")];
char FcObjectTypeNamePool_str59[sizeof("fontfeatures")];
char FcObjectTypeNamePool_str60[sizeof("foundry")];
char FcObjectTypeNamePool_str61[sizeof("globaladvance")];
char FcObjectTypeNamePool_str62[sizeof("fontwrapper")];
};
static const struct FcObjectTypeNamePool_t FcObjectTypeNamePool_contents =
{
@ -171,39 +173,41 @@ static const struct FcObjectTypeNamePool_t FcObjectTypeNamePool_contents =
"charheight",
"weight",
"autohint",
"variable",
"family",
"lcdfilter",
"prgname",
"namelang",
"width",
"variable",
"familylang",
"aspect",
"fonthashint",
"minspace",
"fullname",
"order",
"scale",
"verticallayout",
"lcdfilter",
"namedinstance",
"width",
"fullnamelang",
"decorative",
"verticallayout",
"scale",
"color",
"index",
"rasterizer",
"style",
"embolden",
"capability",
"embeddedbitmap",
"stylelang",
"fontversion",
"order",
"rasterizer",
"style",
"index",
"pixelsize",
"symbol",
"fontvariations",
"aspect",
"fontformat",
"globaladvance",
"fontfeatures",
"charwidth",
"decorative",
"stylelang",
"embeddedbitmap",
"fontversion",
"symbol",
"fontformat",
"fontvariations",
"fontfeatures",
"foundry",
"prgname"
"globaladvance",
"fontwrapper"
};
#define FcObjectTypeNamePool ((const char *) &FcObjectTypeNamePool_contents)
const struct FcObjectTypeInfo *
@ -211,123 +215,127 @@ FcObjectTypeLookup (register const char *str, register size_t len)
{
enum
{
TOTAL_KEYWORDS = 53,
TOTAL_KEYWORDS = 55,
MIN_WORD_LENGTH = 3,
MAX_WORD_LENGTH = 14,
MIN_HASH_VALUE = 6,
MAX_HASH_VALUE = 60
MAX_HASH_VALUE = 62
};
static const struct FcObjectTypeInfo wordlist[] =
{
{-1}, {-1}, {-1}, {-1}, {-1}, {-1},
#line 62 "fcobjshash.gperf"
#line 62 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str6,FC_HASH_OBJECT},
#line 27 "fcobjshash.gperf"
#line 27 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str7,FC_SIZE_OBJECT},
{-1}, {-1},
#line 43 "fcobjshash.gperf"
#line 43 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str10,FC_DPI_OBJECT},
#line 50 "fcobjshash.gperf"
#line 50 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str11,FC_CHARSET_OBJECT},
#line 42 "fcobjshash.gperf"
#line 42 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str12,FC_SCALABLE_OBJECT},
#line 24 "fcobjshash.gperf"
#line 24 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str13,FC_SLANT_OBJECT},
#line 51 "fcobjshash.gperf"
#line 51 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str14,FC_LANG_OBJECT},
#line 70 "fcobjshash.gperf"
#line 70 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str15,FC_DESKTOP_NAME_OBJECT},
#line 30 "fcobjshash.gperf"
#line 30 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str16,FC_SPACING_OBJECT},
#line 32 "fcobjshash.gperf"
#line 32 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str17,FC_ANTIALIAS_OBJECT},
#line 63 "fcobjshash.gperf"
#line 63 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str18,FC_POSTSCRIPT_NAME_OBJECT},
#line 49 "fcobjshash.gperf"
#line 49 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str19,FC_MATRIX_OBJECT},
#line 41 "fcobjshash.gperf"
#line 41 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str20,FC_OUTLINE_OBJECT},
#line 33 "fcobjshash.gperf"
#line 33 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str21,FC_HINT_STYLE_OBJECT},
#line 38 "fcobjshash.gperf"
#line 38 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str22,FC_FILE_OBJECT},
#line 44 "fcobjshash.gperf"
#line 44 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str23,FC_RGBA_OBJECT},
#line 34 "fcobjshash.gperf"
#line 34 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str24,FC_HINTING_OBJECT},
#line 48 "fcobjshash.gperf"
#line 48 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str25,FC_CHAR_HEIGHT_OBJECT},
#line 25 "fcobjshash.gperf"
#line 25 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str26,FC_WEIGHT_OBJECT},
#line 36 "fcobjshash.gperf"
#line 36 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str27,FC_AUTOHINT_OBJECT},
#line 67 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str28,FC_VARIABLE_OBJECT},
#line 18 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str29,FC_FAMILY_OBJECT},
#line 58 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str30,FC_LCD_FILTER_OBJECT},
#line 59 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str31,FC_NAMELANG_OBJECT},
#line 26 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str32,FC_WIDTH_OBJECT},
#line 19 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str33,FC_FAMILYLANG_OBJECT},
#line 68 "fcobjshash.gperf"
#line 18 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str28,FC_FAMILY_OBJECT},
#line 61 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str29,FC_PRGNAME_OBJECT},
#line 59 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str30,FC_NAMELANG_OBJECT},
#line 67 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str31,FC_VARIABLE_OBJECT},
#line 19 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str32,FC_FAMILYLANG_OBJECT},
#line 28 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str33,FC_ASPECT_OBJECT},
#line 68 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str34,FC_FONT_HAS_HINT_OBJECT},
#line 46 "fcobjshash.gperf"
#line 46 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str35,FC_MINSPACE_OBJECT},
#line 22 "fcobjshash.gperf"
#line 22 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str36,FC_FULLNAME_OBJECT},
#line 69 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str37,FC_ORDER_OBJECT},
#line 45 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str38,FC_SCALE_OBJECT},
#line 35 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str39,FC_VERTICAL_LAYOUT_OBJECT},
#line 23 "fcobjshash.gperf"
#line 58 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str37,FC_LCD_FILTER_OBJECT},
#line 71 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str38,FC_NAMED_INSTANCE_OBJECT},
#line 26 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str39,FC_WIDTH_OBJECT},
#line 23 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_FULLNAMELANG_OBJECT},
#line 64 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_COLOR_OBJECT},
#line 39 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_INDEX_OBJECT},
#line 40 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_RASTERIZER_OBJECT},
#line 20 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str44,FC_STYLE_OBJECT},
#line 55 "fcobjshash.gperf"
#line 57 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_DECORATIVE_OBJECT},
#line 35 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_VERTICAL_LAYOUT_OBJECT},
#line 45 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_SCALE_OBJECT},
#line 64 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str44,FC_COLOR_OBJECT},
#line 55 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_EMBOLDEN_OBJECT},
#line 53 "fcobjshash.gperf"
#line 53 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CAPABILITY_OBJECT},
#line 56 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str47,FC_EMBEDDED_BITMAP_OBJECT},
#line 21 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str48,FC_STYLELANG_OBJECT},
#line 52 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str49,FC_FONTVERSION_OBJECT},
#line 29 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str50,FC_PIXEL_SIZE_OBJECT},
#line 65 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str51,FC_SYMBOL_OBJECT},
#line 66 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str52,FC_FONT_VARIATIONS_OBJECT},
#line 28 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str53,FC_ASPECT_OBJECT},
#line 54 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str54,FC_FONTFORMAT_OBJECT},
#line 37 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str55,FC_GLOBAL_ADVANCE_OBJECT},
#line 60 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str56,FC_FONT_FEATURES_OBJECT},
#line 47 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str57,FC_CHARWIDTH_OBJECT},
#line 57 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str58,FC_DECORATIVE_OBJECT},
#line 31 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str59,FC_FOUNDRY_OBJECT},
#line 61 "fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str60,FC_PRGNAME_OBJECT}
#line 69 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str47,FC_ORDER_OBJECT},
#line 40 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str48,FC_RASTERIZER_OBJECT},
#line 20 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str49,FC_STYLE_OBJECT},
#line 39 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str50,FC_INDEX_OBJECT},
#line 29 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str51,FC_PIXEL_SIZE_OBJECT},
#line 47 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str52,FC_CHARWIDTH_OBJECT},
#line 21 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str53,FC_STYLELANG_OBJECT},
#line 56 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str54,FC_EMBEDDED_BITMAP_OBJECT},
#line 52 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str55,FC_FONTVERSION_OBJECT},
#line 65 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str56,FC_SYMBOL_OBJECT},
#line 54 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str57,FC_FONTFORMAT_OBJECT},
#line 66 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str58,FC_FONT_VARIATIONS_OBJECT},
#line 60 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str59,FC_FONT_FEATURES_OBJECT},
#line 31 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str60,FC_FOUNDRY_OBJECT},
#line 37 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str61,FC_GLOBAL_ADVANCE_OBJECT},
#line 72 "src/fcobjshash.gperf"
{(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str62,FC_FONT_WRAPPER_OBJECT}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

View File

@ -0,0 +1,31 @@
diff --git a/meson.build b/meson.build
index 4439758..f320b9c 100644
--- a/meson.build
+++ b/meson.build
@@ -444,9 +444,6 @@ if gperf.found()
error('unable to determine gperf len type')
endif
else
- # Fallback to subproject
- gperf = find_program('gperf')
- # assume if we are compiling from the wrap, the size is just size_t
gperf_len_type = 'size_t'
endif
diff --git a/src/meson.build b/src/meson.build
index 3c2950f..c3c3bde 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -37,12 +37,6 @@ fcobjshash_gperf = custom_target(
build_by_default: true,
)
-fcobjshash_h = custom_target('fcobjshash.h',
- input: fcobjshash_gperf,
- output: 'fcobjshash.h',
- command: [gperf, '--pic', '-m', '100', '@INPUT@', '--output-file', '@OUTPUT@']
-)
-
# Define FcPublic appropriately for exports on windows
fc_c_shared_args = []

View File

@ -1,2 +1,3 @@
https://freedesktop.org/software/fontconfig/release/fontconfig-2.15.0.tar.xz
files/fcobjshash.h src
https://freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz
files/fcobjshash.h output/src
patches/no-gperf.patch

View File

@ -1 +1 @@
2.15.0 1
2.16.0 1