mutt 1.5.21 fails to build

[ghost]

Hi,

Looks like mutt fails to build/patch correctly. i've tried applying these patches manually against an uncompressed mutt tarball and everything seems to be fine. Any help would be appreciated.

xxx@digitalkiwi:/opt(master○) » brew -v install --sidebar-patch --trash-patch --with-slang --ignore-thread-patch --pgp-verbose-mime-patch mutt
Homebrew 0.8
==> Downloading ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz
File already downloaded in /Users/xxx/Library/Caches/Homebrew
/usr/bin/tar xf /Users/xxx/Library/Caches/Homebrew/mutt-1.5.21.tar.gz
==> Downloading patches
/usr/bin/curl -f#LA Homebrew 0.8 (Ruby 1.8.7-249; Mac OS X 10.7.1) https://raw.github.com/nedos/mutt-sidebar-patch/master/mutt-sidebar.patch -o 001-homebrew.diff http://patch-tracker.debian.org/patch/series/dl/mutt/1.5.21-5/features/trash-folder -o 002-homebrew.diff http://ben.at.tanjero.com/patches/ignore-thread-1.5.21.patch -o 003-homebrew.diff http://patch-tracker.debian.org/patch/series/dl/mutt/1.5.21-5/features-old/patch-1.5.4.vk.pgp_verbose_mime -o 004-homebrew.diff

################################################################## 100.0%

####### 19.2%

################################################################## 100.0%

6.6%

==> Patching
/usr/bin/patch -f -p1 -i 001-homebrew.diff
patching file Makefile.am
patching file Makefile.in
patching file OPS
patching file buffy.c
patching file buffy.h
patching file color.c
patching file compose.c
patching file curs_main.c
patching file doc/Muttrc
patching file flags.c
patching file functions.h
patching file globals.h
patching file imap/command.c
patching file imap/imap.c
patching file init.h
patching file mailbox.h
patching file mbox.c
patching file menu.c
patching file mutt.h
patching file mutt_curses.h
patching file muttlib.c
patching file mx.c
patching file pager.c
patching file sidebar.c
patching file sidebar.h
/usr/bin/patch -f -p1 -i 002-homebrew.diff
patching file commands.c
patching file flags.c
Hunk #1 succeeded at 67 (offset 2 lines).
Hunk #2 succeeded at 95 (offset 2 lines).
patching file globals.h
Hunk #1 succeeded at 140 with fuzz 1 (offset 1 line).
patching file imap/message.c
patching file init.h
Hunk #1 succeeded at 3211 (offset 16 lines).
patching file mutt.h
Hunk #3 succeeded at 882 (offset 1 line).
patching file muttlib.c
Hunk #1 succeeded at 1563 (offset 48 lines).
patching file mx.c
Hunk #1 succeeded at 791 (offset 15 lines).
Hunk #2 succeeded at 974 (offset 15 lines).
Hunk #3 succeeded at 999 (offset 15 lines).
Hunk #4 succeeded at 1204 (offset 15 lines).
patching file postpone.c
/usr/bin/patch -f -p1 -i 003-homebrew.diff
patching file OPS
Hunk #1 FAILED at 179.
1 out of 1 hunk FAILED -- saving rejects to file OPS.rej
patching file copy.c
patching file curs_main.c
Hunk #1 succeeded at 323 (offset 2 lines).
Hunk #2 succeeded at 336 (offset 2 lines).
Hunk #3 succeeded at 350 (offset 2 lines).
Hunk #4 succeeded at 425 (offset 2 lines).
Hunk #5 succeeded at 1208 (offset 16 lines).
Hunk #6 succeeded at 1508 (offset 16 lines).
Hunk #7 succeeded at 1764 (offset 16 lines).
Hunk #8 succeeded at 1823 (offset 16 lines).
Hunk #9 succeeded at 1854 (offset 16 lines).
patching file flags.c
Hunk #1 succeeded at 271 (offset 19 lines).
patching file functions.h
Hunk #1 succeeded at 167 with fuzz 1.
Hunk #2 succeeded at 219 (offset 5 lines).
patching file hdrline.c
patching file imap/imap.c
patching file imap/message.c
Hunk #3 succeeded at 1056 (offset 2 lines).
Hunk #4 succeeded at 1226 (offset 2 lines).
Hunk #5 succeeded at 1241 (offset 2 lines).
patching file imap/message.h
patching file mailbox.h
Hunk #1 succeeded at 29 with fuzz 2 (offset 1 line).
patching file mbox.c
Hunk #1 succeeded at 1222 (offset 2 lines).
patching file mutt.h
Hunk #2 succeeded at 197 (offset 1 line).
Hunk #3 succeeded at 746 (offset 3 lines).
patching file pager.c
Hunk #1 succeeded at 2297 (offset 9 lines).
patching file parse.c
patching file protos.h
patching file sort.c
patching file thread.c
Error: Failure while executing: /usr/bin/patch -f -p1 -i 003-homebrew.diff
xxx@digitalkiwi:/opt(master○) »

[Sharpie]

It looks like --sidebar-patch and --ignore-thread-patch conflict with each other. Not sure what to do---it will take someone familiar with Mutt to sort this out.

Some questions do come to mind:

• Why so many patches?
• Have these patches been submitted to the upstream project?
• If so, what is the status? Have they been accepted/rejected?

[ghost]

Hi Charlie,

It looks like both patches apply just fine using patch -p0 < file.patch against a 1.5.21 tarball.

The sidebar patch has been rejected upstream, not sure about the ignore thread patch.

[adamv]

These patches may not all be compatible with each other, unfortunately.