summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2008-01-07 10:00:15 +0100
committerJaka Kranjc2008-01-07 10:00:15 +0100
commit6a9aa11361b176ffd800651e57bf37275671f766 (patch)
tree46682d771eff6e6dccb28c4a1bafaf8252675b05
parent37e2b6b574162ca40603f8412db8db131a60bf7f (diff)
Revert "flex 2.5.34"
this version is too upstream-buggy, see our #14177 This reverts commit 9b91fa4f433b02075f2fd42f9b9900d72529fbdf.
-rwxr-xr-xdevel/flex/DETAILS6
-rw-r--r--devel/flex/FlexLexer.h.diff.12813
-rw-r--r--devel/flex/HISTORY4
-rwxr-xr-xdevel/flex/PRE_BUILD3
4 files changed, 19 insertions, 7 deletions
diff --git a/devel/flex/DETAILS b/devel/flex/DETAILS
index d0c2492cd9..5061dedfbe 100755
--- a/devel/flex/DETAILS
+++ b/devel/flex/DETAILS
@@ -1,7 +1,7 @@
SPELL=flex
- VERSION=2.5.34
- PATCHLEVEL=0
- SOURCE_HASH=sha512:a1c277e2d589223e45dee8c0ca3f72a6642639ac5204103ea34024b3957507556ccd23f3ecd86970103dd5dbec7b47267785885bd749faca6aed91645798ed9e
+ VERSION=2.5.33
+ PATCHLEVEL=1
+ SOURCE_HASH=sha512:84c12f9d3e43285f2a5c9572c343f6fed49626be756ba1181e52f5a80df4b96cb28e90d3c8f66d737adc5fe3058a9e1abce67f09e1d1e24535f09971bfe6e0e7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/flex/$SOURCE
diff --git a/devel/flex/FlexLexer.h.diff.128 b/devel/flex/FlexLexer.h.diff.128
new file mode 100644
index 0000000000..91cc7bdfea
--- /dev/null
+++ b/devel/flex/FlexLexer.h.diff.128
@@ -0,0 +1,13 @@
+--- FlexLexer.h 2006/10/22 22:17:38 1.27
++++ FlexLexer.h 2007/04/12 19:12:56 1.28
+@@ -62,8 +62,8 @@
+ public:
+ virtual ~FlexLexer() { }
+
+- const char* YYText() { return yytext; }
+- int YYLeng() { return yyleng; }
++ const char* YYText() const { return yytext; }
++ int YYLeng() const { return yyleng; }
+
+ virtual void
+ yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
diff --git a/devel/flex/HISTORY b/devel/flex/HISTORY
index b82bfbaadf..4bcc8fef6f 100644
--- a/devel/flex/HISTORY
+++ b/devel/flex/HISTORY
@@ -1,7 +1,3 @@
-2007-12-13 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 2.5.34
- * PRE_BUILD, FlexLexer.h.diff.128: removed patch
-
2007-08-07 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD, FlexLexer.h.diff.128: added
diff --git a/devel/flex/PRE_BUILD b/devel/flex/PRE_BUILD
new file mode 100755
index 0000000000..616f969fbe
--- /dev/null
+++ b/devel/flex/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/FlexLexer.h.diff.128