summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2007-03-25 20:57:38 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2007-03-25 20:57:38 +0000
commit056f3d4f7fdf9d6326f0e804d2e04eee68a70506 (patch)
treec0a73addffa48204a7fa9dca5b898fb4ac053780 /media-plugins/vdr-setup
parentRemove duplicated changelog entry (diff)
downloadgentoo-2-056f3d4f7fdf9d6326f0e804d2e04eee68a70506.tar.gz
gentoo-2-056f3d4f7fdf9d6326f0e804d2e04eee68a70506.tar.bz2
gentoo-2-056f3d4f7fdf9d6326f0e804d2e04eee68a70506.zip
patch added; ready for VDR 1.5.x
(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.diff40
2 files changed, 45 insertions, 1 deletions
diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index db615f86813d..20f03ddd5077 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.12 2007/01/05 16:47:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.13 2007/03/25 20:57:38 hd_brummy Exp $
+
+ 25 Mar 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+ +files/vdr-setup-0.3.1-vdr-1.5.0.diff:
+ patch added; ready for VDR 1.5.x
05 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
vdr-setup-0.3.1.ebuild:
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
new file mode 100644
index 000000000000..4dfeb02c5003
--- /dev/null
+++ b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-vdr-1.5.0.diff
@@ -0,0 +1,40 @@
+fix for shutdown up from vdr-1.5.x
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 25 Mar 2007
+diff -Naur setup-0.3.1.orig/setupmenu.cpp setup-0.3.1/setupmenu.cpp
+--- setup-0.3.1.orig/setupmenu.cpp 2007-03-25 22:02:45.214194576 +0200
++++ setup-0.3.1/setupmenu.cpp 2007-03-25 22:09:43.522111889 +0200
+@@ -11,6 +11,9 @@
+
+ #include <stdlib.h>
+ #include <vdr/menuitems.h>
++#if APIVERSNUM > 10500
++#include <vdr/shutdown.h>
++#endif
+ #include <string>
+
+ #include "setupmenu.h"
+@@ -856,7 +859,11 @@
+ case kYellow:
+ if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?")))
+ {
++#if APIVERSNUM > 10500
++ ShutdownHandler.RequestEmergencyExit()
++#else
+ cThread::EmergencyExit(true);
++#endif
+ return osEnd;
+ }
+ return osContinue;
+@@ -864,7 +871,11 @@
+ case kBlue:
+ if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really reboot?")))
+ {
++#if APIVERSNUM > 10500
++ ShutdownHandler.RequestEmergencyExit();
++#else
+ cThread::EmergencyExit(true);
++#endif
+ system(_config->GetBootLinux());
+ }
+ return osContinue;