Fix compiling vdr-1.4.7 with gcc-4.3.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r1 i686

6 files changed, 43 insertions, 13 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index da2eb3661676..179f1c4c5433 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.120 2008/09/16 18:10:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.121 2008/11/11 12:10:05 zzam Exp $
+
+  11 Nov 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-1.4.7-gcc-4.3.diff, vdr-1.4.7-r10.ebuild, vdr-1.4.7-r11.ebuild,
+  vdr-1.4.7-r12.ebuild:
+  Fix compiling vdr-1.4.7 with gcc-4.3.
 
   16 Sep 2008; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2.ebuild:
   added new ExtPatch-64 version; fix for bug 237583
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 61f796dd56d7..70605ede0fec 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-1.4.7-gcc-4.3.diff 622 RMD160 cf470a13aed458c749b7753c30f62e1159f3782e SHA1 886b4a80a30b1854540a20d309bb7fc8a8137cff SHA256 f37eb867b24a02064c33647f0cc1d1c24f3544e6b7d9d6030634d71f699fbdeb
 AUX vdr-1.4.7-makefile-destdir.diff 1554 RMD160 642ff610a1667d39b55736a6a702eba6e2eba4cf SHA1 f773f63d7aebc59133e4accd36c87bf6feefb189 SHA256 e926ca80b87585d59698c05b48b0464e4e72913c4adfbb912541ebacf58d3d25
 AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536b9441d8dd24370f SHA1 7c195bad6928429fa198bf1788c523b3be837812 SHA256 12411dc054993209967d6e09677733430f3b3d963f565debdaae087bbc89e961
 AUX vdr-1.6.0-dxr3-subtitlehack.diff 758 RMD160 f329bc9a66db93b7b723352412e4b6404318223c SHA1 c796c9062d673b07123bf926717f0d1370a5f4bf SHA256 3c150749a01e70111395854a8741b4de4c0fbef92372fcfcfeaa7c10312e5053
@@ -23,22 +24,21 @@ DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 DIST vdr-extensions-patch-55-atsc.tar.bz2 32793 RMD160 685d9e7a9409a2465e7d8bad3e9a9e72b56f9411 SHA1 68aed71209630ef69b0be0e16a927076b375f3fc SHA256 7889817f005f9640946b4909763e1598f54897152be36064d817fbcab94dac3f
 EBUILD vdr-1.4.6.ebuild 5905 RMD160 25c10566e7a49ff87ef9c65a5294197bb7d9439c SHA1 829636d304c3761cce232948f13680659551fcbe SHA256 702d24c25615a8d6da1cdada8435d67c98db5b75e96129d964fc322104896cfb
-EBUILD vdr-1.4.7-r10.ebuild 9380 RMD160 88d4140f2984b08297cc26a2aaae9220af399dce SHA1 547464a951ef7c1d6141606419557bf148124052 SHA256 5e8ed19032aa0b1d2f56355bf1db07c87b152623b35f4923643d289f867242bc
-EBUILD vdr-1.4.7-r11.ebuild 9425 RMD160 9a701964f457939c07be32f004a4b5fa36194540 SHA1 8ed9b173cec80c0ef317f58dc76e1ba4e07d9363 SHA256 a1ea63bccd94fb7966ccab4a9b3e6dad3126baf09e6f3c9dbaab80ce88dca5b3
-EBUILD vdr-1.4.7-r12.ebuild 9584 RMD160 357fb52d587f7350cacae9f59354c8d5c8fbc261 SHA1 b579daf5fcffac46987f34e00bf7f2112ca56f98 SHA256 d7fbaffb52f4e5b761922d3f0e13bbb8cc57e2a9627a544ac742277469fd6dcb
+EBUILD vdr-1.4.7-r10.ebuild 9417 RMD160 0a09d6539fbaffd60e9e6c5987c4d24a32ad8304 SHA1 edadfb0539e86f8eb2fc401420b47ec80d159e73 SHA256 797eadcf31dcf31331bbc27fbeb7b8576409edf1badd0b5e3b5a8146508cc7da
+EBUILD vdr-1.4.7-r11.ebuild 9470 RMD160 afaecbebc8391c923ea2ebc2bc9c1195ea9362d2 SHA1 dc3db0fda600d0fd3ad821baa47841cf3243dc98 SHA256 00ebe8aed66586a52b0cc608beedd887bd86267658b8ae82b60a16ae0fbda04a
+EBUILD vdr-1.4.7-r12.ebuild 9629 RMD160 7eda5aaec5a45929a67ef4702f6f7bf1ddce8227 SHA1 f6e2fd895503e50b278092e184d86a6d4de8fca9 SHA256 c18a27bef30340b6fad03d15613cf914de0a533ec4c302300aa86e839eaa1d8f
 EBUILD vdr-1.6.0-r1.ebuild 9627 RMD160 10a687fe89372c3146dd4d08188ebe731994f61f SHA1 2a81c3092a64f9ce6a5d18ff0b14213061f5fda9 SHA256 09c6db71c056c9dbce461005646f1874ffaedf12c842a7c5bece36ab55c84e30
 EBUILD vdr-1.6.0-r2.ebuild 9789 RMD160 173130274c5051193dafac74f31a9ffd4608b091 SHA1 64bd4695f47f18f9fb7f7d55a49165ebeb5b9815 SHA256 2991a7a74e09808a6c4942b6ee3e33de50b21d797080eb39e1c8f377cac92db4
 EBUILD vdr-1.6.0.ebuild 9723 RMD160 cee50aa80f6e828b2f30ad04f132e7fa16843ee7 SHA1 5bd44ac51df344d8a5e413ebfe397f3066571b99 SHA256 6f9bdf75b7f3d12b0deec27d9d42234ec7dd6d9dcca4d7e3d5b7ddd4505f1cc2
 EBUILD vdr-1.6.0_p1-r1.ebuild 10159 RMD160 d4b4281498a62e71afca2c18f17157afb00602f8 SHA1 d8e80ca7081099127ad30fd80d25baddf92a95a6 SHA256 7b85b2dd51d06508c9c3a38ec734fa3b5756b16755894c243e777347bb0bcfc0
 EBUILD vdr-1.6.0_p1.ebuild 10059 RMD160 eb16d27043ff95ee6c16ac5e41827e644d7d2ee9 SHA1 749acfd635b6aa02353baa98b32970d5e305b432 SHA256 f611826e4f46c99c3a83c17ac0911d3bb1965d03f7e43858d8e6f06cd5704d0e
 EBUILD vdr-1.6.0_p2.ebuild 10366 RMD160 05f503e01da0e2fee74f4f89c0c204c18cfba701 SHA1 78afedb52bf16d0571cc877e64dc9fe8af62a8d2 SHA256 98453c4453c4c30c79207cead49bcf321bd4c3d63c3fdc5740788301e9085fcb
