Hello community,
here is the log from the commit of package sax2
checked in at Mon Mar 3 16:43:42 CET 2008.
--------
--- sax2/sax2.changes 2008-02-29 13:31:17.000000000 +0100
+++ sax2/sax2.changes 2008-03-03 12:58:22.489829000 +0100
@@ -1,0 +2,15 @@
+Mon Mar 3 12:54:51 CET 2008 - ms@suse.de
+
+- flex 2.5.31 and newer has a "feature" that it declares the yylineno
+ variable in the generated scanner even if the generated code won't use
+ it (flex wasn't run with --yylineno). I used to patch this out, because
+ it caused unnecessary trouble for packages happen to use a private
+ 'yylineno' variable (sax2 being one of them). Unfortunately the
+ testsuite in newer flex explicitly checks that yylineno is always
+ declared, therefore I'd like to remove the patch. Also sax2 seems to be
+ the only package that still breaks due to yylineno. The best option IMO
+ is to rename the variable to something else
+
+ ==> renamed yylineno to lineno
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.hQ5621/_old 2008-03-03 16:40:05.000000000 +0100
+++ /var/tmp/diff_new_pack.hQ5621/_new 2008-03-03 16:40:05.000000000 +0100
@@ -40,7 +40,7 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 363
+Release: 367
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -454,6 +454,17 @@
%endif
%changelog
+* Mon Mar 03 2008 ms@suse.de
+- flex 2.5.31 and newer has a "feature" that it declares the yylineno
+ variable in the generated scanner even if the generated code won't use
+ it (flex wasn't run with --yylineno). I used to patch this out, because
+ it caused unnecessary trouble for packages happen to use a private
+ 'yylineno' variable (sax2 being one of them). Unfortunately the
+ testsuite in newer flex explicitly checks that yylineno is always
+ declared, therefore I'd like to remove the patch. Also sax2 seems to be
+ the only package that still breaks due to yylineno. The best option IMO
+ is to rename the variable to something else
+ ==> renamed yylineno to lineno
* Fri Feb 29 2008 ms@suse.de
- added DELL 1908FP monitor to CDB (bnc #362174)
* Thu Feb 28 2008 ms@suse.de
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/spp/spp.cpp new/sax/spp/spp.cpp
--- old/sax/spp/spp.cpp 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/spp/spp.cpp 2008-03-03 12:42:30.000000000 +0100
@@ -110,7 +110,7 @@
// This method is used to reset the parser to its
// default values
// ----
- yylineno = 1;
+ lineno = 1;
yyletter = 0;
yystop = 0;
yyline = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/spp/spp.h new/sax/spp/spp.h
--- old/sax/spp/spp.h 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/spp/spp.h 2008-03-03 12:42:30.000000000 +0100
@@ -34,7 +34,7 @@
//------------------------------
extern int yystop;
extern int yystdin;
-extern int yylineno;
+extern int lineno;
extern int yyletter;
extern char* yyline;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/spp/spp.l new/sax/spp/spp.l
--- old/sax/spp/spp.l 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/spp/spp.l 2008-03-03 12:42:30.000000000 +0100
@@ -35,7 +35,7 @@
// Global Variables
//-----------------------------------
int yystdin = 1;
-int yylineno = 1;
+int lineno = 1;
int yyletter = 0;
int yystop = 0;
char* yyline = 0;
@@ -57,7 +57,7 @@
}
if (yystdin) {
char prompt[80];
- sprintf (prompt,"(%d) SaX: ",yylineno);
+ sprintf (prompt,"(%d) SaX: ",lineno);
yyline = readline (prompt);
if ((! yyline) || ((strcmp(yyline,"exit") == 0))) {
buf[0]=EOF;
@@ -109,12 +109,12 @@
/*=================================*/
/* ignore empty lines */
/*---------------------------------*/
-^{L}*\n { yylineno++; copylv; return (RET); }
+^{L}*\n { lineno++; copylv; return (RET); }
/*=================================*/
/* remove EOL at end of line */
/*---------------------------------*/
-\n { yylineno++; copylv; return (RET); }
+\n { lineno++; copylv; return (RET); }
/*=================================*/
/* remove tabs and spaces */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/spp/spp.yc new/sax/spp/spp.yc
--- old/sax/spp/spp.yc 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/spp/spp.yc 2008-03-03 12:42:30.000000000 +0100
@@ -29,7 +29,7 @@
//------------------------------------
extern char *yytext;
extern char *yyline;
-extern int yylineno;
+extern int lineno;
extern int yyletter;
extern int yystop;
extern int yystdin;
@@ -80,7 +80,7 @@
for (int i=1; i