[packages/mutt] start upgrade to 1.6.0

atler atler at pld-linux.org
Wed Apr 6 22:20:35 CEST 2016 

commit 9b7ff4e7ae64b6a8036923fcb4c9f77e15cd8432
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Apr 6 22:18:42 2016 +0200

    start upgrade to 1.6.0
    
    - commented out pl.po and fast_trash patches
    - dropped Makefile.in diff from sidebar (regenerated by autotools)
    - rel 0.1

 mutt-cd.purge_message.patch |  5 ++--
 mutt-sidebar.patch          | 71 ++-------------------------------------------
 mutt.spec                   | 10 +++----
 3 files changed, 10 insertions(+), 76 deletions(-)
---
diff --git a/mutt.spec b/mutt.spec
index 49fe156..2bf92a5 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,14 +28,14 @@ Summary(ru.UTF-8):	Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.5.24
-Release:	2
+Version:	1.6.0
+Release:	0.1
 Epoch:		6
 License:	GPL v2+
 Group:		Applications/Mail
 # temporarily dead? (Jun 2014)
 Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
-# Source0-md5:	7f25d27f3c7c82285ac07aac35f5f0f2
+# Source0-md5:	d05bb821d7040c61ba89b22d7c2bd388
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
@@ -152,7 +152,7 @@ Mutt - це невеликий, але потужний повноекранни
 
 %prep
 %setup -q
-%patch0 -p1
+#%%patch0 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -174,7 +174,7 @@ Mutt - це невеликий, але потужний повноекранни
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
+#%%patch22 -p1
 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
 %patch25 -p1
diff --git a/mutt-cd.purge_message.patch b/mutt-cd.purge_message.patch
index 9d290b9..9d20e35 100644
--- a/mutt-cd.purge_message.patch
+++ b/mutt-cd.purge_message.patch
@@ -158,7 +158,7 @@ of having a trash folder feature.
  	    mx_close_mailbox (ctx_trash, NULL);
 --- a/pager.c
 +++ b/pager.c
-@@ -2343,12 +2343,15 @@
+@@ -2351,6 +2351,7 @@
  	MAYBE_REDRAW (redraw);
  	break;
  
@@ -166,7 +166,8 @@ of having a trash folder feature.
        case OP_DELETE:
  	CHECK_MODE(IsHeader (extra));
  	CHECK_READONLY;
- 	CHECK_ACL(M_ACL_DELETE, _("delete message"));
+@@ -2358,6 +2359,8 @@
+ 	CHECK_ACL(M_ACL_DELETE, _("Cannot delete message"));
  
  	mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
 +	mutt_set_flag (Context, extra->hdr, M_PURGED,
diff --git a/mutt-sidebar.patch b/mutt-sidebar.patch
index ff5435e..0b02d91 100644
--- a/mutt-sidebar.patch
+++ b/mutt-sidebar.patch
@@ -1002,79 +1002,12 @@
 *** 33,38 ****
 --- 33,39 ----
   	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
-  	score.c send.c sendlib.c signal.c sort.c \
+  	score.c send.c sendlib.c signal.c signature.c sort.c \
   	status.c system.c thread.c charset.c history.c lib.c \
 + 	sidebar.c \
-  	muttlib.c editmsg.c mbyte.c \
+  	muttlib.c editmsg.c mbyte.c mutt_idna.c \
   	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
   
-*** mutt-1.5.24-orig/Makefile.in	2015-08-30 12:24:26.000000000 -0500
---- mutt-1.5.24/Makefile.in	2015-09-16 23:18:13.000000000 -0500
-***************
-*** 83,92 ****
-  	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-  	$(am__configure_deps) $(srcdir)/config.h.in \
-  	$(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
-! 	$(srcdir)/muttbug.sh.in strtok_r.c strcasecmp.c regex.c \
-! 	snprintf.c wcscasecmp.c strcasestr.c setenv.c mkdtemp.c \
-! 	strsep.c strdup.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS \
-! 	README TODO compile config.guess config.sub install-sh missing
-  EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
-  	pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
-  bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
---- 83,92 ----
-  	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-  	$(am__configure_deps) $(srcdir)/config.h.in \
-  	$(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
-! 	$(srcdir)/muttbug.sh.in snprintf.c strtok_r.c regex.c strdup.c \
-! 	strcasecmp.c setenv.c strcasestr.c wcscasecmp.c mkdtemp.c \
-! 	strsep.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS README TODO \
-! 	compile config.guess config.sub install-sh missing
-  EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
-  	pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
-  bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
-***************
-*** 128,136 ****
-  	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
-  	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
-  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-! 	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
-! 	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
-! 	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-  	$(am__objects_1)
---- 128,137 ----
-  	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
-  	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
-  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-! 	history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) \
-! 	muttlib.$(OBJEXT) editmsg.$(OBJEXT) mbyte.$(OBJEXT) \
-! 	url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \
-! 	safe_asprintf.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-  	$(am__objects_1)
-***************
-*** 474,479 ****
---- 475,481 ----
-  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
-  	score.c send.c sendlib.c signal.c sort.c \
-  	status.c system.c thread.c charset.c history.c lib.c \
-+ 	sidebar.c \
-  	muttlib.c editmsg.c mbyte.c \
-  	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
-  
-***************
-*** 804,809 ****
---- 806,812 ----
-  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/send.Po at am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sendlib.Po at am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha1.Po at am__quote@
-+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sidebar.Po at am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signal.Po at am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smime.Po at am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smtp.Po at am__quote@
 *** mutt-1.5.24-orig/mbox.c	2015-08-30 12:06:38.000000000 -0500
 --- mutt-1.5.24/mbox.c	2015-09-16 23:18:13.000000000 -0500
 ***************
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mutt.git/commitdiff/9b7ff4e7ae64b6a8036923fcb4c9f77e15cd8432

More information about the pld-cvs-commit mailing list