diff options
Diffstat (limited to 'games-mud/kmuddy')
| -rw-r--r-- | games-mud/kmuddy/ChangeLog | 9 | ||||
| -rw-r--r-- | games-mud/kmuddy/Manifest | 20 | ||||
| -rw-r--r-- | games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch | 110 | ||||
| -rw-r--r-- | games-mud/kmuddy/kmuddy-0.8.ebuild | 8 |
4 files changed, 134 insertions, 13 deletions
diff --git a/games-mud/kmuddy/ChangeLog b/games-mud/kmuddy/ChangeLog index 0433f97caef4..b4d08952db05 100644 --- a/games-mud/kmuddy/ChangeLog +++ b/games-mud/kmuddy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-mud/kmuddy -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.17 2007/10/14 22:07:04 mr_bones_ Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.18 2008/01/24 05:50:25 mr_bones_ Exp $ + + 24 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org> + +files/kmuddy-0.8-idle-crash.patch, kmuddy-0.8.ebuild: + add patch from Tanktalus@gmail.com to avoid crash on extreme idle time + (bug #206357) 14 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org> +files/kmuddy-0.8-nocrash.patch, kmuddy-0.8.ebuild: diff --git a/games-mud/kmuddy/Manifest b/games-mud/kmuddy/Manifest index 933b9968e51d..d913c1b9436b 100644 --- a/games-mud/kmuddy/Manifest +++ b/games-mud/kmuddy/Manifest @@ -1,3 +1,7 @@ +AUX kmuddy-0.8-idle-crash.patch 3265 RMD160 d18de581108230ee07a5561644af4ee3bbb3a66a SHA1 93f7be5a481a04c225fc7c44d2bfcc9037eca8e7 SHA256 ce50456b1cd323dd82536726ce284c30572a77e14c9313d7a1f0b1f785f40776 +MD5 af10c52db27523436f0dcdf50ec43b27 files/kmuddy-0.8-idle-crash.patch 3265 +RMD160 d18de581108230ee07a5561644af4ee3bbb3a66a files/kmuddy-0.8-idle-crash.patch 3265 +SHA256 ce50456b1cd323dd82536726ce284c30572a77e14c9313d7a1f0b1f785f40776 files/kmuddy-0.8-idle-crash.patch 3265 AUX kmuddy-0.8-nocrash.patch 635 RMD160 af716aed42c584513c57135ded6b3e9cda88df73 SHA1 3e6e9be9ae2ab257204b5128004210403af77b91 SHA256 c76a7cae08710fd163875011111140dc3a6ead94ab18c4d62fe27917aa86410d MD5 7d985be9e396efef5eeb2b1b0d2026a0 files/kmuddy-0.8-nocrash.patch 635 RMD160 af716aed42c584513c57135ded6b3e9cda88df73 files/kmuddy-0.8-nocrash.patch 635 @@ -8,14 +12,14 @@ EBUILD kmuddy-0.7.1.ebuild 444 RMD160 4ad4200f5b058423beb85d9862ef92e2592e5f99 S MD5 4e3e240a28cacdbcf3a6242bdfcf3b11 kmuddy-0.7.1.ebuild 444 RMD160 4ad4200f5b058423beb85d9862ef92e2592e5f99 kmuddy-0.7.1.ebuild 444 SHA256 0cddb349923dd831ff456b178bcb027040d526572c000567a9e89560ee9e2a5c kmuddy-0.7.1.ebuild 444 -EBUILD kmuddy-0.8.ebuild 854 RMD160 8e460c9d1fbc1bd7d73a894b77959d3065f789a4 SHA1 9c05defc80d7642b55f58977816d1311026a906b SHA256 1f3760cd08d3ab1aa3d313ced8c40a60e0c925afd3cc6bf7172a82b66a00639e -MD5 76c819a0c31aa2d851f58d0bea23c80b kmuddy-0.8.ebuild 854 -RMD160 8e460c9d1fbc1bd7d73a894b77959d3065f789a4 kmuddy-0.8.ebuild 854 -SHA256 1f3760cd08d3ab1aa3d313ced8c40a60e0c925afd3cc6bf7172a82b66a00639e kmuddy-0.8.ebuild 854 -MISC ChangeLog 2206 RMD160 632451765572930ee69cffe010b5b0a870a000ca SHA1 93d74c8075a21dacfb19b5806821d42ca7e6f8c2 SHA256 2c868b1fb28a0604068c075a222d9fc946e9c6048a74b0b179483c6dfbc18dc5 -MD5 16af64ce23451a53a5ea96a7ec59bd7b ChangeLog 2206 -RMD160 632451765572930ee69cffe010b5b0a870a000ca ChangeLog 2206 -SHA256 2c868b1fb28a0604068c075a222d9fc946e9c6048a74b0b179483c6dfbc18dc5 ChangeLog 2206 +EBUILD kmuddy-0.8.ebuild 898 RMD160 bd44e604b051dd7557103f51224324b008d0718b SHA1 efcb1627ed4ea29e90a882e361f6ef6920ef8491 SHA256 2e6a310e91c489bc5ed7f947da2231ce1faa7d724e2c60b65b45e12e99ab0d5a +MD5 214197671cad7dd32e238df6df973781 kmuddy-0.8.ebuild 898 +RMD160 bd44e604b051dd7557103f51224324b008d0718b kmuddy-0.8.ebuild 898 +SHA256 2e6a310e91c489bc5ed7f947da2231ce1faa7d724e2c60b65b45e12e99ab0d5a kmuddy-0.8.ebuild 898 +MISC ChangeLog 2408 RMD160 eefb65421c0149842af10b4a75597c4398894b15 SHA1 b6dc511a5bbf5d14b4dc62a35f2bf942a4336af9 SHA256 34a33bd06bb7fd3bc1c55a897daddc37df106d578fc21fa5a0712f15ff2269fe +MD5 4e0eef0aae18d1783b459b7269a08ac6 ChangeLog 2408 +RMD160 eefb65421c0149842af10b4a75597c4398894b15 ChangeLog 2408 +SHA256 34a33bd06bb7fd3bc1c55a897daddc37df106d578fc21fa5a0712f15ff2269fe ChangeLog 2408 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 diff --git a/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch b/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch new file mode 100644 index 000000000000..948676b253c0 --- /dev/null +++ b/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch @@ -0,0 +1,110 @@ +diff -ru kmuddy-0.8/lib/cstatus.cpp kmuddy-0.8.patch/lib/cstatus.cpp +--- kmuddy-0.8/lib/cstatus.cpp 2005-10-19 02:01:52.000000000 -0600 ++++ kmuddy-0.8.patch/lib/cstatus.cpp 2008-01-16 20:06:09.000000000 -0700 +@@ -16,6 +16,9 @@ + * * + ***************************************************************************/ + ++//Sets the size of the status buffer which controls time displayer ++#define status_size 30 ++ + #include "cstatus.h" + + #include <qdatetime.h> +@@ -37,8 +40,8 @@ + + sb->insertItem (" " + i18n ("Off-line") + " ", ID_CONNECTED, 0, true); + sb->insertItem (" ??x?? ", ID_DIMENSION, 0, true); +- sb->insertItem (" 0:00:00 ", ID_TIMER, 0, true); +- sb->insertItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE, 0, true); ++ sb->insertItem (" 00D:00H:00M:00S ", ID_TIMER, 0, true); ++ sb->insertItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE, 0, true); + sb->insertItem ("", ID_VARIABLES); + sb->insertItem ("", ID_PARTIAL); + timerShown = true; +@@ -116,7 +119,7 @@ + if (!timerShown) + { + timerReset (); +- sb->changeItem (" 0:00:00 ", ID_TIMER); ++ sb->changeItem (" 00D:00H:00M:00S ", ID_TIMER); + } + timerShown = true; + } +@@ -138,7 +141,7 @@ + + void cStatus::dimensionsChanged (int x, int y) + { +- char s1[10]; ++ char s1[status_size]; + QString s2; + sprintf (s1, " %dx%d ", x, y); + s2 = s1; +@@ -166,8 +169,8 @@ + conntime = 0; + idletime1 = 0; + if (timerShown) +- sb->changeItem (" 0:00:00 ", ID_TIMER); +- sb->changeItem (" " + i18n ("idle") + " 0:00", ID_IDLE); ++ sb->changeItem (" 00D:00H:00M:00S ", ID_TIMER); ++ sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S", ID_IDLE); + timer1->start (1000); + } + +@@ -175,7 +178,7 @@ + { + sb->changeItem (" " + i18n ("Connected") + " ", ID_CONNECTED); + sb->changeItem ("", ID_PARTIAL); +- sb->changeItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE); ++ sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE); + showMessage (i18n ("Connected.")); + } + +@@ -209,18 +212,19 @@ + idletime1 = 0; + timer1->stop (); + timer1->start (1000); +- sb->changeItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE); ++ sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE); + } + } + + const QString cStatus::connTimeString () + { +- char s1[10]; +- int h = conntime / 3600; ++ char s1[status_size]; ++ int d = conntime / (3600*24); ++ int h = (conntime / 3600) % 24; + int s = conntime % 3600; + int m = s / 60; + s = s % 60; +- sprintf (s1, " %d:%02d:%02d ", h, m, s); ++ sprintf (s1, " %02dD:%02dH:%02dM:%02dS ", d, h, m, s); + QString s2 = s1; + return s2; + } +@@ -246,16 +250,14 @@ + { + ++idletime1; + +- int h, m, s; ++ int d, h, m, s; + s = idletime1 % 60; + m = ((idletime1 - s) / 60) % 60; +- h = (idletime1 - s) / 3600; ++ h = (idletime1 - s) / 3600 % 24; ++ d = (idletime1 - s) / (3600 * 24); + +- char ss[15]; +- if (h > 0) +- sprintf (ss, " %d:%02d:%02d ", h, m, s); +- else +- sprintf (ss, " %d:%02d ", m, s); ++ char ss[status_size]; ++ sprintf (ss, " %02dD:%02dH:%02dM:%02dS ", d, h, m, s); + + sb->changeItem (" " + i18n ("idle") + ss, ID_IDLE); + } +Only in kmuddy-0.8.patch/lib: cstatus.cpp.orig +Only in kmuddy-0.8.patch/lib: cstatus.cpp.rej diff --git a/games-mud/kmuddy/kmuddy-0.8.ebuild b/games-mud/kmuddy/kmuddy-0.8.ebuild index c97a33061104..502684a17268 100644 --- a/games-mud/kmuddy/kmuddy-0.8.ebuild +++ b/games-mud/kmuddy/kmuddy-0.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-0.8.ebuild,v 1.4 2007/10/14 22:07:04 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-0.8.ebuild,v 1.5 2008/01/24 05:50:25 mr_bones_ Exp $ inherit eutils kde-functions @@ -21,7 +21,9 @@ need-kde 3 src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-nocrash.patch" + epatch \ + "${FILESDIR}/${P}-nocrash.patch" \ + "${FILESDIR}/${P}-idle-crash.patch" } src_compile() { |