Hello community,

here is the log from the commit of package flex for openSUSE:Factory checked in 
at 2015-01-08 23:01:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/flex (Old)
 and      /work/SRC/openSUSE:Factory/.flex.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "flex"

Changes:
--------
--- /work/SRC/openSUSE:Factory/flex/flex.changes        2013-03-22 
11:01:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.flex.new/flex.changes   2015-01-08 
23:01:04.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan  5 11:35:08 UTC 2015 - [email protected]
+
+- Add flex-compatible-with-bison3.patch
+  * fix tests with bison3, see 
http://sourceforge.net/p/flex/flex/ci/c376be574e99b5f64a7dad71cfc7c0b1f71b747b/
+
+-------------------------------------------------------------------

New:
----
  flex-compatible-with-bison3.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ flex.spec ++++++
--- /var/tmp/diff_new_pack.NbZJP1/_old  2015-01-08 23:01:05.000000000 +0100
+++ /var/tmp/diff_new_pack.NbZJP1/_new  2015-01-08 23:01:05.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package flex
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -44,7 +44,9 @@
 Patch2:         flex-2.5.37-notex.patch
 # PATCH-FIX-UPSTREAM fix tests for new bison
 Patch3:         
http://www.linuxfromscratch.org/patches/lfs/7.2/flex-2.5.37-bison-2.6.1-1.patch
-Patch4:         config-guess-sub-update.patch
+# PATCH-FIX-UPSTREAM flex-2.5.37-bison3.patch [email protected] - fix tests for 
bison3
+Patch4:         flex-compatible-with-bison3.patch
+Patch5:         config-guess-sub-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -56,7 +58,8 @@
 %patch1
 %patch2 -p1
 %patch3 -p1
-%patch4
+%patch4 -p1
+%patch5
 
 %build
 autoreconf -fi

++++++ flex-compatible-with-bison3.patch ++++++
--- flex-2.5.37.orig/tests/test-bison-yylloc/parser.y
+++ flex-2.5.37/tests/test-bison-yylloc/parser.y
@@ -22,6 +22,7 @@
  */
 
 %parse-param { void* scanner }
+%lex-param { void* scanner }
 
 /* 
    How to compile:
@@ -34,7 +35,6 @@
 #include "config.h"
 
 #define YYERROR_VERBOSE 1
-#define YYLEX_PARAM   scanner
 
 extern int testget_lineno(void*);
 
@@ -52,7 +52,7 @@ int process_text(char* s) {
 
 %}
 
-%pure_parser
+%pure-parser
 
 %union  {
     int  lineno;
--- flex-2.5.37.orig/tests/test-bison-yylval/parser.y
+++ flex-2.5.37/tests/test-bison-yylval/parser.y
@@ -26,6 +26,7 @@
    bison --defines --output-file="parser.c" --name-prefix="test" parser.y
  */
 %parse-param { void* scanner }
+%lex-param { void* scanner }
 %{
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,7 +34,6 @@
 #include "config.h"
 
 #define YYERROR_VERBOSE 1
-#define YYLEX_PARAM   scanner
 
 
 /* A dummy function. A check against seg-faults in yylval->str. */
@@ -49,7 +49,7 @@ int process_text(char* s) {
 
 %}
 
-%pure_parser
+%pure-parser
 
 %union  {
     long unused;
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to