From: Matthias Schwarzott Date: Thu, 16 Nov 2006 13:44:57 +0000 (+0000) Subject: Fix crash when no timer is defined and one presses a number key. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b3a390d435a5b4c52659e57a3d7e9aa434cc8ba;p=gentoo.git Fix crash when no timer is defined and one presses a number key. Package-Manager: portage-2.1.2_rc1-r7 --- 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 + +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 +files/vdr-timeline-1.0.141-german.diff, vdr-timeline-1.0.141.ebuild: diff --git a/media-plugins/vdr-timeline/Manifest b/media-plugins/vdr-timeline/Manifest index e73314fe95f9..db1dfa2cfbe7 100644 --- a/media-plugins/vdr-timeline/Manifest +++ b/media-plugins/vdr-timeline/Manifest @@ -21,20 +21,24 @@ AUX vdr-timeline-1.0.141-german.diff 500 RMD160 2ea466efd3f2e8bf6ecc788485cf124e MD5 17e3caf47c683b197a38dccb412b9cfe files/vdr-timeline-1.0.141-german.diff 500 RMD160 2ea466efd3f2e8bf6ecc788485cf124e91b21ac3 files/vdr-timeline-1.0.141-german.diff 500 SHA256 ed2faeb846cf013c9b1689268a3ed0281c0d156851a4152a69ab56bebb64c6a5 files/vdr-timeline-1.0.141-german.diff 500 +AUX vdr-timeline-fix-crash-no-timer.diff 788 RMD160 238b0fb8320557ee072cbd5c7be32381f59f5630 SHA1 688a9be08afaec5de1358f1dfee864c7503da938 SHA256 cb53aa6660d15d6087d44abde403611be7d9d97939d78a55b175df3c8000375c +MD5 117b649572152db470845e3daa5ce8d2 files/vdr-timeline-fix-crash-no-timer.diff 788 +RMD160 238b0fb8320557ee072cbd5c7be32381f59f5630 files/vdr-timeline-fix-crash-no-timer.diff 788 +SHA256 cb53aa6660d15d6087d44abde403611be7d9d97939d78a55b175df3c8000375c files/vdr-timeline-fix-crash-no-timer.diff 788 DIST vdr-timeline-0.9.0.tar.gz 18287 RMD160 aba1567def19cc70601ff45a60a2127361c83c5d SHA1 366df0e3b1dd72b0661198c8e0ee71a8449409bc SHA256 cb48912a83fbf57c8b5fc42d4c992f7cdb3d88bb9b9f7f4e5fd08e32dc7fd369 DIST vdr-timeline-1.0.141.tar.gz 17417 RMD160 84afbd1f014d81f07777e8c5f3b1a8482562d1dc SHA1 d079816c93f33e61c11675c584d4dd641fea6763 SHA256 8f3255ffbf1aaeab22109fa0bfc6a59c22c37323bb31c0efb76fc42118954d0f -EBUILD vdr-timeline-0.9.0-r2.ebuild 978 RMD160 f4adac4abf8664ad942ecc9c6ac7cfddfc5c25ce SHA1 ebce7629cef00c0f3e4ddf0b5473f6c1f04082ca SHA256 6c4bf20499424859de9e40eea340c4f02221e6c7e981e7d4e731085c741ec018 -MD5 c522343c51cf1c13375cb2de7fc1eef5 vdr-timeline-0.9.0-r2.ebuild 978 -RMD160 f4adac4abf8664ad942ecc9c6ac7cfddfc5c25ce vdr-timeline-0.9.0-r2.ebuild 978 -SHA256 6c4bf20499424859de9e40eea340c4f02221e6c7e981e7d4e731085c741ec018 vdr-timeline-0.9.0-r2.ebuild 978 -EBUILD vdr-timeline-1.0.141.ebuild 546 RMD160 f79d9e4d5f6621a8c840d16a45ab655dc94fa328 SHA1 15849e5995e199bc25eecb4aceeb3e0dd708983e SHA256 a4125ee0cc908b5d5a6a908f61afa81ebf87b5e7410a972dfda6f30b4d7efe8b -MD5 9ede6c68001e2bb742c2b863f930e362 vdr-timeline-1.0.141.ebuild 546 -RMD160 f79d9e4d5f6621a8c840d16a45ab655dc94fa328 vdr-timeline-1.0.141.ebuild 546 -SHA256 a4125ee0cc908b5d5a6a908f61afa81ebf87b5e7410a972dfda6f30b4d7efe8b vdr-timeline-1.0.141.ebuild 546 -MISC ChangeLog 1439 RMD160 c6b501bc6fe929701f830853515d93a53c50b832 SHA1 d8fb187aa3c9392e048b79637ca1e20936236d00 SHA256 9efaf681bd164181a7a123bee277e48f4075bc1cebd77d46dc2259eafd1983fe -MD5 0a7abb400e45a5fbc4f9548fbc2be620 ChangeLog 1439 -RMD160 c6b501bc6fe929701f830853515d93a53c50b832 ChangeLog 1439 -SHA256 9efaf681bd164181a7a123bee277e48f4075bc1cebd77d46dc2259eafd1983fe ChangeLog 1439 +EBUILD vdr-timeline-0.9.0-r2.ebuild 1036 RMD160 2fcde77ab86ef1ce4e8fdf75ecb2833dbed2fd8e SHA1 6bb58a3fe475cc97991b7c7dd7f593e4f941f8ab SHA256 12aa073ed9f7a7e40e62207a5290325b344146ac648885b7538a82e62d4df2d5 +MD5 91764ce34d83ef9eb502735cf61b88cd vdr-timeline-0.9.0-r2.ebuild 1036 +RMD160 2fcde77ab86ef1ce4e8fdf75ecb2833dbed2fd8e vdr-timeline-0.9.0-r2.ebuild 1036 +SHA256 12aa073ed9f7a7e40e62207a5290325b344146ac648885b7538a82e62d4df2d5 vdr-timeline-0.9.0-r2.ebuild 1036 +EBUILD vdr-timeline-1.0.141.ebuild 596 RMD160 ccc5099c9c73d82671e65d887c2a443334639d52 SHA1 289dac1783bf9b3eb4eae8584ac3b457eb038b47 SHA256 d2eb89d3023bab89d669883ec8d78e7262bab023e61bab0f3308658f8fb531c1 +MD5 35bc009fe56b7b1b5ab0d1e888253d0e vdr-timeline-1.0.141.ebuild 596 +RMD160 ccc5099c9c73d82671e65d887c2a443334639d52 vdr-timeline-1.0.141.ebuild 596 +SHA256 d2eb89d3023bab89d669883ec8d78e7262bab023e61bab0f3308658f8fb531c1 vdr-timeline-1.0.141.ebuild 596 +MISC ChangeLog 1668 RMD160 1aa290d111d68ee2cf339a9481f5378b0bf9120e SHA1 309469567a13accbc4087bd53a6405e859fff10a SHA256 68b2a0f21bb006363dda9b057527fdb914a68b695198e098b9569199c1c2ebc7 +MD5 bad125b329ed3fbb2c24bd230fff73c0 ChangeLog 1668 +RMD160 1aa290d111d68ee2cf339a9481f5378b0bf9120e ChangeLog 1668 +SHA256 68b2a0f21bb006363dda9b057527fdb914a68b695198e098b9569199c1c2ebc7 ChangeLog 1668 MISC metadata.xml 932 RMD160 ff4c26cf6bc1a3b12a5a6e874d8e940228e0753a SHA1 77f48dad9f496d48651f4ac65ba2914b0ebb5055 SHA256 24d1e8612cfb8bca76fe51eb6347e90dc503342b2b41d4ec8d14b2ea565b32a2 MD5 28047ae9c61e73207c2e16f35fc56c4d metadata.xml 932 RMD160 ff4c26cf6bc1a3b12a5a6e874d8e940228e0753a metadata.xml 932 @@ -48,7 +52,7 @@ SHA256 50c5751a65a42aa607e092974e4863555e6a8be7937e5c614de4b2357d1ef0a2 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFXGR9t2vP6XvVdOcRAs+nAJ9qb53MSiw6NMfZiEaQeU5j0ZINagCgzLAR -ncqGNnNigEowg7YM9b+bARM= -=J0Tv +iD8DBQFFXGtlt2vP6XvVdOcRAtGBAJ4nIgGQwDWXjNGADEd6o2VwSUzWOACcCQNy +iHF6P/UXonQL9E6z2f5vM+s= +=lXR6 -----END PGP SIGNATURE----- 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=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"