summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2007-04-01 12:31:05 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2007-04-01 12:31:05 +0000
commit94d7dfab9d0276ae472fc761d90d5f087f03d7d5 (patch)
tree7692ec00ddd7634d6a33ab0665c3fcf8e5801c3a /media-plugins/vdr-setup
parentdep fix (diff)
downloadgentoo-2-94d7dfab9d0276ae472fc761d90d5f087f03d7d5.tar.gz
gentoo-2-94d7dfab9d0276ae472fc761d90d5f087f03d7d5.tar.bz2
gentoo-2-94d7dfab9d0276ae472fc761d90d5f087f03d7d5.zip
txpo in 1.5.1 diff fixed
(Portage version: 2.1.2.2)
Diffstat (limited to 'media-plugins/vdr-setup')
-rw-r--r--media-plugins/vdr-setup/ChangeLog6
-rw-r--r--media-plugins/vdr-setup/files/vdr-setup-0.3.1-vdr-1.5.0.diff2
2 files changed, 6 insertions, 2 deletions
diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index 20f03ddd5077..2f572dcf9db9 100644
--- a/media-plugins/vdr-setup/ChangeLog
+++ b/media-plugins/vdr-setup/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/vdr-setup
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.13 2007/03/25 20:57:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.14 2007/04/01 12:31:05 hd_brummy Exp $
+
+ 01 Apr 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+ files/vdr-setup-0.3.1-vdr-1.5.0.diff:
+ txpo in 1.5.1 diff fixed
25 Mar 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+files/vdr-setup-0.3.1-vdr-1.5.0.diff:
diff --git a/media-plugins/vdr-setup/files/vdr-setup-0.3.1-vdr-1.5.0.diff b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-vdr-1.5.0.diff
index 4dfeb02c5003..1bd1d3f8bbed 100644
--- a/media-plugins/vdr-setup/files/vdr-setup-0.3.1-vdr-1.5.0.diff
+++ b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-vdr-1.5.0.diff
@@ -19,7 +19,7 @@ diff -Naur setup-0.3.1.orig/setupmenu.cpp setup-0.3.1/setupmenu.cpp
if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?")))
{
+#if APIVERSNUM > 10500
-+ ShutdownHandler.RequestEmergencyExit()
++ ShutdownHandler.RequestEmergencyExit();
+#else
cThread::EmergencyExit(true);
+#endif