From a1fc145546849024694ed675aec4b8ca2e8593d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Sun, 18 Dec 2016 02:16:16 +0100 Subject: figlet: adds figlet v2.2.5 (via Redfoxmoon.) --- patches/figlet-2.2.5.local.patch | 63 ++++++++++++++++++++++++++++++++++++++++ vars/build.vars | 15 +++++++--- 2 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 patches/figlet-2.2.5.local.patch diff --git a/patches/figlet-2.2.5.local.patch b/patches/figlet-2.2.5.local.patch new file mode 100644 index 00000000..ce49b657 --- /dev/null +++ b/patches/figlet-2.2.5.local.patch @@ -0,0 +1,63 @@ +diff -ru figlet-2.2.5.old/figlet.c figlet-2.2.5/figlet.c +--- figlet-2.2.5.old/figlet.c 2012-06-01 14:51:09.000000000 +0200 ++++ figlet-2.2.5/figlet.c 2016-12-15 19:25:24.509693744 +0100 +@@ -66,10 +66,8 @@ + #include + #include /* Needed for get_columns */ + +-#ifdef unix + #include + #include /* Needed for get_columns */ +-#endif + + #ifdef TLF_FONTS + #include +diff -ru figlet-2.2.5.old/Makefile figlet-2.2.5/Makefile +--- figlet-2.2.5.old/Makefile 2012-06-01 14:51:09.000000000 +0200 ++++ figlet-2.2.5/Makefile 2016-12-15 20:33:51.653693744 +0100 +@@ -19,17 +19,17 @@ + SHELL = /bin/sh + + # The C compiler and linker to use +-CC = gcc +-CFLAGS = -g -O2 -Wall +-LD = gcc +-LDFLAGS = ++CC ?= gcc ++CFLAGS ?= -g -O2 -Wall ++LD ?= gcc ++LDFLAGS ?= + + # Feature flags: + # define TLF_FONTS to use TOIlet TLF fonts + XCFLAGS = -DTLF_FONTS + + # Where to install files +-prefix = /usr/local ++prefix ?= + + # Where the executables should be put + BINDIR = $(prefix)/bin +diff -ru figlet-2.2.5.old/utf8.h figlet-2.2.5/utf8.h +--- figlet-2.2.5.old/utf8.h 2012-06-01 14:51:10.000000000 +0200 ++++ figlet-2.2.5/utf8.h 2016-12-15 19:11:35.805693744 +0100 +@@ -27,13 +27,17 @@ + #define UTF8_IGNORE_ERROR 0x01 + #define UTF8_SKIP_BOM 0x02 + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + size_t utf8_to_wchar(const char *in, size_t insize, wchar_t *out, + size_t outsize, int flags); + size_t wchar_to_utf8(const wchar_t *in, size_t insize, char *out, + size_t outsize, int flags); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* !_UTF8_H_ */ diff --git a/vars/build.vars b/vars/build.vars index 66570afc..8dc0ae17 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -403,10 +403,10 @@ LEAF_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targ LEAF_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}"; LEAF_PACKAGES_PACKAGES=" -apk_tools bash bc chicken cmake coreutils cparser cron dash datamash diffutils dos2unix ed file findutils -gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john less lynx make man_db mc mksh -nano netcat openssh p7zip pacman patch perl procps_ng python3 rsync rxvt_unicode sed tar tcsh the_silver_searcher -tmux util_linux vim weechat wget which whois xeyes xwd zsh"; +apk_tools bash bc chicken cmake coreutils cparser cron dash datamash diffutils dos2unix ed figlet file findutils +gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john less lynx make man_db mc mksh nano netcat +openssh p7zip pacman patch perl procps_ng python3 rsync rxvt_unicode sed tar tcsh the_silver_searcher tmux +util_linux vim weechat wget which whois xeyes xwd zsh"; LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_APK_TOOLS_SHA256SUM:=7e5e86c856ce236c7fd54605ee0b1dbf59920398d3b33f9f6ff0e5f98e6828af}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; @@ -474,6 +474,13 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_ED_VERSION:=1.13}; : ${PKG_ED_URL:=http://ftp5.gwdg.de/pub/linux/slackware/slackware64-current/source/a/ed/ed-${PKG_ED_VERSION}.tar.xz}; : ${PKG_ED_CONFIGURE_ARGS="--prefix= CC=${TARGET}-gcc"}; +: ${PKG_FIGLET_SHA256SUM:=bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d}; +: ${PKG_FIGLET_VERSION:=2.2.5}; +: ${PKG_FIGLET_URL:=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${PKG_FIGLET_VERSION}.tar.gz}; +: ${PKG_FIGLET_BUILD_DIR:=figlet-${PKG_FIGLET_VERSION}}; +: ${PKG_FIGLET_MAKEFLAGS_BUILD:=CC=${TARGET}-gcc LD=${TARGET}-gcc}; +: ${PKG_FIGLET_MAKEFLAGS_INSTALL_EXTRA:=prefix=}; +: ${PKG_FIGLET_NO_CLEAN:=1}; : ${PKG_FILE_SHA256SUM:=ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0}; : ${PKG_FILE_VERSION:=5.29}; : ${PKG_FILE_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_VERSION}.tar.gz}; -- cgit v1.2.3