re-enable trash variant for mutt-devel 1.5.20

[kuperman@…]

Changeset r47697 for #18439 disabled the trash variant because they had problem applying the patches. I've been unable to duplicate the problem, but created a new patch with current line numbers for 1.5.20 as well as combining the two patches into a single one.

If there are conflicts with other patches, let me know and I'll try to fix things. I'm currently using it with the following configuration:

mutt-devel @1.5.20_0+compress+gdbm+headercache+imap+pop+sasl+smtp+ssl+trash (active)

[nerdling (Jeremy Lavergne)]

We prefer to keep the patches on a per-file basis. You can read more about this ​in the Guide.

[kuperman@…]

Replying to snc@…:

We prefer to keep the patches on a per-file basis. You can read more about this ​in the Guide.

I'm not sure if there is something you'd like me to change. As the guide states, if it is from existing patch files (which it is) or if making the fix requires changes in multiple files (which it does) then it is acceptable. It makes sense to combine the two previous patches into one as there is a dependency between them and the second simply is a small augment to the first. But I'll make whatever changes you feel are needed.

[nerdling (Jeremy Lavergne)]

Cc Me!

[carter.tjoseph@…]

Three separate patches:

patch-1.5.20.cd.purge_message.diff patch-1.5.20.cd.trash_folder.diff patch-1.5.20.macports.mutt-devel_portfile.diff

I haven't tried these with +compress (because that variant seems not to link at present with the other options I use, and I don't use it often). These patches were made by applying the upstream patches (made for 1.5.5) by hand and applying them by hand, so there's not even fuzz. PATCHES file in the source tree removed from both, since nothing uses it at all, and it's just there to create failed hunks. ;)

[mf2k (Frank Schima)]

Committed revision r57238. Thanks!

[kuperman@…]

I'm happy to see forward progress on this finally.

Replying to carter.tjoseph@…:

PATCHES file in the source tree removed from both, since nothing uses it at all, and it's just there to create failed hunks. ;)

My internet sarcasm meter might be broken, so you might already know this, but since you really did take out the changes to the PATCHES file...

Actually the PATCHES file is used to generate one of the source files and is used when you print version info (usually via mutt -v) or report a problem to the mutt developers (by way of muttbug or flea). It's very useful and important to have the patch information included as part of that output.

IMHO, it's not a showstopper to not have it, but really should be added back in.

[mf2k (Frank Schima)]

Cc Me!

[mf2k (Frank Schima)]

Replying to kuperman@…:

IMHO, it's not a showstopper to not have it, but really should be added back in.

I applied your patch in r57536. Let me know if this is a problem.