From 83f8f2798406ab079ed98afda472ad5b7a89ef2b Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Wed, 3 Jun 2015 23:36:23 +0300 Subject: [PATCH] Updated to 3.11.1 --- .abf.yml | 4 +++- claws-mail-3.11.1-trashed-read.patch | 14 ++++++++++++++ claws-mail-3.7.6-trashed-read.patch | 16 ---------------- claws-mail.spec | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 claws-mail-3.11.1-trashed-read.patch delete mode 100644 claws-mail-3.7.6-trashed-read.patch diff --git a/.abf.yml b/.abf.yml index 7b26767..1885963 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,4 @@ -sources: +removed_sources: claws-mail-3.11.0.tar.xz: 1fc919e7d4357408a04131c4195878ea920de4f0 +sources: + claws-mail-3.11.1.tar.xz: b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc diff --git a/claws-mail-3.11.1-trashed-read.patch b/claws-mail-3.11.1-trashed-read.patch new file mode 100644 index 0000000..63867fa --- /dev/null +++ b/claws-mail-3.11.1-trashed-read.patch @@ -0,0 +1,14 @@ +diff -Naur claws-mail-3.11.1.orig/src/summaryview.c claws-mail-3.11.1/src/summaryview.c +--- claws-mail-3.11.1.orig/src/summaryview.c 2015-06-03 23:35:40.000000000 +0300 ++++ claws-mail-3.11.1/src/summaryview.c 2015-06-03 23:35:40.000000000 +0300 +@@ -4631,6 +4631,10 @@ + summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE); + } + if (!prefs_common.immediate_exec) { ++ if (to_folder->stype == F_TRASH ++ && MSG_IS_UNREAD(msginfo->flags)) { ++ summary_mark_row_as_read(summaryview, row); ++ } + summary_set_row_marks(summaryview, row); + } + diff --git a/claws-mail-3.7.6-trashed-read.patch b/claws-mail-3.7.6-trashed-read.patch deleted file mode 100644 index 953ff0e..0000000 --- a/claws-mail-3.7.6-trashed-read.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Description: feature patch to mark as read mails moved to trash -# Author: Ricardo Mones -diff -ur claws-mail-3.7.6.orig//src/summaryview.c claws-mail-3.7.6//src/summaryview.c ---- claws-mail-3.7.6.orig//src/summaryview.c 2010-02-19 09:10:55.000000000 +0100 -+++ claws-mail-3.7.6//src/summaryview.c 2010-05-05 16:14:14.000000000 +0200 -@@ -4449,6 +4449,10 @@ - summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE); - } - if (!prefs_common.immediate_exec) { -+ if (to_folder->stype == F_TRASH -+ && MSG_IS_UNREAD(msginfo->flags)) { -+ summary_mark_row_as_read(summaryview, row); -+ } - summary_set_row_marks(summaryview, row); - } - diff --git a/claws-mail.spec b/claws-mail.spec index 38b186b..0026ed5 100644 --- a/claws-mail.spec +++ b/claws-mail.spec @@ -6,15 +6,15 @@ Summary: The user-friendly, lightweight and fast GTK2 based email client Name: claws-mail -Version: 3.11.0 -Release: 2 +Version: 3.11.1 +Release: 1 Epoch: 1 License: GPLv3+ Group: Networking/Mail Url: http://www.claws-mail.org Source0: http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.xz # from Debian -Patch0: claws-mail-3.7.6-trashed-read.patch +Patch0: claws-mail-3.11.1-trashed-read.patch BuildRequires: bison BuildRequires: flex BuildRequires: docbook-utils