diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2011-01-30 14:20:53 +0100 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2011-01-30 14:23:36 +0100 |
commit | fb3e5733ea12f8f472264239e73b1f9714a741aa (patch) | |
tree | 928fd4d3266e5ef78ced6aac6fb641fe761e2195 /patches | |
parent | df72816a85bb4490b0c930c9706c8fb3332f8c0a (diff) | |
download | ptxdist-fb3e5733ea12f8f472264239e73b1f9714a741aa.tar.gz ptxdist-fb3e5733ea12f8f472264239e73b1f9714a741aa.tar.xz |
figlet: version bump
New version of our favourite tool \o/
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/figlet222/fix_warnings.diff | 32 | ||||
-rw-r--r-- | patches/figlet222/prefix-destdir-crosscompile.diff | 89 | ||||
-rw-r--r-- | patches/figlet222/series | 2 |
3 files changed, 0 insertions, 123 deletions
diff --git a/patches/figlet222/fix_warnings.diff b/patches/figlet222/fix_warnings.diff deleted file mode 100644 index 2b3f829c7..000000000 --- a/patches/figlet222/fix_warnings.diff +++ /dev/null @@ -1,32 +0,0 @@ -From: Wolfram Sang <w.sang@pengutronix.de> -Subject: fix warnings - -This Patch fixes the following warnings: - - chkfont.c:68: warning: incompatible implicit declaration of built-in function 'malloc' - chkfont.c: In function 'usageerr': - chkfont.c:103: warning: incompatible implicit declaration of built-in function 'exit' - chkfont.c: In function 'checkit': - chkfont.c:226: warning: incompatible implicit declaration of built-in function 'exit' - chkfont.c:260: warning: incompatible implicit declaration of built-in function 'free' - chkfont.c: In function 'main': - chkfont.c:458: warning: incompatible implicit declaration of built-in function 'free' - chkfont.c:460: warning: incompatible implicit declaration of built-in function 'exit' - -Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> ---- -# 20091221 rsc: mailed to info@figlet.org - - chkfont.c | 1 + - 1 file changed, 1 insertion(+) - -Index: chkfont.c -=================================================================== ---- chkfont.c.orig -+++ chkfont.c -@@ -1,4 +1,5 @@ - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - #include <ctype.h> - diff --git a/patches/figlet222/prefix-destdir-crosscompile.diff b/patches/figlet222/prefix-destdir-crosscompile.diff deleted file mode 100644 index 90b5a548d..000000000 --- a/patches/figlet222/prefix-destdir-crosscompile.diff +++ /dev/null @@ -1,89 +0,0 @@ -From: Wolfram Sang <w.sang@pengutronix.de> -Subject: [patch] Improve makefile to allow cross-compilation - -Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> -Singed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> - ---- -# 20091221 rsc: mailed to info@figlet.org - -v1: - initial patch - -v2: - mkl has added CPP and LDFLAGS - - Makefile | 35 ++++++++++++++++++----------------- - 1 file changed, 18 insertions(+), 17 deletions(-) - -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile -@@ -1,4 +1,4 @@ --# Makefile for figlet version 2.2.2 (05 July 2005) -+# Makefile for figlet version 2.2.2 (05 July 2005) - # adapted from Makefile for figlet version 2.2 (15 Oct 1996) - # Copyright 1993, 1994,1995 Glenn Chappell and Ian Chai - # Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan -@@ -11,19 +11,20 @@ - # Don't change this even if your shell is different. The only reason - # for changing this is if sh is not in the same place. - SHELL = /bin/sh --CC = gcc --CFLAGS = -g -+CC ?= gcc -+CFLAGS ?= -g -O2 - -+prefix = /usr/local - # Where the executables should be put --DESTDIR = /usr/local/bin -+BINDIR = $(prefix)/bin - - # Where the man page should be put --MANDIR = /usr/local/man/man6 -+MANDIR = $(prefix)/man/man6 - - # Where figlet will search first for fonts (the ".flf" files). --DEFAULTFONTDIR = /usr/local/share/figlet -+DEFAULTFONTDIR = $(prefix)/share/figlet - # Use this definition if you can't put things in /usr/local/share/figlet --DEFAULTFONTDIR = fonts -+#DEFAULTFONTDIR = fonts - - # The filename of the font to be used if no other is specified - # (standard.flf is recommended, but any other can be used). -@@ -40,23 +41,23 @@ SOURCES = figlet.c zipio.c crc.c inflate - all: figlet chkfont - - figlet: $(SOURCES) -- $(CC) $(CFLAGS) -DDEFAULTFONTDIR=\"$(DEFAULTFONTDIR)\" \ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DDEFAULTFONTDIR=\"$(DEFAULTFONTDIR)\" \ - -DDEFAULTFONTFILE=\"$(DEFAULTFONTFILE)\" \ - $(SOURCES) -o figlet - chmod a+x figlet - - chkfont: chkfont.c -- $(CC) $(CFLAGS) -o chkfont chkfont.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o chkfont chkfont.c - - clean: - rm -f *.o figlet chkfont - - install: figlet chkfont -- mkdir -p $(DEFAULTFONTDIR) -- cp figlet $(DESTDIR) -- cp figlet.6 $(MANDIR) -- cp chkfont $(DESTDIR) -- cp figlist $(DESTDIR) -- cp showfigfonts $(DESTDIR) -- cp fonts/*.flf $(DEFAULTFONTDIR) -- cp fonts/*.flc $(DEFAULTFONTDIR) -+ install -m 755 -D figlet $(DESTDIR)$(BINDIR)/figlet -+ install -m 644 -D figlet.6 $(DESTDIR)$(MANDIR)/figlet.6 -+ install -m 755 -D chkfont $(DESTDIR)$(BINDIR)/chkfont -+ install -m 755 -D figlist $(DESTDIR)$(BINDIR)/figlist -+ install -m 755 -D showfigfonts $(DESTDIR)$(BINDIR)/showfigfonts -+ cd fonts && for FILE in *.fl[fc]; do \ -+ install -m 644 -D $$FILE $(DESTDIR)$(DEFAULTFONTDIR)/$$FILE; \ -+ done diff --git a/patches/figlet222/series b/patches/figlet222/series deleted file mode 100644 index bc9a35036..000000000 --- a/patches/figlet222/series +++ /dev/null @@ -1,2 +0,0 @@ -prefix-destdir-crosscompile.diff -p0 -fix_warnings.diff -p0 |