parent
9532027eb6
commit
f18323b7ad
4 changed files with 0 additions and 214 deletions
@ -1,81 +0,0 @@ |
||||
diff -Naur toilet-0.1.orig/doc/toilet.1.in toilet-0.1/doc/toilet.1.in
|
||||
--- toilet-0.1.orig/doc/toilet.1.in 2009-04-28 16:20:58.000000000 +0200
|
||||
+++ toilet-0.1/doc/toilet.1.in 2009-04-28 16:45:06.000000000 +0200
|
||||
@@ -144,6 +144,12 @@
|
||||
.B figlet
|
||||
manpage for more information about it.
|
||||
.TP
|
||||
+.B \-x, \-\-posx <pos>
|
||||
+Specify the X (column) position.
|
||||
+.TP
|
||||
+.B \-y, \-\-posy <pos>
|
||||
+Specify the y (row) position.
|
||||
+.TP
|
||||
.B \-v, \-\-version
|
||||
Output version information and exit.
|
||||
.RI
|
||||
diff -Naur toilet-0.1.orig/src/main.c toilet-0.1/src/main.c
|
||||
--- toilet-0.1.orig/src/main.c 2009-04-28 16:20:58.000000000 +0200
|
||||
+++ toilet-0.1/src/main.c 2009-04-28 16:27:46.000000000 +0200
|
||||
@@ -59,6 +59,9 @@
|
||||
cx->filters = NULL;
|
||||
cx->nfilters = 0;
|
||||
|
||||
+ cx->x = 0;
|
||||
+ cx->y = 0;
|
||||
+
|
||||
#if defined(HAVE_GETOPT_H)
|
||||
for(;;)
|
||||
{
|
||||
@@ -81,14 +84,16 @@
|
||||
{ "help", 0, NULL, 'h' },
|
||||
{ "infocode", 1, NULL, 'I' },
|
||||
{ "version", 0, NULL, 'v' },
|
||||
+ { "posx", 1, NULL, 'x' },
|
||||
+ { "posy", 1, NULL, 'y' },
|
||||
{ NULL, 0, NULL, 0 }
|
||||
};
|
||||
|
||||
- int c = getopt_long(argc, argv, "f:d:w:tsSkWoF:E:hI:v",
|
||||
+ int c = getopt_long(argc, argv, "f:d:w:tsSkWoF:E:hI:x:y:v",
|
||||
long_options, &option_index);
|
||||
# else
|
||||
# define MOREINFO "Try `%s -h' for more information.\n"
|
||||
- int c = getopt(argc, argv, "f:d:w:tsSkWoF:E:hI:v");
|
||||
+ int c = getopt(argc, argv, "f:d:w:tsSkWoF:E:hI:x:y:v");
|
||||
# endif
|
||||
if(c == -1)
|
||||
break;
|
||||
@@ -164,6 +169,12 @@
|
||||
case 141: /* --html */
|
||||
export_set(cx, "html");
|
||||
break;
|
||||
+ case 'x': /* --posx */
|
||||
+ cx->x = atoi(optarg);
|
||||
+ break;
|
||||
+ case 'y': /* --posy */
|
||||
+ cx->y = atoi(optarg);
|
||||
+ break;
|
||||
case '?':
|
||||
printf(MOREINFO, argv[0]);
|
||||
return 1;
|
||||
@@ -277,6 +288,8 @@
|
||||
printf(" -E list list available export formats\n");
|
||||
printf(" -h display this help and exit\n");
|
||||
printf(" -I <code> print FIGlet-compatible infocode\n");
|
||||
+ printf(" -x, --posx <pos> Set initial X (column) position\n");
|
||||
+ printf(" -y, --posy <pos> Set initial Y (row) position\n");
|
||||
printf(" -v output version information and exit\n");
|
||||
# endif
|
||||
}
|
||||
diff -Naur toilet-0.1.orig/src/render.c toilet-0.1/src/render.c
|
||||
--- toilet-0.1.orig/src/render.c 2009-04-28 16:20:58.000000000 +0200
|
||||
+++ toilet-0.1/src/render.c 2009-04-28 16:26:41.000000000 +0200
|
||||
@@ -33,7 +33,6 @@
|
||||
|
||||
int render_init(context_t *cx)
|
||||
{
|
||||
- cx->x = cx->y = 0;
|
||||
cx->w = cx->h = 0;
|
||||
cx->lines = 0;
|
||||
cx->cv = cucul_create_canvas(0, 0);
|
||||
@ -1,12 +0,0 @@ |
||||
|-----handy-ruler------------------------------------------------------| |
||||
toilet: toilet (Free FIGlet replacement) |
||||
toilet: |
||||
toilet: The TOIlet project attemps to create a free replacement for the |
||||
toilet: FIGlet utility. TOIlet stands for "The Other Implementation's |
||||
toilet: letters", coined after FIGlet's "Frank, Ian and Glen's letters". |
||||
toilet: |
||||
toilet: TOIlet is in its very early development phase. It uses the powerful |
||||
toilet: libcaca library to achieve various text-based effects. |
||||
toilet: |
||||
toilet: |
||||
toilet: |
||||
@ -1 +0,0 @@ |
||||
103e64e2bec848e49e2109dea5adb19a751ed721 toilet-0.1.tar.gz |
||||
@ -1,120 +0,0 @@ |
||||
#!/bin/bash |
||||
# Build script for Slackware |
||||
# Copyright (C) 2009 Damien Goutte-Gattat |
||||
# |
||||
# Redistribution and use of this script, with or without modifications, |
||||
# is permitted provided that the following conditions are met: |
||||
# |
||||
# 1. Redistributions of this script must retain the above copyright |
||||
# notice, this list of conditions and the following disclaimer. |
||||
# |
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AS IS'' AND ANY EXPRESS OR |
||||
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
||||
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
||||
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, |
||||
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
||||
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
||||
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING |
||||
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
||||
# POSSIBILITY OF SUCH DAMAGE. |
||||
# |
||||
# Contact: Damien Goutte-Gattat <dgouttegattat@incenp.org> |
||||
# |
||||
# Latest toilet sourcecode is available at: <http://caca.zoy.org/wiki/toilet>. |
||||
|
||||
# Source package infos |
||||
NAMESRC=${NAMESRC:-toilet} |
||||
VERSION=${VERSION:-0.1} |
||||
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz} |
||||
WGET=${WGET:-http://caca.zoy.org/files/toilet/$ARCHIVE} |
||||
|
||||
# Built package infos |
||||
NAMETGZ=${NAMETGZ:-toilet} |
||||
BUILD=${BUILD:-2GGD} |
||||
ARCH=${ARCH:-i486} |
||||
TARGET=${TARGET:-i486} |
||||
|
||||
# Directories |
||||
TMP=${TMP:-/tmp} |
||||
OUT=${OUT:-$TMP/build} |
||||
PKG=${PKG:-$OUT/$NAMETGZ} |
||||
CWD=$(pwd) |
||||
|
||||
set -e # Quit if a command returns non-zero |
||||
|
||||
# Sanity checks |
||||
if [ $UID -eq 0 ]; then |
||||
echo "You should NOT run this script as ROOT!" |
||||
exit 1 |
||||
fi |
||||
if [ ! -d $TMP ]; then |
||||
echo "$TMP does not exist or is not a directory!" |
||||
exit 1 |
||||
fi |
||||
|
||||
# Compilation flags |
||||
case "$ARCH" in |
||||
i?86) |
||||
CPUOPT="-O2 -march=$ARCH -mtune=i686" |
||||
;; |
||||
*) |
||||
CPUOPT="-O2" |
||||
;; |
||||
esac |
||||
|
||||
# Get and verify the source archive |
||||
if [ ! -r $ARCHIVE ]; then |
||||
wget "$WGET" |
||||
fi |
||||
sha1sum -c $ARCHIVE.sha1 |
||||
NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1) |
||||
|
||||
# Compile |
||||
cd $TMP |
||||
echo "Building $ARCHIVE..." |
||||
tar xf $CWD/$ARCHIVE |
||||
cd $NAME |
||||
|
||||
if [ -f $CWD/fix-start-position.diff ]; then |
||||
patch -p 1 < $CWD/fix-start-position.diff |
||||
fi |
||||
CFLAGS=$CPUOPT \ |
||||
CXXFLAGS=$CPUOPT \ |
||||
./configure \ |
||||
--prefix=/usr \ |
||||
--mandir=/usr/man |
||||
make |
||||
make install DESTDIR=$PKG |
||||
|
||||
# Strip binaries |
||||
find $PKG | xargs file | grep "ELF 32-bit LSB" | cut -d : -f 1 | \ |
||||
xargs strip --strip-unneeded 2> /dev/null |
||||
|
||||
# Compress man and info pages |
||||
find $PKG/usr/man -type f -exec gzip -9 {} \; |
||||
|
||||
# Install the documentation |
||||
mkdir -p $PKG/usr/doc/$NAME |
||||
install -m 644 \ |
||||
COPYING ChangeLog README NEWS TODO \ |
||||
$PKG/usr/doc/$NAME |
||||
|
||||
# Copy slack-desc file |
||||
install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc |
||||
|
||||
# Package the tree |
||||
cd $PKG |
||||
mkdir -p $OUT |
||||
PACKAGING=" |
||||
chown root:root . -R |
||||
/sbin/makepkg -l y -c n $OUT/$NAMETGZ-$VERSION-$ARCH-$BUILD.tgz |
||||
rm -rf $PKG |
||||
rm -rf $TMP/$NAME |
||||
" |
||||
if type -p fakeroot ; then |
||||
echo "$PACKAGING" | fakeroot |
||||
else |
||||
su -c "$PACKAGING" |
||||
fi |
||||
Loading…
Reference in new issue