[Frugalware-git] bmf: flex-2.6.0-1-x86_64 * version bump * ( we have shared libs now !) :-P

crazy crazy at frugalware.org
Tue Dec 22 23:32:34 CET 2015


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=6e3d7a4767730bae65284848e9f1dfe42a9b42b8

commit 6e3d7a4767730bae65284848e9f1dfe42a9b42b8
Author: crazy <crazy at frugalware.org>
Date:   Tue Dec 22 23:32:15 2015 +0100

flex-2.6.0-1-x86_64
* version bump
* ( we have shared libs now !) :-P

diff --git a/source/devel/flex/FrugalBuild b/source/devel/flex/FrugalBuild
index efc7a2a..d6229a1 100644
--- a/source/devel/flex/FrugalBuild
+++ b/source/devel/flex/FrugalBuild
@@ -2,19 +2,18 @@
# Maintainer: Miklos Vajna <vmiklos at frugalware.org>

pkgname=flex
-pkgver=2.5.36
+pkgver=2.6.0
pkgrel=1
pkgdesc="A tool for generating text-scanning programs"
-depends=('glibc>=2.8-3' 'bash')
+depends=('glibc>=2.22-6' 'bash>=4.3_042-6')
groups=('devel' 'devel-core')
archs=('i686' 'x86_64' 'arm')
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://flex.sourceforge.net"
-source=(${source[@]} lex flex-2.5.36-bison-2.6.1.patch)
-sha1sums=('494a4822c2847503330a9f9df28e6f643a97f692' \
-          '76701388d28fe8b1fb269c79c11a1316a02b4e46' \
-          'a0a788838062895c19f17c77fb1a34bef9e57390')
+source=(${source[@]} lex)
+sha1sums=('159af4b68e562872049b9907f530c757156409ee' \
+          '76701388d28fe8b1fb269c79c11a1316a02b4e46')

build()
{
diff --git a/source/devel/flex/flex-2.5.36-bison-2.6.1.patch b/source/devel/flex/flex-2.5.36-bison-2.6.1.patch
deleted file mode 100644
index e7cdff6..0000000
--- a/source/devel/flex/flex-2.5.36-bison-2.6.1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -up flex-2.5.36/tests/test-bison-yylloc/main.c~ flex-2.5.36/tests/test-bison-yylloc/main.c
---- flex-2.5.36/tests/test-bison-yylloc/main.c~	2002-06-25 21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylloc/main.c	2012-07-31 18:53:22.007394045 +0200
-@@ -21,8 +21,6 @@
- #include "parser.h"
- #include "scanner.h"
-
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
-     yyscan_t scanner;
-diff -up flex-2.5.36/tests/test-bison-yylloc/parser.y~ flex-2.5.36/tests/test-bison-yylloc/parser.y
---- flex-2.5.36/tests/test-bison-yylloc/parser.y~	2002-07-25 02:43:47.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylloc/parser.y	2012-08-01 01:06:53.093155586 +0200
-@@ -21,6 +21,8 @@
-  * PURPOSE.
-  */
-
-+%parse-param { void* scanner }
-+
- /*
-    How to compile:
-    bison --defines --output-file="parser.c" --name-prefix="test" parser.y
-@@ -32,10 +34,8 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM   scanner
-
--int yyerror(char* msg);
- extern int testget_lineno(void*);
-
-
-@@ -89,7 +89,7 @@ line:
-
- %%
-
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
-     fprintf(stderr,"%s\n",msg);
-     return 0;
- }
-diff -up flex-2.5.36/tests/test-bison-yylval/main.c~ flex-2.5.36/tests/test-bison-yylval/main.c
---- flex-2.5.36/tests/test-bison-yylval/main.c~	2002-06-25 21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylval/main.c	2012-08-01 01:10:02.015510280 +0200
-@@ -24,8 +24,6 @@
- #include "parser.h"
- #include "scanner.h"
-
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
-     yyscan_t scanner;
-diff -up flex-2.5.36/tests/test-bison-yylval/parser.y~ flex-2.5.36/tests/test-bison-yylval/parser.y
---- flex-2.5.36/tests/test-bison-yylval/parser.y~	2002-06-25 21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylval/parser.y	2012-08-01 01:13:11.239867147 +0200
-@@ -25,6 +25,7 @@
-    How to compile:
-    bison --defines --output-file="parser.c" --name-prefix="test" parser.y
-  */
-+%parse-param { void* scanner }
- %{
- #include <stdio.h>
- #include <stdlib.h>
-@@ -32,11 +33,8 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM   scanner
-
--int yyerror(char* msg);
--
-
- /* A dummy function. A check against seg-faults in yylval->str. */
- int process_text(char* s) {
-@@ -76,7 +74,7 @@ starttag:  LT      TAGNAME GT { process_
- endtag:    LTSLASH TAGNAME GT { process_text($2);free($2);} ;
- %%
-
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
-     fprintf(stderr,"%s\n",msg);
-     return 0;
- }


More information about the Frugalware-git mailing list