diff options
| -rw-r--r-- | pkg/fribidi/README.md | 4 | ||||
| -rw-r--r-- | pkg/fribidi/config.h | 23 | ||||
| -rw-r--r-- | pkg/fribidi/fribidi-config.h | 6 | ||||
| -rw-r--r-- | pkg/fribidi/gen.lua | 25 | ||||
| -rw-r--r-- | pkg/fribidi/rev | 2 | ||||
| m--------- | pkg/fribidi/src | 0 |
6 files changed, 24 insertions, 36 deletions
diff --git a/pkg/fribidi/README.md b/pkg/fribidi/README.md index 6b6a0fff..e7006066 100644 --- a/pkg/fribidi/README.md +++ b/pkg/fribidi/README.md @@ -1,8 +1,6 @@ # fribidi ## config.h - Generated with - ./configure \ - --disable-charsets + meson --buildtype release -Ddeprecated=false -Ddocs=false .. diff --git a/pkg/fribidi/config.h b/pkg/fribidi/config.h index 6a35280f..eae09a62 100644 --- a/pkg/fribidi/config.h +++ b/pkg/fribidi/config.h @@ -1,32 +1,11 @@ -/* #undef DEBUG */ -/* #undef HAVE_ASM_PAGE_H */ -#define HAVE_DLFCN_H 1 -#define HAVE_INTTYPES_H 1 +#define FRIBIDI_NO_DEPRECATED #define HAVE_MEMMOVE 1 #define HAVE_MEMORY_H 1 #define HAVE_MEMSET 1 -#define HAVE_STDINT_H 1 #define HAVE_STDLIB_H 1 #define HAVE_STRDUP 1 #define HAVE_STRINGIZE 1 #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 -#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TIMES_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_WCHAR_H 1 -#define LT_OBJDIR ".libs/" -#define PACKAGE_BUGREPORT "https://github.com/fribidi/fribidi/issues/new" -#define PACKAGE_NAME "GNU FriBidi" -#define PACKAGE_STRING "GNU FriBidi 1.0.1" -#define PACKAGE_TARNAME "fribidi" -#define PACKAGE_URL "http://fribidi.org/" -#define PACKAGE_VERSION "1.0.1" -#define RETSIGTYPE void -#define SIZEOF_INT 4 -#define SIZEOF_SHORT 2 -#define SIZEOF_VOID_P 8 -#define SIZEOF_WCHAR_T 4 #define STDC_HEADERS 1 -/* #undef const */ diff --git a/pkg/fribidi/fribidi-config.h b/pkg/fribidi/fribidi-config.h index 50dbb63d..8d9d9b15 100644 --- a/pkg/fribidi/fribidi-config.h +++ b/pkg/fribidi/fribidi-config.h @@ -3,12 +3,12 @@ #define FRIBIDI "fribidi" #define FRIBIDI_NAME "GNU FriBidi" #define FRIBIDI_BUGREPORT "https://github.com/fribidi/fribidi/issues/new" -#define FRIBIDI_VERSION "1.0.1" +#define FRIBIDI_VERSION "1.0.2" #define FRIBIDI_MAJOR_VERSION 1 #define FRIBIDI_MINOR_VERSION 0 -#define FRIBIDI_MICRO_VERSION 1 +#define FRIBIDI_MICRO_VERSION 2 #define FRIBIDI_INTERFACE_VERSION 4 #define FRIBIDI_INTERFACE_VERSION_STRING "4" -#define FRIBIDI_CHARSETS 0 #define FRIBIDI_SIZEOF_INT 4 +#undef FRIBIDI_BUILT_WITH_MSVC #endif /* FRIBIDI_CONFIG_H */ diff --git a/pkg/fribidi/gen.lua b/pkg/fribidi/gen.lua index 60c73afd..7bf17446 100644 --- a/pkg/fribidi/gen.lua +++ b/pkg/fribidi/gen.lua @@ -9,16 +9,18 @@ cflags{ sub('tools.ninja', function() toolchain 'host' cflags{ - -- technically, this should use a separate host config, but most - -- of the stuff in config.h seems pretty standard - '-D HAVE_CONFIG_H', - '-I $dir', + '-D HAVE_STRINGIZE', + '-D DONT_HAVE_FRIBIDI_CONFIG_H', + '-D HAVE_STDLIB_H', + '-D HAVE_STRING_H', + '-D HAVE_STRINGS_H', + '-D STDC_HEADERS', '-I $outdir/include', '-I $srcdir/lib', } cc('gen.tab/packtab.c') exe('gen-unicode-version', {'gen.tab/gen-unicode-version.c'}) - for _, t in ipairs{'bidi-type', 'joining-type', 'arabic-shaping', 'mirroring', 'brackets', 'brackets-type'} do + for _, t in ipairs{'arabic-shaping', 'bidi-type', 'joining-type', 'mirroring', 'brackets', 'brackets-type'} do exe('gen-'..t..'-tab', expand{'gen.tab/', { 'gen-'..t..'-tab.c', 'packtab.c.o', @@ -37,22 +39,23 @@ local function gentool(tool, out, srcs, args) end gentool('unicode-version', 'include/fribidi-unicode-version.h', {'BidiMirroring.txt'}) +gentool('arabic-shaping-tab', 'arabic-shaping.tab.i', {'UnicodeData.txt'}, '$compression') gentool('bidi-type-tab', 'bidi-type.tab.i', {'UnicodeData.txt'}, '$compression') gentool('joining-type-tab', 'joining-type.tab.i', {'UnicodeData.txt', 'ArabicShaping.txt'}, '$compression') -gentool('arabic-shaping-tab', 'arabic-shaping.tab.i', {'UnicodeData.txt'}, '$compression') gentool('mirroring-tab', 'mirroring.tab.i', {'BidiMirroring.txt'}, '$compression') gentool('brackets-tab', 'brackets.tab.i', {'BidiBrackets.txt', 'UnicodeData.txt'}, '$compression') gentool('brackets-type-tab', 'brackets-type.tab.i', {'BidiBrackets.txt'}, '$compression') pkg.hdrs = { copy('$outdir/include', '$srcdir/lib', { - 'fribidi.h', 'fribidi-arabic.h', 'fribidi-begindecls.h', 'fribidi-bidi.h', 'fribidi-bidi-types.h', 'fribidi-bidi-types-list.h', 'fribidi-common.h', + 'fribidi-char-sets.h', + 'fribidi-char-sets-list.h', 'fribidi-deprecated.h', 'fribidi-enddecls.h', 'fribidi-flags.h', @@ -64,6 +67,7 @@ pkg.hdrs = { 'fribidi-shape.h', 'fribidi-types.h', 'fribidi-unicode.h', + 'fribidi.h', }), copy('$outdir/include', '$dir', {'fribidi-config.h'}), '$outdir/include/fribidi-unicode-version.h', @@ -85,6 +89,13 @@ lib('libfribidi.a', [[ fribidi-bidi.c fribidi-bidi-types.c fribidi-deprecated.c + fribidi-char-sets.c + fribidi-char-sets-cap-rtl.c + fribidi-char-sets-cp1255.c + fribidi-char-sets-cp1256.c + fribidi-char-sets-iso8859-6.c + fribidi-char-sets-iso8859-8.c + fribidi-char-sets-utf8.c fribidi-joining.c fribidi-joining-types.c fribidi-mirroring.c diff --git a/pkg/fribidi/rev b/pkg/fribidi/rev index 0cfbf088..00750edc 100644 --- a/pkg/fribidi/rev +++ b/pkg/fribidi/rev @@ -1 +1 @@ -2 +3 diff --git a/pkg/fribidi/src b/pkg/fribidi/src -Subproject c301aaedcc9615c6c2660409b26cf6bfb648832 +Subproject f2c9d50722cb60d0cdec3b1bafba9029770e86b |