r2109 - in vdr/vdr-plugin-eggtimer/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-03-24 20:39:52 +0000 (Fri, 24 Mar 2006)
New Revision: 2109

Added:
   vdr/vdr-plugin-eggtimer/trunk/debian/patches/
   vdr/vdr-plugin-eggtimer/trunk/debian/patches/00list
   vdr/vdr-plugin-eggtimer/trunk/debian/patches/01_queuemessage.dpatch
Modified:
   vdr/vdr-plugin-eggtimer/trunk/debian/control
   vdr/vdr-plugin-eggtimer/trunk/debian/rules
Log:
added 01_queuemessage.dpatch


Modified: vdr/vdr-plugin-eggtimer/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/control	2006-03-24 19:00:13 UTC (rev 2108)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/control	2006-03-24 20:39:52 UTC (rev 2109)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.41-1)
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.3.41-1)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-eggtimer

Added: vdr/vdr-plugin-eggtimer/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/patches/00list	2006-03-24 19:00:13 UTC (rev 2108)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/patches/00list	2006-03-24 20:39:52 UTC (rev 2109)
@@ -0,0 +1 @@
+01_queuemessage

Added: vdr/vdr-plugin-eggtimer/trunk/debian/patches/01_queuemessage.dpatch
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/patches/01_queuemessage.dpatch	2006-03-24 19:00:13 UTC (rev 2108)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/patches/01_queuemessage.dpatch	2006-03-24 20:39:52 UTC (rev 2109)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_queuemessage.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Quick hack for upstream bug - it's not allowd to use Skins.Message()
+## DP: from within another thread than the main thread
+
+ at DPATCH@
+--- vdr-plugin-eggtimer-0.9.2.orig/background.c
++++ vdr-plugin-eggtimer-0.9.2/background.c
+@@ -71,7 +71,7 @@
+ #if VDRVERSNUM < 10314
+ 			Interface->Error( tr("Eggtimer: could not switch channel") );
+ #else
+-			Skins.Message( mtError, tr("Eggtimer: could not switch channel") );
++			Skins.QueueMessage( mtError, tr("Eggtimer: could not switch channel") );
+ #endif
+ 		    }
+ 		    
+@@ -94,9 +94,7 @@
+ 			usleep( Setup.OSDMessageTime * 1000);
+ 			Interface->Status( NULL );
+ #else
+-			Skins.Message( mtStatus, eggtimer->msg );
+-			cCondWait::SleepMs( Setup.OSDMessageTime * 1000);
+-			Skins.Message( mtStatus, NULL );		
++			Skins.QueueMessage( mtInfo, eggtimer->msg, 0, -1);
+ #endif
+ 			// remember time when message was displayed
+ 			lastInfo = now;
+@@ -116,7 +114,7 @@
+ #if VDRVERSNUM < 10314
+ 			    Interface->Error( tr("Eggtimer: command not found") );
+ #else
+-			    Skins.Message( mtError, tr("Eggtimer: command not found") );
++			    Skins.QueueMessage( mtError, tr("Eggtimer: command not found") );
+ #endif
+ 			leaveLoop = true; // Stop eggtimer thread
+ 		} break;

Modified: vdr/vdr-plugin-eggtimer/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/rules	2006-03-24 19:00:13 UTC (rev 2108)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/rules	2006-03-24 20:39:52 UTC (rev 2109)
@@ -19,7 +19,7 @@
 endif
 
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
-# DPATCH=yes
+DPATCH=yes
 
 ifdef DPATCH
 include /usr/share/dpatch/dpatch.make