diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-11-16 13:44:57 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-11-16 13:44:57 +0000 |
| commit | 5fd0fbc2b8c3190b991b08e936819014d017b48f (patch) | |
| tree | 6110b265521fc8f916cee09015fa10006d3cc46f /media-plugins/vdr-timeline | |
| parent | removed cvs indicator (diff) | |
| download | gentoo-2-5fd0fbc2b8c3190b991b08e936819014d017b48f.tar.gz gentoo-2-5fd0fbc2b8c3190b991b08e936819014d017b48f.tar.bz2 gentoo-2-5fd0fbc2b8c3190b991b08e936819014d017b48f.zip | |
Fix crash when no timer is defined and one presses a number key.
(Portage version: 2.1.2_rc1-r7)
Diffstat (limited to 'media-plugins/vdr-timeline')
4 files changed, 34 insertions, 4 deletions
diff --git a/media-plugins/vdr-timeline/ChangeLog b/media-plugins/vdr-timeline/ChangeLog index ffb260c94d9b..eb99bd7146e8 100644 --- a/media-plugins/vdr-timeline/ChangeLog +++ b/media-plugins/vdr-timeline/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-timeline # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/ChangeLog,v 1.8 2006/11/16 13:15:34 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/ChangeLog,v 1.9 2006/11/16 13:44:57 zzam Exp $ + + 16 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> + +files/vdr-timeline-fix-crash-no-timer.diff, vdr-timeline-0.9.0-r2.ebuild, + vdr-timeline-1.0.141.ebuild: + Fix crash when no timer is defined and one presses a number key. 16 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> +files/vdr-timeline-1.0.141-german.diff, vdr-timeline-1.0.141.ebuild: diff --git a/media-plugins/vdr-timeline/files/vdr-timeline-fix-crash-no-timer.diff b/media-plugins/vdr-timeline/files/vdr-timeline-fix-crash-no-timer.diff new file mode 100644 index 000000000000..59ec4a3476f3 --- /dev/null +++ b/media-plugins/vdr-timeline/files/vdr-timeline-fix-crash-no-timer.diff @@ -0,0 +1,22 @@ +diff -ru timeline-1.0.141-orig/checkerOsd.c timeline-1.0.141/checkerOsd.c +--- timeline-1.0.141-orig/checkerOsd.c 2006-11-16 14:39:23.000000000 +0100 ++++ timeline-1.0.141/checkerOsd.c 2006-11-16 14:40:25.000000000 +0100 +@@ -457,6 +457,9 @@ + osd->DrawRectangle(areas[0].x1, areas[0].y1, areas[0].x2, areas[0].y2, clrGray50); + osd->DrawText(x0_graph+width_graph-cFont::GetFont(fontSml)->Width(navtxt),y0_graph,navtxt,clrWhite,clrBlue,cFont::GetFont(fontSml)); + ++ for(int i=0;i<10;i++) ++ quicktimer[i]=NULL; ++ + if (Timers.Count()>0) + { + int graph_border=15; +@@ -501,8 +504,6 @@ + cTimer *ct1; + struct paintdata *pd=new paintdata[2401]; + +- for(int i=0;i<10;i++) +- quicktimer[i]=NULL; + for(int i=0;i<MAXRECORDS;i++) + recordingtimer[i].timer=NULL; + for(int i=0;i<2401;i++) diff --git a/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild b/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild index 9ff53cd7d30c..6150dbda60e0 100644 --- a/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild +++ b/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild,v 1.4 2006/04/17 13:27:55 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-0.9.0-r2.ebuild,v 1.5 2006/11/16 13:44:57 zzam Exp $ inherit vdr-plugin eutils @@ -27,4 +27,6 @@ src_unpack() { has_version ">=media-video/vdr-1.3.32" && epatch ${FILESDIR}/vdr-1.3.32-${P}.diff has_version ">=media-video/vdr-1.3.37" && epatch ${FILESDIR}/vdr-1.3.37-${P}.diff + + epatch ${FILESDIR}/vdr-timeline-fix-crash-no-timer.diff } diff --git a/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild b/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild index 16fb651c74bd..7ab74abc4d3d 100644 --- a/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild +++ b/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild,v 1.2 2006/11/16 13:15:34 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-timeline/vdr-timeline-1.0.141.ebuild,v 1.3 2006/11/16 13:44:57 zzam Exp $ inherit vdr-plugin @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -PATCHES="${FILESDIR}/${P}-german.diff" +PATCHES="${FILESDIR}/${P}-german.diff + ${FILESDIR}/vdr-timeline-fix-crash-no-timer.diff" DEPEND=">=media-video/vdr-1.4.1" |