[packages/mutt] - update to 1.5.22
draenog
draenog at pld-linux.org
Wed Oct 23 12:20:42 CEST 2013
commit c59ea3a35fcb2a5428e4f56dca0af7c5d89d1ace
Author: Kacper Kornet <draenog at pld-linux.org>
Date: Mon Oct 21 17:02:16 2013 +0100
- update to 1.5.22
autoconf.patch | 13 ---
mutt-cd.signatures_menu.patch | 13 ++-
mutt-db.patch | 10 +--
mutt-forcedotlock.patch | 4 +-
mutt-pl.po-update.patch | 100 +++++++++++------------
mutt-rr.compressed.patch | 4 +-
mutt-sidebar.patch | 180 ++++++++++++++++++++----------------------
mutt-vvv.quote.patch | 8 +-
mutt-xface.patch | 4 +-
mutt.spec | 11 ++-
10 files changed, 161 insertions(+), 186 deletions(-)
---
diff --git a/mutt.spec b/mutt.spec
index d535cef..956d75f 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,13 +28,13 @@ Summary(ru.UTF-8): Почтовая клиентская программа Mutt
Summary(tr.UTF-8): Mutt elektronik posta programı
Summary(uk.UTF-8): Поштова клієнтська програма Mutt
Name: mutt
-Version: 1.5.21
-Release: 12
+Version: 1.5.22
+Release: 0.1
Epoch: 6
License: GPL v2+
Group: Applications/Mail
Source0: ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5: a29db8f1d51e2f10c070bf88e8a553fd
+# Source0-md5: 48267aba1bc53db636777f4a1ec87cb6
Source1: %{name}.desktop
Source2: %{name}.png
Source3: %{name}.1.pl
@@ -67,8 +67,7 @@ Patch22: %{name}-imap_fast_trash.patch
Patch23: %{name}-db.patch
# http://mutt.org.ua/download/
Patch24: %{name}-vvv.nntp.patch
-Patch25: autoconf.patch
-Patch26: format-security.patch
+Patch25: format-security.patch
URL: http://www.mutt.org/
BuildRequires: autoconf >= 2.54
BuildRequires: automake >= 1.6
@@ -179,7 +178,6 @@ Mutt - це невеликий, але потужний повноекранни
%patch23 -p1
%{?with_nntp:%patch24 -p1}
%patch25 -p1
-%patch26 -p1
# force regeneration (manual.sgml is modified by some patches)
%{__rm} doc/{manual*.html,manual.txt}
@@ -278,6 +276,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pixmapsdir}/mutt.png
%{_mandir}/man1/flea.1*
%{_mandir}/man1/mutt*.1*
+%{_mandir}/man1/pgp*.1*
%{_mandir}/man1/smime_keys.1*
%{_mandir}/man5/mmdf.5*
%{_mandir}/man5/muttrc.5*
diff --git a/autoconf.patch b/autoconf.patch
deleted file mode 100644
index 4375ccb..0000000
--- a/autoconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mutt-1.5.21/configure.ac.wiget 2012-09-06 00:15:08.572730635 +0200
-+++ mutt-1.5.21/configure.ac 2012-09-06 00:15:55.529396771 +0200
-@@ -27,10 +27,6 @@ AC_MSG_RESULT($mutt_cv_prefix)
-
- AC_PROG_CC
- AC_ISC_POSIX
--AM_C_PROTOTYPES
--if test "x$U" != "x"; then
-- AC_MSG_ERROR(Compiler not ANSI compliant)
--fi
- AC_PROG_CPP
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
diff --git a/mutt-cd.signatures_menu.patch b/mutt-cd.signatures_menu.patch
index 880004e..186bb94 100644
--- a/mutt-cd.signatures_menu.patch
+++ b/mutt-cd.signatures_menu.patch
@@ -179,7 +179,7 @@ diff -pruN2 mutt-1.3.27.orig/protos.h mutt-1.3.27/protos.h
diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
--- mutt-1.3.27.orig/signature.c Thu Jan 1 01:00:00 1970
+++ mutt-1.3.27/signature.c Wed Jan 23 22:35:32 2002
-@@ -0,0 +1,505 @@
+@@ -0,0 +1,504 @@
+/*
+ * Copyright (C) 2001 Cedric Duval <cedricduval at free.fr>
+ *
@@ -352,11 +352,10 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
+
+ SETCOLOR (MT_COLOR_STATUS);
+ mvaddstr (SIG_DISPLAY_LINES + 1, 0, _("-- Signature"));
-+ BKGDSET (MT_COLOR_STATUS);
++ SETCOLOR (MT_COLOR_STATUS);
+ clrtoeol ();
+
-+ BKGDSET (MT_COLOR_NORMAL);
-+ SETCOLOR (MT_COLOR_NORMAL);
++ NORMAL_COLOR;
+}
+
+static void free_sig_list (SIG_LIST **sigs)
@@ -688,12 +687,12 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
diff -pruN mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES
--- mutt-1.3.27.orig/PATCHES Mon Nov 26 20:16:52 2001
+++ mutt-1.3.27/PATCHES Thu Dec 6 16:27:55 2001
-@@ -1,0 +1 @@
+@@ -1,0 +2 @@
+patch-1.3.27.cd.signatures_menu.2.1
diff --git a/menu.c b/menu.c
--- a/menu.c
+++ b/menu.c
-@@ -642,7 +640,7 @@
+@@ -642,7 +642,7 @@
mutt_error _("No entries.");
}
@@ -702,7 +701,7 @@ diff --git a/menu.c b/menu.c
{
if (menu->current < menu->max - 1)
{
-@@ -653,7 +651,7 @@
+@@ -653,7 +653,7 @@
mutt_error _("You are on the last entry.");
}
diff --git a/mutt-db.patch b/mutt-db.patch
index bdc6889..b5b700f 100644
--- a/mutt-db.patch
+++ b/mutt-db.patch
@@ -1,11 +1,11 @@
--- mutt-1.5.21/configure.ac.orig 2012-04-06 17:33:23.905605556 +0200
+++ mutt-1.5.21/configure.ac 2012-04-07 07:42:20.793977750 +0200
-@@ -989,20 +989,20 @@
+@ -985,20 +985,20 @@
bdbpfx="$bdbpfx $d/$v"
done
done
-- BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-+ BDB_VERSIONS="db-5.3 db-5.2 db-5.1 db-5.0 db-5 db5 db-4.7 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4 db4 db ''"
+- BDB_VERSIONS="db-4 db4 db-5 db5 db-5.2 db5.2 db52 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
++ BDB_VERSIONS="db-5.3 db-5.2 db5.2 db52 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-5 db5 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4 db4 db ''"
AC_MSG_CHECKING([for BerkeleyDB > 4.0])
for d in $bdbpfx; do
BDB_INCLUDE_DIR=""
@@ -24,10 +24,10 @@
CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
- LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l"
+ LIBS="$OLDLIBS $BDB_LIB_L -l$l"
- AC_TRY_LINK([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdlib.h>
#include <db.h>
-@@ -1025,7 +1025,7 @@
+@@ -1021,7 +1021,7 @@
then
AC_MSG_RESULT(yes)
CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
diff --git a/mutt-forcedotlock.patch b/mutt-forcedotlock.patch
index 3c7b4d4..565da4b 100644
--- a/mutt-forcedotlock.patch
+++ b/mutt-forcedotlock.patch
@@ -1,6 +1,6 @@
--- mutt-1.5.15/Makefile.am.orig 2007-06-03 12:32:52.028633000 +0200
+++ mutt-1.5.15/Makefile.am 2007-06-03 13:05:48.801283592 +0200
-@@ -138,9 +138,9 @@
+@@ -154,9 +154,9 @@
rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
fi
@@ -10,6 +10,6 @@
+ if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
+ chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
+ chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
- { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
+ { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
fi
diff --git a/mutt-pl.po-update.patch b/mutt-pl.po-update.patch
index 477d91d..7f35b80 100644
--- a/mutt-pl.po-update.patch
+++ b/mutt-pl.po-update.patch
@@ -9,7 +9,7 @@
# Pre-translation has bean done using PePeSza,
# get it from http://home.elka.pw.edu.pl/~pkolodz2/pepesza.html
#
-@@ -96,18 +98,16 @@
+@@ -97,18 +99,16 @@
msgstr "Zapisz do pliku: "
#: alias.c:361
@@ -28,44 +28,44 @@
-msgstr "B��d podczas pr�by przegl�dania pliku"
+msgstr "B��d podczas przemieszczania po pliku alias�w"
- #: attach.c:113 attach.c:245 attach.c:477 attach.c:973
+ #: attach.c:113 attach.c:245 attach.c:400 attach.c:925
msgid "Can't match nametemplate, continue?"
-@@ -890,12 +890,11 @@
+@@ -902,12 +902,11 @@
- #: crypt-gpgme.c:1286
+ #: crypt-gpgme.c:1276
msgid "aka: "
-msgstr ""
+msgstr "aka: "
- #: crypt-gpgme.c:1297
+ #: crypt-gpgme.c:1287
-#, fuzzy
msgid "created: "
-msgstr "Utworzy� %s?"
+msgstr "utworzony: "
- #: crypt-gpgme.c:1362
+ #: crypt-gpgme.c:1350
msgid "Error getting key information: "
-@@ -906,24 +905,20 @@
+@@ -918,24 +917,20 @@
#. fingerprint and the key validity (which is neither fully or
#. ultimate).
- #: crypt-gpgme.c:1369 crypt-gpgme.c:1384
+ #: crypt-gpgme.c:1357 crypt-gpgme.c:1372
-#, fuzzy
msgid "Good signature from:"
msgstr "Poprawny podpis z�o�ony przez: "
- #: crypt-gpgme.c:1376
+ #: crypt-gpgme.c:1364
-#, fuzzy
msgid "*BAD* signature from:"
-msgstr "Poprawny podpis z�o�ony przez: "
+msgstr "*Z�Y* podpis z�o�ony przez: "
- #: crypt-gpgme.c:1392
+ #: crypt-gpgme.c:1380
-#, fuzzy
msgid "Problem signature from:"
-msgstr "Poprawny podpis z�o�ony przez: "
+msgstr "Problematyczny podpis z�o�ony przez: "
- #: crypt-gpgme.c:1393
+ #: crypt-gpgme.c:1381
-#, fuzzy
msgid " expires: "
-msgstr " aka: "
@@ -73,65 +73,65 @@
#. Note: We don't need a current time output because GPGME avoids
#. such an attack by separating the meta information from the
-@@ -964,9 +959,9 @@
+@@ -976,9 +971,9 @@
"\n"
- #: crypt-gpgme.c:2079
+ #: crypt-gpgme.c:2090
-#, fuzzy, c-format
+#, c-format
msgid "Error extracting key data!\n"
-msgstr "B��d sprawdzania klucza: "
+msgstr "B��d podczas pobierania danych o kluczu!\n"
- #: crypt-gpgme.c:2262
+ #: crypt-gpgme.c:2270
#, c-format
-@@ -1863,9 +1858,8 @@
+@@ -1884,9 +1879,8 @@
msgstr "[-- Typ: %s/%s, Kodowanie: %s, Wielko��: %s --]\n"
- #: handler.c:1204
+ #: handler.c:1279
-#, fuzzy
msgid "One or more parts of this message could not be displayed"
-msgstr "Ostrze�enie: fragment tej wiadomo�ci nie zosta� podpisany."
+msgstr "Ostrze�enie: co najmniej jeden fragment wiadomo�ci nie m�g� by� wy�wietlony"
- #: handler.c:1256
+ #: handler.c:1331
#, c-format
-@@ -1947,7 +1941,6 @@
+@@ -1968,7 +1962,6 @@
msgstr "Nie mo�na otworzy� pliku tymczasowego!"
- #: handler.c:1723
+ #: handler.c:1790
-#, fuzzy
msgid "[-- This is an attachment "
msgstr "[-- Ten za��cznik typu %s/%s "
-@@ -2117,9 +2110,9 @@
+@@ -2138,9 +2131,9 @@
msgstr "Skrzynka zosta�a zamkni�ta"
- #: imap/imap.c:126
+ #: imap/imap.c:125
-#, fuzzy, c-format
+#, c-format
msgid "CREATE failed: %s"
-msgstr "SSL nie powiod�o si�: %s"
+msgstr "Polecenie CREATE nie powiod�o si�: %s"
- #: imap/imap.c:190
+ #: imap/imap.c:189
#, c-format
-@@ -2361,9 +2354,9 @@
+@@ -2383,9 +2376,9 @@
msgstr "%s nie jest ustawiony"
- #: init.c:1909
+ #: init.c:1913
-#, fuzzy, c-format
+#, c-format
msgid "Invalid value for option %s: \"%s\""
-msgstr "Niew�a�ciwy dzie� miesi�ca: %s"
+msgstr "Niew�a�ciwy warto�� dla opcji %s: \"%s\""
- #: init.c:2046
+ #: init.c:2050
#, c-format
-@@ -2527,14 +2520,13 @@
+@@ -2549,14 +2542,13 @@
"Aby zg�osi� b��d, odwied� stron� http://bugs.mutt.org/.\n"
- #: main.c:67
+ #: main.c:69
-#, fuzzy
msgid ""
"Copyright (C) 1996-2009 Michael R. Elkins and others.\n"
@@ -144,15 +144,15 @@
"Program nie jest obj�ty �ADN� gwarancj�; szczeg�y poznasz pisz�c 'mutt -"
"vv'.\n"
"Mutt jest darmowym oprogramowaniem, zapraszamy \n"
-@@ -2542,7 +2534,6 @@
+@@ -2564,7 +2556,6 @@
"vv'.\n"
- #: main.c:73
+ #: main.c:75
-#, fuzzy
msgid ""
"Copyright (C) 1996-2007 Michael R. Elkins <me at mutt.org>\n"
"Copyright (C) 1996-2002 Brandon Long <blong at fiction.net>\n"
-@@ -2556,13 +2547,14 @@
+@@ -2578,13 +2569,14 @@
"Many others not mentioned here contributed code, fixes,\n"
"and suggestions.\n"
msgstr ""
@@ -170,75 +170,75 @@
"\n"
"Wielu innych tw�rc�w, nie wspomnianych tutaj,\n"
"wnios�o wiele nowego kodu, poprawek i sugestii.\n"
-@@ -2603,7 +2595,6 @@
- "1301, USA.\n"
+@@ -2625,7 +2617,6 @@
+ "02110-1301, USA.\n"
- #: main.c:113
+ #: main.c:115
-#, fuzzy
msgid ""
"usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
" mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
-@@ -2735,7 +2726,7 @@
+@@ -2749,7 +2740,7 @@
- #: main.c:852
+ #: main.c:882
msgid "Failed to parse mailto: link\n"
-msgstr ""
+msgstr "Przetwarzanie odno�nika mailto: nie powiod�o si�\n"
- #: main.c:864
+ #: main.c:894
msgid "No recipients specified.\n"
-@@ -2882,9 +2873,8 @@
+@@ -2896,9 +2887,8 @@
msgstr "Sprawdzanie %s..."
- #: mh.c:1332 mh.c:1410
+ #: mh.c:1385 mh.c:1463
-#, fuzzy
msgid "Could not flush message to disk"
-msgstr "Wys�anie listu nie powiod�o si�."
+msgstr "Zapisane wiadomo�ci na dysk nie powiod�o si�."
- #: mh.c:1377
+ #: mh.c:1430
msgid "maildir_commit_message(): unable to set time on file"
-@@ -3012,24 +3002,22 @@
+@@ -3026,24 +3016,22 @@
msgstr "Certyfikat serwera utraci� wa�no��"
- #: mutt_ssl.c:780
+ #: mutt_ssl.c:826
-#, fuzzy
msgid "cannot get certificate subject"
-msgstr "Nie mo�na pobra� certyfikatu z docelowego hosta"
+msgstr "nie mo�na pobra� tytu� certyfikatu"
- #: mutt_ssl.c:790 mutt_ssl.c:799
+ #: mutt_ssl.c:836 mutt_ssl.c:845
-#, fuzzy
msgid "cannot get certificate common name"
-msgstr "Nie mo�na pobra� certyfikatu z docelowego hosta"
+msgstr "nie mo�na pobra� og�lnej nazwy certyfikatu"
- #: mutt_ssl.c:813
+ #: mutt_ssl.c:859
-#, fuzzy, c-format
+#, c-format
msgid "certificate owner does not match hostname %s"
-msgstr "W�a�ciciel certyfikatu nie odpowiada nadawcy."
+msgstr "w�a�ciciel certyfikatu nie zgadza si� z hostem %s"
- #: mutt_ssl.c:854
+ #: mutt_ssl.c:900
-#, fuzzy, c-format
+#, c-format
msgid "Certificate host check failed: %s"
-msgstr "Certyfikat zosta� zapisany"
+msgstr "Weryfikacja hosta certyfikatu nie powiod�a si�: %s"
- #: mutt_ssl.c:932 mutt_ssl_gnutls.c:732
+ #: mutt_ssl.c:978 mutt_ssl_gnutls.c:750
msgid "This certificate belongs to:"
-@@ -3062,7 +3050,7 @@
- #: mutt_ssl.c:875 mutt_ssl_gnutls.c:854
+@@ -3076,7 +3064,7 @@
+ #: mutt_ssl.c:1014 mutt_ssl_gnutls.c:872
#, c-format
msgid "SSL Certificate check (certificate %d of %d in chain)"
-msgstr ""
+msgstr "Weryfikacja certyfikatu SSL (certyfikat %d z %d w �a�cuchu)"
- #: mutt_ssl.c:883 mutt_ssl_gnutls.c:863
+ #: mutt_ssl.c:1022 mutt_ssl_gnutls.c:881
msgid "(r)eject, accept (o)nce, (a)ccept always"
-@@ -4281,7 +4269,7 @@
+@@ -4322,7 +4310,7 @@
#: smtp.c:258
msgid "No from address given"
@@ -247,7 +247,7 @@
#: smtp.c:314
msgid "SMTP session failed: read error"
-@@ -4313,9 +4301,9 @@
+@@ -4350,9 +4338,9 @@
msgstr "Uwierzytelnianie SMTP wymaga SASL"
#: smtp.c:493
diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch
index 11ef6b6..97b6cd2 100644
--- a/mutt-rr.compressed.patch
+++ b/mutt-rr.compressed.patch
@@ -569,7 +569,7 @@ diff -udprP mutt-1.5.19.orig/configure mutt-1.5.19/configure
diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac
--- mutt-1.5.19.orig/configure.ac 2008-11-17 22:15:26.000000000 +0200
+++ mutt-1.5.19/configure.ac 2009-01-06 19:16:04.000000000 +0200
-@@ -789,6 +789,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([
+@@ -807,6 +807,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([
AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ])
fi])
@@ -578,7 +578,7 @@ diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac
+ AC_DEFINE(USE_COMPRESSED,1,[ Define to enable compressed folders support. ])
+ fi])
+
- AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable]),
+ AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of isprint() is unreliable]),
[if test x$enableval = xyes; then
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
diff -udprP mutt-1.5.19.orig/curs_main.c mutt-1.5.19/curs_main.c
diff --git a/mutt-sidebar.patch b/mutt-sidebar.patch
index eb73dfc..fe1f1a9 100644
--- a/mutt-sidebar.patch
+++ b/mutt-sidebar.patch
@@ -162,18 +162,18 @@ diff -urN mutt-1.5.21/compose.c mutt-1.5.21-sidebar/compose.c
-#define W (COLS - HDR_XOFFSET)
+#define W (COLS - HDR_XOFFSET - SidebarWidth)
- static char *Prompts[] =
+ static const char * const Prompts[] =
{
-@@ -112,7 +112,7 @@
- {
- int off = 0;
+@@ -110,7 +110,7 @@
+ static void redraw_crypt_lines (HEADER *msg)
+ {
- mvaddstr (HDR_CRYPT, 0, "Security: ");
+ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: ");
if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
{
-@@ -144,7 +144,7 @@
+@@ -142,7 +142,7 @@
}
clrtoeol ();
@@ -182,16 +182,16 @@ diff -urN mutt-1.5.21/compose.c mutt-1.5.21-sidebar/compose.c
clrtoeol ();
if ((WithCrypto & APPLICATION_PGP)
-@@ -161,7 +161,7 @@
+@@ -159,7 +159,7 @@
&& (msg->security & ENCRYPT)
&& SmimeCryptAlg
&& *SmimeCryptAlg) {
- mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
+ mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
NONULL(SmimeCryptAlg));
- off = 20;
}
-@@ -175,7 +175,7 @@
+ }
+@@ -172,7 +172,7 @@
int c;
char *t;
@@ -200,7 +200,7 @@ diff -urN mutt-1.5.21/compose.c mutt-1.5.21-sidebar/compose.c
if (!chain)
{
-@@ -190,7 +190,7 @@
+@@ -187,7 +187,7 @@
if (t && t[0] == '0' && t[1] == '\0')
t = "<random>";
@@ -209,7 +209,7 @@ diff -urN mutt-1.5.21/compose.c mutt-1.5.21-sidebar/compose.c
break;
addstr (NONULL(t));
-@@ -242,7 +242,7 @@
+@@ -239,7 +239,7 @@
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), addr, 1);
@@ -218,7 +218,7 @@ diff -urN mutt-1.5.21/compose.c mutt-1.5.21-sidebar/compose.c
mutt_paddstr (W, buf);
}
-@@ -252,10 +252,10 @@
+@@ -249,10 +249,10 @@
draw_envelope_addr (HDR_TO, msg->env->to);
draw_envelope_addr (HDR_CC, msg->env->cc);
draw_envelope_addr (HDR_BCC, msg->env->bcc);
@@ -231,16 +231,16 @@ diff -urN mutt-1.5.21/compose.c mutt-1.5.21-sidebar/compose.c
mutt_paddstr (W, fcc);
if (WithCrypto)
-@@ -266,7 +266,7 @@
+@@ -263,7 +263,7 @@
#endif
SETCOLOR (MT_COLOR_STATUS);
- mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
+ mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
- BKGDSET (MT_COLOR_STATUS);
clrtoeol ();
-@@ -304,7 +304,7 @@
+ NORMAL_COLOR;
+@@ -299,7 +299,7 @@
/* redraw the expanded list so the user can see the result */
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), *addr, 1);
@@ -249,16 +249,16 @@ diff -urN mutt-1.5.21/compose.c mutt-1.5.21-sidebar/compose.c
mutt_paddstr (W, buf);
return 0;
-@@ -549,7 +549,7 @@
+@@ -544,7 +544,7 @@
if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
{
mutt_str_replace (&msg->env->subject, buf);
- move (HDR_SUBJECT, HDR_XOFFSET);
+ move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
- clrtoeol ();
if (msg->env->subject)
mutt_paddstr (W, msg->env->subject);
-@@ -566,7 +566,7 @@
+ else
+@@ -562,7 +562,7 @@
{
strfcpy (fcc, buf, fcclen);
mutt_pretty_mailbox (fcc, fcclen);
@@ -303,21 +303,20 @@ diff -urN mutt-1.5.21/curs_main.c mutt-1.5.21-sidebar/curs_main.c
mutt_show_error ();
}
-@@ -554,10 +561,13 @@
+@@ -554,9 +561,12 @@
- if (menu->redraw & REDRAW_STATUS)
+ if ((menu->redraw & REDRAW_STATUS) || update_status_time ())
{
+ DrawFullLine = 1;
menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
+ DrawFullLine = 0;
- CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
+ move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0);
SETCOLOR (MT_COLOR_STATUS);
- BKGDSET (MT_COLOR_STATUS);
+ set_buffystats(Context);
mutt_paddstr (COLS, buf);
- SETCOLOR (MT_COLOR_NORMAL);
- BKGDSET (MT_COLOR_NORMAL);
-@@ -571,7 +581,7 @@
+ NORMAL_COLOR;
+ menu->redraw &= ~REDRAW_STATUS;
+@@ -569,7 +579,7 @@
menu->oldcurrent = -1;
if (option (OPTARROWCURSOR))
@@ -326,7 +325,7 @@ diff -urN mutt-1.5.21/curs_main.c mutt-1.5.21-sidebar/curs_main.c
else if (option (OPTBRAILLEFRIENDLY))
move (menu->current - menu->top + menu->offset, 0);
else
-@@ -1069,6 +1079,7 @@
+@@ -1070,6 +1080,7 @@
menu->redraw = REDRAW_FULL;
break;
@@ -334,7 +333,7 @@ diff -urN mutt-1.5.21/curs_main.c mutt-1.5.21-sidebar/curs_main.c
case OP_MAIN_CHANGE_FOLDER:
case OP_MAIN_NEXT_UNREAD_MAILBOX:
-@@ -1100,7 +1111,11 @@
+@@ -1101,7 +1112,11 @@
{
mutt_buffy (buf, sizeof (buf));
@@ -347,7 +346,7 @@ diff -urN mutt-1.5.21/curs_main.c mutt-1.5.21-sidebar/curs_main.c
{
if (menu->menu == MENU_PAGER)
{
-@@ -1118,6 +1133,7 @@
+@@ -1119,6 +1134,7 @@
}
mutt_expand_path (buf, sizeof (buf));
@@ -355,7 +354,7 @@ diff -urN mutt-1.5.21/curs_main.c mutt-1.5.21-sidebar/curs_main.c
if (mx_get_magic (buf) <= 0)
{
mutt_error (_("%s is not a mailbox."), buf);
-@@ -2208,6 +2224,12 @@
+@@ -2222,6 +2238,12 @@
mutt_what_key();
break;
@@ -585,9 +584,9 @@ diff -urN mutt-1.5.21/menu.c mutt-1.5.21-sidebar/menu.c
#include "mbyte.h"
+#include "sidebar.h"
- #include <string.h>
- #include <stdlib.h>
-@@ -156,7 +157,7 @@
+ extern size_t UngetCount;
+
+@@ -186,7 +187,7 @@
{
char *scratch = safe_strdup (s);
int shift = option (OPTARROWCURSOR) ? 3 : 0;
@@ -596,84 +595,76 @@ diff -urN mutt-1.5.21/menu.c mutt-1.5.21-sidebar/menu.c
mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
s[n - 1] = 0;
-@@ -207,6 +208,7 @@
- char buf[LONG_STRING];
- int i;
+@@ -239,6 +240,7 @@
+ int do_color;
+ int attr;
+ draw_sidebar(1);
for (i = menu->top; i < menu->top + menu->pagelen; i++)
{
if (i < menu->max)
-@@ -217,7 +219,7 @@
- if (option (OPTARROWCURSOR))
- {
- attrset (menu->color (i));
-- CLEARLINE (i - menu->top + menu->offset);
-+ CLEARLINE_WIN (i - menu->top + menu->offset);
+@@ -249,7 +251,7 @@
+ menu_pad_string (buf, sizeof (buf));
- if (i == menu->current)
- {
-@@ -246,14 +248,14 @@
- BKGDSET (MT_COLOR_INDICATOR);
- }
+ ATTRSET(attr);
+- move(i - menu->top + menu->offset, 0);
++ move(i - menu->top + menu->offset, SidebarWidth);
+ do_color = 1;
-- CLEARLINE (i - menu->top + menu->offset);
-+ CLEARLINE_WIN (i - menu->top + menu->offset);
- print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current);
- SETCOLOR (MT_COLOR_NORMAL);
- BKGDSET (MT_COLOR_NORMAL);
- }
- }
+ if (i == menu->current)
+@@ -272,7 +274,7 @@
else
-- CLEARLINE (i - menu->top + menu->offset);
-+ CLEARLINE_WIN (i - menu->top + menu->offset);
+ {
+ NORMAL_COLOR;
+- CLEARLINE(i - menu->top + menu->offset);
++ CLEARLINE_WIN(i - menu->top + menu->offset);
+ }
}
- menu->redraw = 0;
- }
-@@ -268,7 +270,7 @@
+ NORMAL_COLOR;
+@@ -289,7 +291,7 @@
return;
}
- move (menu->oldcurrent + menu->offset - menu->top, 0);
+ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
- SETCOLOR (MT_COLOR_NORMAL);
- BKGDSET (MT_COLOR_NORMAL);
+ ATTRSET(menu->color (menu->oldcurrent));
-@@ -283,13 +285,13 @@
- clrtoeol ();
+ if (option (OPTARROWCURSOR))
+@@ -301,13 +303,13 @@
+ {
menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
menu_pad_string (buf, sizeof (buf));
- move (menu->oldcurrent + menu->offset - menu->top, 3);
+ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
- SETCOLOR (MT_COLOR_NORMAL);
}
/* now draw it in the new location */
-- move (menu->current + menu->offset - menu->top, 0);
-+ move (menu->current + menu->offset - menu->top, SidebarWidth);
- attrset (menu->color (menu->current));
- ADDCOLOR (MT_COLOR_INDICATOR);
- addstr ("->");
-@@ -310,7 +312,7 @@
- attrset (menu->color (menu->current));
- ADDCOLOR (MT_COLOR_INDICATOR);
- BKGDSET (MT_COLOR_INDICATOR);
-- CLEARLINE (menu->current - menu->top + menu->offset);
-+ CLEARLINE_WIN (menu->current - menu->top + menu->offset);
+ SETCOLOR(MT_COLOR_INDICATOR);
+- mvaddstr(menu->current + menu->offset - menu->top, 0, "->");
++ mvaddstr(menu->current + menu->offset - menu->top, SidebarWidth, "->");
+ }
+ else
+ {
+@@ -320,7 +322,7 @@
+ menu_make_entry (buf, sizeof (buf), menu, menu->current);
+ menu_pad_string (buf, sizeof (buf));
+ SETCOLOR(MT_COLOR_INDICATOR);
+- move(menu->current - menu->top + menu->offset, 0);
++ move(menu->current - menu->top + menu->offset, SidebarWidth);
print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
- SETCOLOR (MT_COLOR_NORMAL);
- BKGDSET (MT_COLOR_NORMAL);
-@@ -322,7 +324,7 @@
- {
+ }
+ menu->redraw &= REDRAW_STATUS;
+@@ -332,7 +334,7 @@
char buf[LONG_STRING];
+ int attr = menu->color (menu->current);
- move (menu->current + menu->offset - menu->top, 0);
+ move (menu->current + menu->offset - menu->top, SidebarWidth);
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
-@@ -875,7 +877,7 @@
+@@ -872,7 +874,7 @@
if (option (OPTARROWCURSOR))
@@ -869,7 +860,7 @@ diff -urN mutt-1.5.21/pager.c mutt-1.5.21-sidebar/pager.c
/* FIXME: this should come from lineInfo */
memset(&mbstate, 0, sizeof(mbstate));
-@@ -1745,7 +1747,7 @@
+@@ -1809,7 +1811,7 @@
if ((redraw & REDRAW_BODY) || topline != oldtopline)
{
do {
@@ -878,7 +869,7 @@ diff -urN mutt-1.5.21/pager.c mutt-1.5.21-sidebar/pager.c
curline = oldtopline = topline;
lines = 0;
force_redraw = 0;
-@@ -1758,6 +1760,7 @@
+@@ -1822,6 +1824,7 @@
&QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
lines++;
curline++;
@@ -886,25 +877,26 @@ diff -urN mutt-1.5.21/pager.c mutt-1.5.21-sidebar/pager.c
}
last_offset = lineInfo[curline].offset;
} while (force_redraw);
-@@ -1771,6 +1774,7 @@
+@@ -1834,6 +1837,7 @@
addch ('~');
addch ('\n');
lines++;
+ move(lines + bodyoffset, SidebarWidth);
}
- /* We are going to update the pager status bar, so it isn't
- * necessary to reset to normal color now. */
-@@ -1794,21 +1798,21 @@
+ NORMAL_COLOR;
+
+@@ -1857,22 +1861,22 @@
+ strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str));
+
/* print out the pager status bar */
+- move (statusoffset, 0);
++ move (statusoffset, SidebarWidth);
SETCOLOR (MT_COLOR_STATUS);
- BKGDSET (MT_COLOR_STATUS);
-- CLEARLINE (statusoffset);
-+ CLEARLINE_WIN (statusoffset);
if (IsHeader (extra) || IsMsgAttach (extra))
{
- size_t l1 = COLS * MB_LEN_MAX;
-+ size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
++ size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
size_t l2 = sizeof (buffer);
hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
@@ -918,9 +910,9 @@ diff -urN mutt-1.5.21/pager.c mutt-1.5.21-sidebar/pager.c
- mutt_paddstr (COLS, bn);
+ mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ? buffer : banner);
}
- BKGDSET (MT_COLOR_NORMAL);
- SETCOLOR (MT_COLOR_NORMAL);
-@@ -1819,18 +1823,25 @@
+ NORMAL_COLOR;
+ }
+@@ -1882,16 +1886,23 @@
/* redraw the pager_index indicator, because the
* flags for this message might have changed. */
menu_redraw_current (index);
@@ -934,11 +926,9 @@ diff -urN mutt-1.5.21/pager.c mutt-1.5.21-sidebar/pager.c
- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
+ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SidebarWidth);
SETCOLOR (MT_COLOR_STATUS);
- BKGDSET (MT_COLOR_STATUS);
- mutt_paddstr (COLS, buffer);
+ mutt_paddstr (COLS-SidebarWidth, buffer);
- SETCOLOR (MT_COLOR_NORMAL);
- BKGDSET (MT_COLOR_NORMAL);
+ NORMAL_COLOR;
}
+ /* if we're not using the index, update every time */
@@ -948,7 +938,7 @@ diff -urN mutt-1.5.21/pager.c mutt-1.5.21-sidebar/pager.c
redraw = 0;
if (option(OPTBRAILLEFRIENDLY)) {
-@@ -2756,6 +2765,13 @@
+@@ -2848,6 +2859,13 @@
mutt_what_key ();
break;
diff --git a/mutt-vvv.quote.patch b/mutt-vvv.quote.patch
index 52d0432..00e7c35 100644
--- a/mutt-vvv.quote.patch
+++ b/mutt-vvv.quote.patch
@@ -31,15 +31,15 @@ diff -udprP mutt-1.5.19.orig/handler.c mutt-1.5.19/handler.c
if (istext && s->flags & M_CHARCONV)
{
char *charset = mutt_get_parameter ("charset", b->parameter);
-@@ -1542,7 +1546,7 @@ int mutt_body_handler (BODY *b, STATE *s
+@@ -1617,7 +1621,7 @@ int mutt_body_handler (BODY *b, STATE *s
*/
if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
handler = crypt_pgp_application_pgp_handler;
-- else if (ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
-+ else if (ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
+- else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
++ else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
handler = rfc3676_handler;
else
- plaintext = 1;
+ handler = text_plain_handler;
diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h
--- mutt-1.5.19.orig/init.h 2009-01-05 21:20:53.000000000 +0200
+++ mutt-1.5.19/init.h 2009-01-06 19:40:35.000000000 +0200
diff --git a/mutt-xface.patch b/mutt-xface.patch
index 99f041a..bca5e9f 100644
--- a/mutt-xface.patch
+++ b/mutt-xface.patch
@@ -321,7 +321,7 @@ diff -urp ../MUTT/mutt/muttlib.c mutt/muttlib.c
diff -urp ../MUTT/mutt/pager.c mutt/pager.c
--- ../MUTT/mutt/pager.c 2004-07-18 01:25:28.000000000 +0200
+++ mutt/pager.c 2004-07-21 13:36:34.000000000 +0200
-@@ -1441,6 +1441,66 @@ upNLines (int nlines, struct line_t *inf
+@@ -1527,6 +1527,66 @@ upNLines (int nlines, struct line_t *inf
return cur;
}
@@ -385,7 +385,7 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
+ write(slrnface_fd, "show\n", sizeof "show");
+}
+
- static struct mapping_t PagerHelp[] = {
+ static const struct mapping_t PagerHelp[] = {
{ N_("Exit"), OP_EXIT },
{ N_("PrevPg"), OP_PREV_PAGE },
@@ -1545,6 +1605,9 @@ mutt_pager (const char *banner, const ch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mutt.git/commitdiff/028b4295838829cc0ce3a27d4f1d7c77c4be6e82
More information about the pld-cvs-commit
mailing list