[ptlib] Add patch to fix build against bison3

Peter Robinson pbrobinson at fedoraproject.org
Mon Sep 1 19:25:25 UTC 2014


commit e63e38ad5ab1c7a53d8db7e83941cde51738bede
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Sep 1 20:25:25 2014 +0100

    Add patch to fix build against bison3

 ptlib-2.10.10-mga-bison-parameter.patch |   39 +++++++++++++++++++++++++++++++
 ptlib.spec                              |    9 ++++--
 2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/ptlib-2.10.10-mga-bison-parameter.patch b/ptlib-2.10.10-mga-bison-parameter.patch
new file mode 100644
index 0000000..fcc8d0d
--- /dev/null
+++ b/ptlib-2.10.10-mga-bison-parameter.patch
@@ -0,0 +1,39 @@
+--- ptlib-2.10.11/./src/ptlib/common/getdate.y	2013-08-15 01:20:26.000000000 +0200
++++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/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
diff --git a/ptlib.spec b/ptlib.spec
index 683abcd..0d6e4b8 100644
--- a/ptlib.spec
+++ b/ptlib.spec
@@ -1,13 +1,14 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.10.10
-Release:	7%{?dist}
+Release:	8%{?dist}
 URL:		http://www.opalvoip.org/
 License:	MPLv1.0
 Group:		System Environment/Libraries
 
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.10/%{name}-%{version}.tar.xz
 Patch0:		ptlib-fixcamcrash.patch
+Patch1:		ptlib-2.10.10-mga-bison-parameter.patch
 
 BuildRequires:	pkgconfig, expat-devel, flex, bison
 BuildRequires:  alsa-lib-devel, libv4l-devel
@@ -36,6 +37,7 @@ The ptlib-devel package includes the libraries and header files for ptlib.
 %prep
 %setup -q 
 %patch0 -p1 -b .fixcam
+%patch1 -p1 -b .bison
 
 %build
 export CFLAGS="%{optflags} -DLDAP_DEPRECATED"
@@ -57,7 +59,6 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc History.txt ReadMe.txt mpl-1.0.htm
 %attr(755,root,root) %{_libdir}/libpt*.so.*
 %dir %{_libdir}/%{name}-%{version}
@@ -70,7 +71,6 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 %attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/libpt*.so
 %{_includedir}/*
 %{_datadir}/ptlib
@@ -78,6 +78,9 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Sep  1 2014 Peter Robinson <pbrobinson at fedoraproject.org> 2.10.10-8
+- Add patch to fix build against bison3
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.10-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list