summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2008-06-20 13:46:44 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2008-06-20 13:46:44 +0000
commit40be10c2a7b910b0176ad5e44f7f5ec5672534b1 (patch)
treecc4053d9cf5401047b5897f3cff3110756cfbe48
parentAdd local git use flag to app-vim/vcscommand (diff)
downloadgentoo-2-40be10c2a7b910b0176ad5e44f7f5ec5672534b1.tar.gz
gentoo-2-40be10c2a7b910b0176ad5e44f7f5ec5672534b1.tar.bz2
gentoo-2-40be10c2a7b910b0176ad5e44f7f5ec5672534b1.zip
Fixed compilation with gcc-4.3.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-tuxonice-r4 i686)
-rw-r--r--media-plugins/vdr-menuorg/ChangeLog6
-rw-r--r--media-plugins/vdr-menuorg/files/vdr-menuorg-0.4.3-gcc43.diff11
-rw-r--r--media-plugins/vdr-menuorg/vdr-menuorg-0.4.3.ebuild4
3 files changed, 19 insertions, 2 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/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\""