[packages/ptlib] - fix bilding with bison 3+

baggins baggins at pld-linux.org
Sun Apr 12 11:02:20 CEST 2015


commit e5f1c490ed9dfcd241f25b1d55a66c2ceb40db9a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 12 11:02:06 2015 +0200

    - fix bilding with bison 3+

 bison3.patch | 39 +++++++++++++++++++++++++++++++++++++++
 ptlib.spec   |  2 ++
 2 files changed, 41 insertions(+)
---
diff --git a/ptlib.spec b/ptlib.spec
index a4b720d..ea6c8ea 100644
--- a/ptlib.spec
+++ b/ptlib.spec
@@ -29,6 +29,7 @@ License:	MPL v1.0
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
 # Source0-md5:	58df152487cddbc4acd4bd0fb74fd4c0
+Patch0:		bison3.patch
 URL:		http://www.opalvoip.org/
 %{?with_video:BuildRequires:	SDL-devel}
 BuildRequires:	bison
@@ -176,6 +177,7 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # note: --enable-opal influences most of the remaining enable/disable defaults
diff --git a/bison3.patch b/bison3.patch
new file mode 100644
index 0000000..c1fcf79
--- /dev/null
+++ b/bison3.patch
@@ -0,0 +1,39 @@
+--- ptlib-2.10.11/src/ptlib/common/getdate.y~	2013-08-15 01:20:26.000000000 +0200
++++ ptlib-2.10.11/src/ptlib/common/getdate.y	2013-12-15 00:24:27.866481490 +0100
+@@ -121,9 +121,9 @@
+ static int yylex();
+ 
+ #ifdef __GNUC__
+-static int yyerror(char const *msg);
++static int yyerror(void *, char const *msg);
+ #else
+-static void yyerror(char const *msg);
++static void yyerror(void *, char const *msg);
+ #endif
+ 
+ 
+@@ -132,7 +132,8 @@
+ 
+ %}
+ 
+-%pure_parser
++%pure-parser
++%parse-param {void *parseParam}
+ 
+ %union {
+     time_t		Number;
+@@ -1018,12 +1019,12 @@
+ #endif
+ 
+ #ifdef __GNUC__
+-int yyerror(const char * s)
++int yyerror(void *var, const char * s)
+ {
+   return 0;
+ }
+ #else
+-static void yyerror(const char * s)
++static void yyerror(void *var, const char * s)
+ {
+ }
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ptlib.git/commitdiff/e5f1c490ed9dfcd241f25b1d55a66c2ceb40db9a



More information about the pld-cvs-commit mailing list