logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: df0103ca54bb5b5c7073ccca67033ad77a1accdc
parent 72e50e52fe7eb04eaeeb8c157d8fcde9fbe4be2d
Author: Michael Forney <mforney@mforney.org>
Date:   Sun,  4 Feb 2018 21:07:55 -0800

fribidi: Update to 1.0.1

Diffstat:

Apkg/fribidi/README.md8++++++++
Mpkg/fribidi/config.h25+++++++++++++++++++------
Mpkg/fribidi/fribidi-config.h26+++++++-------------------
Mpkg/fribidi/gen.lua10+++++++---
Mpkg/fribidi/rev2+-
5 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/pkg/fribidi/README.md b/pkg/fribidi/README.md @@ -0,0 +1,8 @@ +# fribidi + +## config.h + +Generated with + + ./configure \ + --disable-charsets diff --git a/pkg/fribidi/config.h b/pkg/fribidi/config.h @@ -1,19 +1,32 @@ -#include <config-posix.h> - /* #undef DEBUG */ /* #undef HAVE_ASM_PAGE_H */ +#define HAVE_DLFCN_H 1 +#define HAVE_INTTYPES_H 1 +#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 "http://bugs.freedesktop.org/enter_bug.cgi?product=fribidi" +#define PACKAGE_BUGREPORT "https://github.com/fribidi/fribidi/issues/new" #define PACKAGE_NAME "GNU FriBidi" -#define PACKAGE_STRING "GNU FriBidi 0.19.7" +#define PACKAGE_STRING "GNU FriBidi 1.0.1" #define PACKAGE_TARNAME "fribidi" #define PACKAGE_URL "http://fribidi.org/" -#define PACKAGE_VERSION "0.19.7" +#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 USE_SIMPLE_MALLOC 1 +#define STDC_HEADERS 1 /* #undef const */ diff --git a/pkg/fribidi/fribidi-config.h b/pkg/fribidi/fribidi-config.h @@ -1,26 +1,14 @@ -/* lib/fribidi-config.h. Generated from fribidi-config.h.in by configure. */ -/* Not copyrighted, in public domain. */ #ifndef FRIBIDI_CONFIG_H #define FRIBIDI_CONFIG_H - #define FRIBIDI "fribidi" #define FRIBIDI_NAME "GNU FriBidi" -#define FRIBIDI_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?product=fribidi" - -#define FRIBIDI_VERSION "0.19.7" -#define FRIBIDI_MAJOR_VERSION 0 -#define FRIBIDI_MINOR_VERSION 19 -#define FRIBIDI_MICRO_VERSION 7 -#define FRIBIDI_INTERFACE_VERSION 3 -#define FRIBIDI_INTERFACE_VERSION_STRING "3" - -/* Define to 1 if you want charset conversion codes in the library */ +#define FRIBIDI_BUGREPORT "https://github.com/fribidi/fribidi/issues/new" +#define FRIBIDI_VERSION "1.0.1" +#define FRIBIDI_MAJOR_VERSION 1 +#define FRIBIDI_MINOR_VERSION 0 +#define FRIBIDI_MICRO_VERSION 1 +#define FRIBIDI_INTERFACE_VERSION 4 +#define FRIBIDI_INTERFACE_VERSION_STRING "4" #define FRIBIDI_CHARSETS 0 - -/* Define to 1 if you want to use glib */ -#define FRIBIDI_USE_GLIB 0 - -/* The size of a `int', as computed by sizeof. */ #define FRIBIDI_SIZEOF_INT 4 - #endif /* FRIBIDI_CONFIG_H */ diff --git a/pkg/fribidi/gen.lua b/pkg/fribidi/gen.lua @@ -1,6 +1,5 @@ cflags{ '-D HAVE_CONFIG_H', - '-I include', '-I $dir', '-I $outdir', '-I $outdir/include', @@ -10,7 +9,7 @@ cflags{ sub('tools.ninja', function() 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'} do + for _, t in ipairs{'bidi-type', 'joining-type', 'arabic-shaping', 'mirroring', 'brackets', 'brackets-type'} do exe('gen-'..t..'-tab', expand{'gen.tab/', { 'gen-'..t..'-tab.c', 'packtab.c.o', @@ -33,6 +32,8 @@ 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', { @@ -50,6 +51,7 @@ pkg.hdrs = { 'fribidi-joining-types.h', 'fribidi-joining-types-list.h', 'fribidi-mirroring.h', + 'fribidi-brackets.h', 'fribidi-shape.h', 'fribidi-types.h', 'fribidi-unicode.h', @@ -62,6 +64,8 @@ pkg.deps = { '$outdir/joining-type.tab.i', '$outdir/arabic-shaping.tab.i', '$outdir/mirroring.tab.i', + '$outdir/brackets.tab.i', + '$outdir/brackets-type.tab.i', '$dir/headers', } @@ -74,8 +78,8 @@ lib('libfribidi.a', [[ fribidi-deprecated.c fribidi-joining.c fribidi-joining-types.c - fribidi-mem.c fribidi-mirroring.c + fribidi-brackets.c fribidi-run.c fribidi-shape.c ) diff --git a/pkg/fribidi/rev b/pkg/fribidi/rev @@ -1 +1 @@ -1 +2