patch added; ready for VDR 1.5.x

Package-Manager: portage-2.1.2.2

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index db615f86813d73087cd5579abef8600133103fec..20f03ddd5077905c17305d668ec89faef7f22d5e 100644 (file)
--- 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/Manifest b/media-plugins/vdr-setup/Manifest
index 4b9c677650ac6d285547f561adc7c957380cb173..9e724d2764095ea6d4ef1b7914cb392d778029e1 100644 (file)
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -17,6 +17,10 @@ AUX vdr-setup-0.3.1-timers.diff 312 RMD160 b2493372fed80b88e3793e56934c55ef09f62
 MD5 92ddb2fe7e0e61f6cace4ca8ff84dedd files/vdr-setup-0.3.1-timers.diff 312
 RMD160 b2493372fed80b88e3793e56934c55ef09f624ce files/vdr-setup-0.3.1-timers.diff 312
 SHA256 58e98fd4677aaf80d02082cb9353592ffc445a96e71d9e580cbede5943fa78c0 files/vdr-setup-0.3.1-timers.diff 312
+AUX vdr-setup-0.3.1-vdr-1.5.0.diff 1417 RMD160 8c6f429b2ce5e7ae3ef4c79e359f27747b1c9036 SHA1 47f93638586017507181836d8e005a35ebfa1509 SHA256 8304e6dc8a020194b9997f5aa328f36b8386e4e56ff8e21c6877a44444f1ef72
+MD5 4fd163d23d79833198472719c3ec7cfc files/vdr-setup-0.3.1-vdr-1.5.0.diff 1417
+RMD160 8c6f429b2ce5e7ae3ef4c79e359f27747b1c9036 files/vdr-setup-0.3.1-vdr-1.5.0.diff 1417
+SHA256 8304e6dc8a020194b9997f5aa328f36b8386e4e56ff8e21c6877a44444f1ef72 files/vdr-setup-0.3.1-vdr-1.5.0.diff 1417
 AUX vdr-setup.xml 8338 RMD160 63bb870b9eb21a207d6e5fca47613359b56e3cea SHA1 4083dc2c1a6cb268ccdae1ea2f646a38db5f0f07 SHA256 5860b6d6d4a4cc2756bd5fe8fcc02172e39db523d06717f24edb0aeb498dc0cb
 MD5 13134d72f70ed4077f1783e4b9640e0c files/vdr-setup.xml 8338
 RMD160 63bb870b9eb21a207d6e5fca47613359b56e3cea files/vdr-setup.xml 8338
@@ -26,10 +30,10 @@ EBUILD vdr-setup-0.3.1.ebuild 2082 RMD160 90166ef94d30a63bf4ca2e16f39b4b30f57bd3
 MD5 a7691a03538c7f40e3213742e2b74e95 vdr-setup-0.3.1.ebuild 2082
 RMD160 90166ef94d30a63bf4ca2e16f39b4b30f57bd3b7 vdr-setup-0.3.1.ebuild 2082
 SHA256 282310e08534fc92d6f458da81b9cfb374b7d41f602837ae65a3634dbe299dc2 vdr-setup-0.3.1.ebuild 2082
-MISC ChangeLog 2096 RMD160 9335f8b2e1871c491e2bee2c6a6fa9022e93a0de SHA1 3cb7714879cda51d4207a53931c980c972117074 SHA256 561c85e204b4e16fff55593d98b9b3768f0f1f4992fce6385e83e8a35464bec0
-MD5 20f3b89a91c7982101e2ad00a1b7a866 ChangeLog 2096
-RMD160 9335f8b2e1871c491e2bee2c6a6fa9022e93a0de ChangeLog 2096
-SHA256 561c85e204b4e16fff55593d98b9b3768f0f1f4992fce6385e83e8a35464bec0 ChangeLog 2096
+MISC ChangeLog 2228 RMD160 a5c16392dbf502d03165737c0dbf90ad03d87d01 SHA1 db8d10e010f866fa8dfb0caa0917cfebcf466668 SHA256 0be9e48e4e8aceb29a5723964ef0edd571fc964ab1e2df98f46dd187b5872dd3
+MD5 d59d6837b3e48af55f4eca770a33aa08 ChangeLog 2228
+RMD160 a5c16392dbf502d03165737c0dbf90ad03d87d01 ChangeLog 2228
+SHA256 0be9e48e4e8aceb29a5723964ef0edd571fc964ab1e2df98f46dd187b5872dd3 ChangeLog 2228
 MISC metadata.xml 540 RMD160 cca198c4529623f25ab1009757673485c021c7da SHA1 586e6fd714fc530db6d4ca19cee2de28d19d9a38 SHA256 a9aa7b1d1b97ae4d5656042dbddab1cdfc9092b6acb94114a59eba5b44175233
 MD5 e516803e84d1e9932b498f664b21574d metadata.xml 540
 RMD160 cca198c4529623f25ab1009757673485c021c7da metadata.xml 540
@@ -38,9 +42,10 @@ MD5 2eb323cfb45d45fce4b23731d6fb2381 files/digest-vdr-setup-0.3.1 235
 RMD160 861af167c79ba63649dee0b6828ae1848f2130d3 files/digest-vdr-setup-0.3.1 235
 SHA256 6abec5c30a9726bafb1e37c26c8223a017291f8c5652be51806624b8b5544782 files/digest-vdr-setup-0.3.1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFF8r+m8bi6rjpTunYRAv2MAKCLYmqXFkdp2ou0nr9QQaQdtuBYOgCdHG4p
-KR7jun5naCAzozRSGXQrgmg=
-=tCBo
+iD8DBQFGBuJMdn07HTTCgIoRAkHzAKCd5u9s5SzABbUCHpJULvvpLnJtUQCePZUU
+TGJL8EtoYSNMt6drST+sOOc=
+=07tH
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..4dfeb02
--- /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;