rpms/vdr/devel vdr-1.4.7-gcc43.patch,NONE,1.1 vdr.spec,1.18,1.19

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9100

Modified Files:
	vdr.spec 
Added Files:
	vdr-1.4.7-gcc43.patch 
Log Message:
* Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-8
- Patch to fix build with GCC 4.3's cleaned up C++ headers.


vdr-1.4.7-gcc43.patch:

--- NEW FILE vdr-1.4.7-gcc43.patch ---
diff -up vdr-1.4.7/epg.c~ vdr-1.4.7/epg.c
--- vdr-1.4.7/epg.c~	2006-10-28 12:12:42.000000000 +0300
+++ vdr-1.4.7/epg.c	2008-02-14 19:12:26.000000000 +0200
@@ -12,6 +12,7 @@
 
 #include "epg.h"
 #include <ctype.h>
+#include <limits.h>
 #include <time.h>
 #include "libsi/si.h"
 #include "timers.h"
diff -up vdr-1.4.7/menuitems.h~ vdr-1.4.7/menuitems.h
--- vdr-1.4.7/menuitems.h~	2008-02-14 19:10:06.000000000 +0200
+++ vdr-1.4.7/menuitems.h	2008-02-14 19:12:39.000000000 +0200
@@ -10,6 +10,7 @@
 #ifndef __MENUITEMS_H
 #define __MENUITEMS_H
 
+#include <limits.h>
 #include "osdbase.h"
 
 extern const char *FileNameChars;


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vdr.spec	20 Jan 2008 22:07:12 -0000	1.18
+++ vdr.spec	14 Feb 2008 17:35:08 -0000	1.19
@@ -19,7 +19,7 @@
 
 Name:           vdr
 Version:        1.4.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -54,6 +54,7 @@
 # edited so that it applies on top of the liemikuutio patch (menu.c)
 Patch8:         %{name}-1.4.7-hlcutter-0.2.0.diff
 Patch9:         %{name}-1.4.7-hlcutter-0.2.0-finnish.patch
+Patch10:        %{name}-1.4.7-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -145,6 +146,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Fix up paths
 sed -i \
@@ -449,6 +451,9 @@
 %endif
 
 %changelog
+* Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-8
+- Patch to fix build with GCC 4.3's cleaned up C++ headers.
+
 * Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-7
 - Include Udo Richter's hard link cutter patch v0.2.0 (see README-HLCUTTER).
 - Add some plugins to the default plugin order list in sysconfig.