Bug 51786 – patch to mozilla-thunderbird 0.6-r1 fails to apply

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Wade 2004-05-22 19:35:26 UTC]

>>> Unpacking ipc-1.0.5.tar.gz to /var/tmp/portage/mozilla-thunderbird-0.6-r1/work
crypt
amd64
 * Applying mozilla-thunderbird-amd64.patch...

 * Failed Patch: mozilla-thunderbird-amd64.patch!
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/mozilla-thunderbird-0.6-r1/temp/mozilla-thunderbird-amd64.patch-14293.out


!!! ERROR: net-mail/mozilla-thunderbird-0.6-r1 failed.
!!! Function epatch, Line 322, Exitcode 0
!!! Failed Patch: mozilla-thunderbird-amd64.patch!

And here is the contents of /var/tmp/portage/mozilla-thunderbird-0.6-r1/temp/mozilla-thunderbird-amd64.patch-14293.out

http://www.ii.net/~neroz/mozilla-thunderbird-amd64.patch-14293.out



Reproducible: Always
Steps to Reproduce:




gentoo root # emerge info
Portage 2.0.50-r6 (default-amd64-2004.0, gcc-3.4.0, glibc-2.3.3_pre20040420-r1,
2.6.6-mm4)
=================================================================
System uname: 2.6.6-mm4 x86_64 12
Gentoo Base System version 1.4.15
ccache version 2.3 [enabled]
Autoconf: sys-devel/autoconf-2.59-r3
Automake: sys-devel/automake-1.8.3
ACCEPT_KEYWORDS="amd64"
AUTOCLEAN="yes"
CFLAGS="-O2 -march=athlon64 -pipe -frename-registers -fweb"
CHOST="x86_64-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config
/usr/kde/3.2/share/config /usr/kde/3/share/config /usr/lib/mozilla/defaults/pref
/usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -march=athlon64 -pipe -frename-registers -fweb"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs ccache sandbox"
GENTOO_MIRRORS="ftp://130.95.3.26/mirrors/linux/gentoo/
ftp://ftp.uwa.edu.au/mirrors/linux/gentoo/"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY=""
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X alsa amd64 apm arts avi berkdb bonobo crypt divx4linux encode esd gdbm
gif gnome gpm gtk gtk2 imlib jpeg kde libg++ libwww mikmod mozilla mpeg ncurses
nogcj nptl offensive oggvorbis opengl oss pam pdflib perl png propolice python
qt quicktime readline sdl slang spell ssl tcpd truetype xml2 xmms xv zlib"

[Comment 1 Robert Moss (RETIRED) 2004-05-23 17:00:33 UTC]

Created attachment 31914 [details, diff]
Patch to thunderbird ebuild to fix issue

The patch must be applied from ${WORKDIR}, not ${S}. There are two solutions -
apply the patch from ${WORKDIR}, or modify the patch so it can be applied from
${S}. Which is preferred? I'll rewrite the patch instead if you like, and
attach that.

[Comment 2 Robert Moss (RETIRED) 2004-05-23 17:13:19 UTC]

Created attachment 31915 [details, diff]
Fixed patch to allow application from ${S} instead

Okay, okay so I'm bored! :-P

This patch can be applied from ${S} instead of ${WORKDIR} - this may be
preferable.

However, this isn't a complete solution. Why? Because the patch needs redoing:

Hunk #1 succeeded at 100 with fuzz 2 (offset 13 lines).
Hunk #2 succeeded at 153 with fuzz 2 (offset 26 lines).
Hunk #3 succeeded at 277 (offset 40 lines).
Hunk #4 succeeded at 328 (offset 58 lines).
Hunk #5 FAILED at 425.
Hunk #6 FAILED at 523.
Hunk #7 FAILED at 694.
Hunk #8 succeeded at 964 with fuzz 2 (offset 236 lines).
Hunk #9 FAILED at 1134.

[Comment 3 Aron Griffis (RETIRED) 2004-06-18 08:07:57 UTC]

This is now fixed by refraining to apply the amd64 patch in 0.6 and 0.7 releases in portage.  Thanks for the bug report.