From ca5f119afff8101d3bb13eca3da92b8d9ae0a601 Mon Sep 17 00:00:00 2001 From: Valentin Ziegler Date: Thu, 1 Jan 2004 20:11:24 +0000 Subject: [PATCH] Valentin Ziegler: fixed unput define in scanner skeleton (flex.skl) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2089 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/flex/flex.cache | 2 +- package/base/flex/flex.conf | 2 +- package/base/flex/flex.desc | 2 +- package/base/flex/flex.skl-fix.patch | 30 ++++++++++++++++++++++++++++ package/base/flex/gen.c-fix.patch | 2 +- 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 package/base/flex/flex.skl-fix.patch diff --git a/package/base/flex/flex.cache b/package/base/flex/flex.cache index 89dcfe56d..74fafa439 100644 --- a/package/base/flex/flex.cache +++ b/package/base/flex/flex.cache @@ -6,7 +6,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/flex/flex.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/flex/flex.conf b/package/base/flex/flex.conf index e74f4b168..5b8248f78 100644 --- a/package/base/flex/flex.conf +++ b/package/base/flex/flex.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/flex/flex.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/base/flex/flex.desc b/package/base/flex/flex.desc index 08fe38a16..7507d3b9c 100644 --- a/package/base/flex/flex.desc +++ b/package/base/flex/flex.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/flex/flex.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/flex/flex.skl-fix.patch b/package/base/flex/flex.skl-fix.patch new file mode 100644 index 000000000..ef910d2cf --- /dev/null +++ b/package/base/flex/flex.skl-fix.patch @@ -0,0 +1,30 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/flex/flex.skl.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- flex-2.5.31/flex.skl.old 2004-01-01 20:38:27.000000000 +0100 ++++ flex-2.5.31/flex.skl 2004-01-01 20:38:49.000000000 +0100 +@@ -478,7 +478,7 @@ + + m4_ifdef( [[M4_YY_NOT_IN_HEADER]], + [[ +-#define unput(c) yyunput( c, YY_G(yytext_ptr) M4_YY_CALL_LAST_ARG ) ++#define unput(c) yyunput( c, YY_G(yytext) M4_YY_CALL_LAST_ARG ) + ]]) + + /* The following is because we cannot portably get our hands on size_t diff --git a/package/base/flex/gen.c-fix.patch b/package/base/flex/gen.c-fix.patch index 506aea556..1453bbc04 100644 --- a/package/base/flex/gen.c-fix.patch +++ b/package/base/flex/gen.c-fix.patch @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/flex/gen.c-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license