From a1796c01af37edf7db07c19b6f68fec3fc3c5b99 Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Sun, 1 Apr 2007 12:32:09 +0000 Subject: [PATCH] txpo in 1.5.1 diff fixed Package-Manager: portage-2.1.2.2 --- media-plugins/vdr-mp3ng/ChangeLog | 6 +++++- .../vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff | 2 +- media-plugins/vdr-setup/ChangeLog | 6 +++++- .../vdr-setup/files/vdr-setup-0.3.1-vdr-1.5.0.diff | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog index 4a15878228f6..59661809db51 100644 --- a/media-plugins/vdr-mp3ng/ChangeLog +++ b/media-plugins/vdr-mp3ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-mp3ng # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.10 2007/03/25 21:35:56 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.11 2007/04/01 12:32:09 hd_brummy Exp $ + + 01 Apr 2007; Joerg Bornkessel + files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff: + txpo in 1.5.1 diff fixed 25 Mar 2007; Joerg Bornkessel +files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff, vdr-mp3ng-0.0.1_pre4.ebuild: diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff index 77d1d6e64053..e9c1d8ceb425 100644 --- a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff +++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff @@ -9,7 +9,7 @@ diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/mp3ng.c mp3ng-0.9.13-MKIV-pre3/mp3ng.c if(visible) { delete osd; osd=0; +#if APIVERSNUM > 10500 -+ visible = bigwin = false; ¦ ++ visible=bigwin=false; + SetNeedsFastResponse(visible); +#else needsFastResponse=visible=bigwin=false; 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 + files/vdr-setup-0.3.1-vdr-1.5.0.diff: + txpo in 1.5.1 diff fixed 25 Mar 2007; Joerg Bornkessel +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 -- 2.26.2