-MISC ChangeLog 21287 RMD160 e490a70255d4f68b5f40d354085a0cff7512dc76 SHA1 626b86a0ee6e271288d0ae4f9d6bf5fe997a6bd4 SHA256 19bee8e4ab79ea9715c0413bbdbd6816ddfb2dd5d5d4d579ddad335159a1f8d3
+MISC ChangeLog 21477 RMD160 1f5a3bcc105e3e880004bc0a115c305e50d2dff1 SHA1 076acb5cfde4506f5d33393f966688c4a7511cc0 SHA256 c8fc1dd5bcb490bc4ee513ee5facfb3d9c6c78f27bf1cfbf16e9764cac201703
 MISC metadata.xml 5205 RMD160 3a468059284ff27b98b985e39125b1e76f7eba1a SHA1 8ccf03aeffc000134407c599d371d218f188ace1 SHA256 f5b7083efeceef8c8aa0d7d23247e14cacae256668b975a9fdc2f2dd6c6d0221
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIz/aGdn07HTTCgIoRAjLLAKCHEe0jyKJtqKygAOm3Y74qvafGNQCghbaC
-2n1tiCzE6+czWR5SASwVRFU=
-=GWH+
+iEYEARECAAYFAkkZdiUACgkQt2vP6XvVdOc/agCfSz691W1hFM/223lQNhaujXF/
+ljoAoMoV9M+nMRhA9SgFFvPdM2DRWrMR
+=kTLJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-1.4.7-gcc-4.3.diff b/media-video/vdr/files/vdr-1.4.7-gcc-4.3.diff
new file mode 100644
index 000000000000..344ef0628246
--- /dev/null
+++ b/media-video/vdr/files/vdr-1.4.7-gcc-4.3.diff
@@ -0,0 +1,22 @@
+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;
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 053dc066e752..309389ee4ce5 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.7 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.8 2008/11/11 12:10:05 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -191,6 +191,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
 	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
+	epatch "${FILESDIR}"/${P}-gcc-4.3.diff
 
 	sed -i Makefile \
 		-e 's/runvdr//' \
diff --git a/media-video/vdr/vdr-1.4.7-r11.ebuild b/media-video/vdr/vdr-1.4.7-r11.ebuild
index b13d30079d44..a4e9c0d30992 100644
--- a/media-video/vdr/vdr-1.4.7-r11.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.1 2008/06/27 13:09:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.2 2008/11/11 12:10:05 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -191,6 +191,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
 	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
+	epatch "${FILESDIR}"/vdr-1.4.7-gcc-4.3.diff
 
 	sed -i Makefile \
 		-e 's/runvdr//' \
diff --git a/media-video/vdr/vdr-1.4.7-r12.ebuild b/media-video/vdr/vdr-1.4.7-r12.ebuild
index 0eef1ddff402..d389d98aa76a 100644
--- a/media-video/vdr/vdr-1.4.7-r12.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.1 2008/06/29 13:32:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.2 2008/11/11 12:10:05 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -191,6 +191,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
 	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
+	epatch "${FILESDIR}"/vdr-1.4.7-gcc-4.3.diff
 
 	sed -i Makefile \
 		-e 's/runvdr//' \