diff options
| author |   Martin Holzer <mholzer@gentoo.org> | 2004-01-22 22:48:51 +0000 |
|---|---|---|
| committer | Martin Holzer <mholzer@gentoo.org> | 2004-01-22 22:48:51 +0000 |
| commit | 5e6b03ae912f68388647c38ce2c0518d4fa7d019 (patch) | |
| tree | b31f00c762a843ddf358fa48f643528b3d5647e0 /app-admin/gkrellm | |
| parent | Added sed to remove -Werror in src/Makefile (diff) | |
| download | gentoo-2-5e6b03ae912f68388647c38ce2c0518d4fa7d019.tar.gz gentoo-2-5e6b03ae912f68388647c38ce2c0518d4fa7d019.tar.bz2 gentoo-2-5e6b03ae912f68388647c38ce2c0518d4fa7d019.zip | |
fixing patch. Closes =39076
Diffstat (limited to 'app-admin/gkrellm')
| -rw-r--r-- | app-admin/gkrellm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch | 6 | ||||
| -rw-r--r-- | app-admin/gkrellm/files/gkrellm-dotkeep.patch | 48 |
3 files changed, 23 insertions, 37 deletions
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog index 07180a3583cc..ae7427950a5e 100644 --- a/app-admin/gkrellm/ChangeLog +++ b/app-admin/gkrellm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/gkrellm # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.67 2004/01/22 19:10:05 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.68 2004/01/22 22:48:51 mholzer Exp $ + + 23 Jan 2004; Martin Holzer <mholzer@gentoo.org> + files/gkrellm-2.1.24-mail.patch, files/gkrellm-dotkeep.patch: + fixing patch. Closes =39076 *gkrellm-2.1.25 (22 Jan 2004) diff --git a/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch b/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch index 24c821c89d23..835c14128eb0 100644 --- a/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch +++ b/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch @@ -1,6 +1,6 @@ -diff -Naur gkrellm-2.1.24-orig/src/mail.c gkrellm-2.1.24/src/mail.c ---- gkrellm-2.1.24-orig/src/mail.c 2003-12-19 05:57:01.000000000 +0100 -+++ gkrellm-2.1.24/src/mail.c 2004-01-20 16:47:09.000000000 +0100 +diff -Naur src/mail.c.org src/mail.c +--- src/mail.c.org 2003-12-19 05:57:01.000000000 +0100 ++++ src/mail.c 2004-01-20 16:47:09.000000000 +0100 @@ -1376,7 +1378,15 @@ mbox->old_mail_count = 0; while(fgets(buf, sizeof(buf), f)) diff --git a/app-admin/gkrellm/files/gkrellm-dotkeep.patch b/app-admin/gkrellm/files/gkrellm-dotkeep.patch index 835c14128eb0..c370d31e1498 100644 --- a/app-admin/gkrellm/files/gkrellm-dotkeep.patch +++ b/app-admin/gkrellm/files/gkrellm-dotkeep.patch @@ -1,33 +1,15 @@ -diff -Naur src/mail.c.org src/mail.c ---- src/mail.c.org 2003-12-19 05:57:01.000000000 +0100 -+++ src/mail.c 2004-01-20 16:47:09.000000000 +0100 -@@ -1376,7 +1378,15 @@ - mbox->old_mail_count = 0; - while(fgets(buf, sizeof(buf), f)) - { -- if (is_multipart && !in_header) -+ -+ if (is_From_line(mbox, buf)) -+ { -+ mbox->mail_count += 1; -+ in_header = TRUE; -+ marked_read = FALSE; -+ is_multipart = FALSE; -+ } -+ else if (is_multipart && !in_header) - { - /* Skip to last line of multipart mail */ - if (strncmp(buf,mpart_sep,strlen(mpart_sep))==0) -@@ -1387,12 +1397,6 @@ - in_header = FALSE; - mbox->is_internal = FALSE; - } -- else if (is_From_line(mbox, buf)) -- { -- mbox->mail_count += 1; -- in_header = TRUE; -- marked_read = FALSE; -- } - else if (in_header && status_is_old(buf) && !marked_read) - { - mbox->old_mail_count += 1; +diff -Naur src/plugins.c.org src/plugins.c +--- src/plugins.c.org 2003-12-14 02:22:50.000000000 +0100 ++++ src/plugins.c 2004-01-20 15:59:42.625278072 +0100 +@@ -1057,6 +1057,11 @@ + return; + while ((name = (gchar *) g_dir_read_name(dir)) != NULL) + { ++ ++ if (strcmp(name, ".keep") == 0) { ++ continue; ++ } ++ + /* If there's a libtool .la archive, won't want to load this .so + */ + if ( !string_suffix(name, "la") |