Fixed compilation with gcc-4.3.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-tuxonice-r4 i686

4 files changed, 25 insertions, 7 deletions

diff --git a/media-plugins/vdr-menuorg/ChangeLog b/media-plugins/vdr-menuorg/ChangeLog
index 7ab175c66e82..bf4b968ccf2e 100644
--- a/media-plugins/vdr-menuorg/ChangeLog
+++ b/media-plugins/vdr-menuorg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-menuorg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-menuorg/ChangeLog,v 1.5 2008/06/20 12:50:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-menuorg/ChangeLog,v 1.6 2008/06/20 13:46:43 zzam Exp $
+
+  20 Jun 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-menuorg-0.4.3-gcc43.diff, vdr-menuorg-0.4.3.ebuild:
+  Fixed compilation with gcc-4.3.
 
   20 Jun 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-menuorg-0.3.ebuild,
   vdr-menuorg-0.3.2.ebuild, vdr-menuorg-0.4.3.ebuild:
diff --git a/media-plugins/vdr-menuorg/Manifest b/media-plugins/vdr-menuorg/Manifest
index 18d54fc3d75d..1c3d5ca1d057 100644
--- a/media-plugins/vdr-menuorg/Manifest
+++ b/media-plugins/vdr-menuorg/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX rc-addon.sh 310 RMD160 81e946f8e3c01c5609873b41b0b6b321eb2ab203 SHA1 468e5e76b94607c19167a65d2bc890381982e8a6 SHA256 ef7700c26afc7a18bb54aa2d3195831f890fba0574311ee11d8663f84fd0886e
+AUX vdr-menuorg-0.4.3-gcc43.diff 503 RMD160 9214e7990a8c1812eef4c083cf50c0507ec96795 SHA1 2277700ae1e7c1f5ead8bfe4bc274d99928aaee8 SHA256 0848744dc12c81414b7eebfbd4615823fcceffa919ab4501c4b0c03456786bb3
 DIST vdr-menuorg-0.3.2.tar.gz 20890 RMD160 6033477d10326d42f57040ca82f8d5aa6647e5f9 SHA1 07f0c8fb083d3dc689dae71fd65cc3cbc4b44407 SHA256 18be62595c918e4b945b3033aaaccc792253c7accb051c5dbe0c3c0738003e93
 DIST vdr-menuorg-0.3.tar.gz 20332 RMD160 c03d48d52f2cba9861d0f77fbae4f8a88414ce31 SHA1 2069d1515f820ff105d6afccb0629b36c9e07343 SHA256 31a12bd438e7a33426ce2ec80db704df1d39090adae023c8a69d1e0e243f9321
 DIST vdr-menuorg-0.4.3.tar.gz 26177 RMD160 a6d9b40e5074bb84029bf16063a1d6e9fd9a42e7 SHA1 281ebd0334207de6e0e2d4e4d11f5c335db37026 SHA256 e632eeea03166cebea07000c03997799850e966c98f87d7264f48a9b82842c06
 EBUILD vdr-menuorg-0.3.2.ebuild 880 RMD160 58b29d08b0ebb25ebc8ee0f7751b5f6d7639aeb1 SHA1 8e63c1a77874461d569a19d3a08c2ab0d4e858e3 SHA256 f8f39abb028b095291112a35bf81cdb208ab1011dcbeecc4b45d2dc8321ea9c6
 EBUILD vdr-menuorg-0.3.ebuild 878 RMD160 9b58407298b988fe6136b76950a4cc662f3b40fb SHA1 67327a310e485d87ae4fd579d701cb440b7f8203 SHA256 969b353a7392ee988f0d4709320b2cd8237fa0c03d168bf50dc594f5328aaddc
-EBUILD vdr-menuorg-0.4.3.ebuild 880 RMD160 5dd16c182b25c5d47891b0587a97431a2639718e SHA1 2b905eaac6943d142e81e30f8a6c1b3100e65052 SHA256 36ae871968530849674d0f4d62b0accee0e4301a069372757c9374667722c02f
-MISC ChangeLog 1107 RMD160 cd43e54b3e63c8c051f38ce1e9b027e36034249f SHA1 cae3f151c75e9beeecf6a875c4f1ecb3fc41c419 SHA256 36526a3a17d95397cddfc091df6191294f89235c5c6df9adb3bffd44df45da82
+EBUILD vdr-menuorg-0.4.3.ebuild 921 RMD160 5491b0bed8fbae34e26a68fd97d88a34230b9968 SHA1 dc7f8d8efb262dad3c50be650feb0bc1c009ce92 SHA256 463bc42ef056c4aea24151127308da0d3e07b0f645ca6505d07d803978736e15
+MISC ChangeLog 1260 RMD160 9f7a2582cfefe3c6588778912e38cd99602d65aa SHA1 915aa1edee38440555b32751ea91d75485e4c43b SHA256 b79e5d7b8faff393e4ea47c6a14007250b5c1483f6b347712a1edfe5b26f0fd1
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhbp7gACgkQt2vP6XvVdOfHGQCgjucjOtBNhVo/MaeRz9IHO0Vz
-JpYAoIj2ZAI/FHj0X0S2vV/JyvZjyoiw
-=BXcT
+iEYEARECAAYFAkhbtMkACgkQt2vP6XvVdOcjwgCaAr/SvOXT3l77cjr1Wf3sUptu
+Q8EAnjyl8gwzBamavfktwkcOjkD6ZsXw
+=ccAE
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-menuorg/files/vdr-menuorg-0.4.3-gcc43.diff b/media-plugins/vdr-menuorg/files/vdr-menuorg-0.4.3-gcc43.diff
new file mode 100644
index 000000000000..192d87b5a7e9
--- /dev/null
+++ b/media-plugins/vdr-menuorg/files/vdr-menuorg-0.4.3-gcc43.diff
@@ -0,0 +1,11 @@
+diff -ru menuorg-0.4.3-orig/src/MenuConfigurationRepository.cpp menuorg-0.4.3/src/MenuConfigurationRepository.cpp
+--- menuorg-0.4.3-orig/src/MenuConfigurationRepository.cpp	2008-06-20 15:42:26.363703821 +0200
++++ menuorg-0.4.3/src/MenuConfigurationRepository.cpp	2008-06-20 15:42:31.180893833 +0200
+@@ -24,6 +24,7 @@
+ #include "MenuConfigurationRepository.h"
+ #include <exception>
+ #include <iostream>
++#include <algorithm>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <libxml++/libxml++.h>
diff --git a/media-plugins/vdr-menuorg/vdr-menuorg-0.4.3.ebuild b/media-plugins/vdr-menuorg/vdr-menuorg-0.4.3.ebuild
index 74e18360fd55..fb591903b046 100644
--- a/media-plugins/vdr-menuorg/vdr-menuorg-0.4.3.ebuild
+++ b/media-plugins/vdr-menuorg/vdr-menuorg-0.4.3.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-plugins/vdr-menuorg/vdr-menuorg-0.4.3.ebuild,v 1.2 2008/06/20 12:50:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-menuorg/vdr-menuorg-0.4.3.ebuild,v 1.3 2008/06/20 13:46:43 zzam Exp $
 
 EAPI="1"
 
@@ -19,6 +19,8 @@ DEPEND=">=media-video/vdr-1.5.18
 	dev-cpp/libxmlpp:2.6
 	dev-cpp/glibmm"
 
+PATCHES=("${FILESDIR}/${P}-gcc43.diff")
+
 pkg_setup() {
 	if [[ ! -f /usr/include/vdr/menuorgpatch.h ]]; then
 		eerror "please compile VDR with USE=\"menuorg\""