Bugzilla Bug 212715

Compile fails. This looks bad:

make[1]: *** [marlett.ttf] Segmentation fault

Hopefully this is the ebuild and not my hardware failing... :/

Full build log attached.

Reproducible: Always

Steps to Reproduce:
emerge =app-emulation/wine-0.9.57 -v

Actual Results:  
....
Missing glyph for char 0e56
Missing glyph for char 0e57
Missing glyph for char 0e58
Missing glyph for char 0e59
Missing glyph for char 0e5a
Missing glyph for char 0e5b
fontforge -script ../fonts/genttf.ff marlett.sfd marlett.ttf
Copyright (c) 2000-2008 by George Williams.
 Executable based on sources from 21:54 GMT 2-Mar-2008.
 Library based on sources from 21:54 GMT 2-Mar-2008.
../tools/widl/widl -I. -I. -I../include -I../include    -h -H hlink.h hlink.idl
make[1]: *** [marlett.ttf] Segmentation fault
make[1]: *** Deleting file `marlett.ttf'
make[1]: Leaving directory
`/var/tmp/portage/app-emulation/wine-0.9.57/work/wine-0.9.57/fonts'
make: *** [fonts] Error 2
make: *** Waiting for unfinished jobs....
../tools/widl/widl -I. -I. -I../include -I../include    -h -H htiframe.h
htiframe.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H iads.h iads.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H icftypes.h
icftypes.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H imnact.h
imnact.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H imnxport.h
imnxport.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H indexsrv.h
indexsrv.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mediaobj.h
mediaobj.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mimeinfo.h
mimeinfo.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mimeole.h
mimeole.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mlang.h mlang.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mmstream.h
mmstream.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mscoree.h
mscoree.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mshtmhst.h
mshtmhst.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H mshtml.h
mshtml.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H msinkaut.h
msinkaut.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H msxml2.h
msxml2.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H netfw.h netfw.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H objsafe.h
objsafe.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H ocmm.h ocmm.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H oleacc.h
oleacc.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H oledb.h oledb.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H optary.h
optary.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H pstore.h
pstore.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H qedit.h qedit.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H richole.h
richole.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H sensevts.h
sensevts.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H shldisp.h
shldisp.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H shobjidl.h
shobjidl.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H shtypes.h
shtypes.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H strmif.h
strmif.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H tom.h tom.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H urlhist.h
urlhist.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H wine/itss.h
wine/itss.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H xmldom.h
xmldom.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H xmldso.h
xmldso.idl
../tools/widl/widl -I. -I. -I../include -I../include    -t -T stdole2.tlb
stdole2.idl
../tools/widl/widl -I. -I. -I../include -I../include    -h -H exdisp.h
exdisp.idl
make[1]: Leaving directory
`/var/tmp/portage/app-emulation/wine-0.9.57/work/wine-0.9.57/include'
 *
 * ERROR: app-emulation/wine-0.9.57 failed.
 * Call stack:
 *               ebuild.sh, line   49:  Called src_compile
 *             environment, line 2392:  Called die
 * The specific snippet of code:
 *       emake all || die "all"
 *  The die message:
 *   all
 *


Expected Results:  
compile wine & run sexy windows binaries.

My flags:

[ebuild     U ] app-emulation/wine-0.9.57 [0.9.56] USE="X alsa cups dbus esd
gecko hal jpeg ldap ncurses opengl oss samba xml -jack -lcms -nas -scanner" 0
kB

I tried a few different -j options, as well as turning distcc off and compiling
locally. I'll test on a few other machines when I get the chance, and maybe run
memtest. Full build log attached.

SmorgPC sounds # emerge --info
Portage 2.1.4.4 (default-linux/x86/2007.0/desktop, gcc-4.2.3, glibc-2.7-r1,
2.6.24-gentoo-r3 i686)
=================================================================
System uname: 2.6.24-gentoo-r3 i686 Intel(R) Pentium(R) 4 CPU 2.40GHz
Timestamp of tree: Sat, 08 Mar 2008 12:30:01 +0000
distcc[26854] (dcc_trace_version) distcc 2.18.3 i686-pc-linux-gnu; built Jan 22
2008 17:16:53 [disabled]
ccache version 2.4 [enabled]
app-shells/bash:     3.2_p33
dev-java/java-config: 1.3.7, 2.1.5
dev-lang/python:     2.5.1-r5
dev-util/ccache:     2.4-r7
sys-apps/baselayout: 1.12.11.1
sys-apps/sandbox:    1.2.18.1-r2
sys-devel/autoconf:  2.13, 2.61-r1
sys-devel/automake:  1.5, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.1, 9999
sys-devel/binutils:  2.18-r1
sys-devel/gcc-config: 1.4.0-r4
sys-devel/libtool:   2.2
virtual/os-headers:  2.6.24
ACCEPT_KEYWORDS="x86 ~x86"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-march=pentium4 -O2 -pipe -fomit-frame-pointer"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config
/usr/kde/3.5/shutdown /usr/kde/4.0/env /usr/kde/4.0/share/config
/usr/kde/4.0/shutdown /usr/share/config"
CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf
/etc/gconf /etc/revdep-rebuild /etc/splash /etc/terminfo /etc/udev/rules.d"
CXXFLAGS="-march=pentium4 -O2 -pipe -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="ccache distlocks metadata-transfer parallel-fetch sandbox sfperms
strict unmerge-orphans userfetch"
GENTOO_MIRRORS="http://gentoo.osuosl.org/ http://gentoo.chem.wisc.edu/gentoo/ "
LINGUAS="en"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress
--force --whole-file --delete --stats --timeout=180 --exclude=/distfiles
--exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/portage/local/layman/sunrise
/usr/portage/local/layman/java-overlay /usr/portage/local/layman/cell
/usr/portage/local/layman/desktop-effects /usr/portage/local/layman"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X acl acpi aiglx alsa alsa-lib berkdb cairo cdr cli cracklib crypt cups
dbus dri dvd dvdr dvdread eds emboss encode esd evo fam ffmpeg firefox flac
fortran fuse gdbm gif gimp glitz gpm gstreamer gtk hal htmlhandbook iconv ipv6
isdnlog java jpeg kde kde4 kerberos ldap mad midi mikmod mmx mp3 mpeg mudflap
ncurses nls nptl nptlonly ogg opengl openmp oss pam pcre pdf perl png ppds pppd
python qt3 qt3support qt4 quicktime readline reflection samba sdl session spell
spl sse sse2 ssl svg tcpd theora tiff truetype tunepimp unicode vorbis
win32codecs x86 xcomposite xine xml xorg xv zlib" ALSA_CARDS="ali5451 als4000
atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938
es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx
via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop
empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi
null plug rate route share shm softvol" APACHE2_MODULES="actions alias
auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm
authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache
dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache
filter headers include info log_config logio mem_cache mime mime_magic
negotiation rewrite setenvif speling status unique_id userdir usertrack
vhost_alias" ELIBC="glibc" INPUT_DEVICES="keyboard mouse" KERNEL="linux"
LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses
text" LINGUAS="en" USERLAND="GNU" VIDEO_CARDS="radeon vesa"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL,
LDFLAGS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

Created an attachment (id=145552) [details]
build log.

I confirm. I get the same segfault.

hummingbird / # emerge --info
Portage 2.1.4.4 (default-linux/amd64/dev/2008.0/desktop, gcc-4.2.3,
glibc-2.7-r1, 2.6.24-hh1 x86_64)
=================================================================
System uname: 2.6.24-hh1 x86_64 AMD Athlon(tm) 64 X2 Dual Core Processor 6000+
Timestamp of tree: Sat, 08 Mar 2008 12:16:01 +0000
app-shells/bash:     3.2_p33
dev-java/java-config: 1.3.7, 2.1.5
dev-lang/python:     2.4.4-r6, 2.5.1-r5
dev-python/pycrypto: 2.0.1-r6
sys-apps/baselayout: 1.12.11.1
sys-apps/sandbox:    1.2.18.1-r2
sys-devel/autoconf:  2.13, 2.61-r1
sys-devel/automake:  1.5, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.1
sys-devel/binutils:  2.18-r1
sys-devel/gcc-config: 1.4.0-r4
sys-devel/libtool:   2.2
virtual/os-headers:  2.6.24
ACCEPT_KEYWORDS="amd64 ~amd64"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=athlon64 -msse3 -O3 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config
/usr/kde/3.5/shutdown /usr/share/config"
CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf
/etc/gconf /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/terminfo
/etc/udev/rules.d"
CXXFLAGS="-march=athlon64 -msse3 -O3 -pipe"
DISTDIR="/var/distfiles"
FEATURES="autoaddcvs collision-protect cvs distlocks metadata-transfer
parallel-fetch sandbox sfperms strict unmerge-orphans userfetch"
GENTOO_MIRRORS="http://distfiles.gentoo.org
http://distro.ibiblio.org/pub/linux/distributions/gentoo"
LANG="en_GB.UTF-8"
LC_ALL="en_GB.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="en_GB"
MAKEOPTS="-j4"
PKGDIR="/var/packages"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress
--force --whole-file --delete --stats --timeout=180 --exclude=/distfiles
--exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/var/repos/berkano /var/repos/pythonhead /var/repos/sunrise
/var/repos/local"
SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
USE="3dnow 3dnowext 7zip S3TC X a52 aac acl acpi aften alsa amd64 aotuv asf ass
avi bash-completion berkdb branding browserplugin bzip2 cairo caps cdda cddb
cdr cli cracklib crypt curl dbus divx dlloader dri dts dv dvd dvdnav dvdr
dvdread encode exif expat fam fastcgi fbcon firefox flac fontconfig fortran ftp
fuse gdbm gif glep glib glibc-compat20 glibc-omitfp glitz gpg gpgme gpm hal
html icecast iconv icq icu id3 id3tag idn image innodb jabber javascript jpeg
kde lame largefile ldap libsamplerate libssh2 libwww libyaml lm_sensors lua lzo
mad matroska midi mikmod mime mixer mmx mmxext mng mod_python mozsvg mp2 mp3
mp4 mp4live mpd mpeg mpeg2 mplayer msn mudflap musepack musicbrainz nano-syntax
ncurses neon nepomuk nls no-old-linux nptl nptlonly nsplugin nvidia offensive
ogg opengl openmp oss pam pcre pdf pdflib perl php png posix python qt3
qt3support qt4 quicktime readline reflection reiser4 replaygain ruby sdl
session spell spl sqlite sqlite3 srt sse sse2 ssl startup-notification
subtitles subversion svg tcpd themes theora threads threadsafe tidy tiff
timezone toolbar trayicon truetype tunepimp twisted unicode upnp usb
userlocales utf8 vim-syntax vim-with-x vorbis vte wav wavpack webdav wifi wma
wmf wmp x264 xcomposite xiph xml xmlreader xmlrpc xmlwriter xorg xsl xslt xv
xvid zip zlib zsh-completion" ALSA_CARDS="hda-intel usb-audio"
ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file
hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route
share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias
authn_anon authn_dbm authn_default authn_file authz_dbm authz_default
authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs
dav_lock deflate dir disk_cache env expires ext_filter file_cache filter
headers include info log_config logio mem_cache mime mime_magic negotiation
rewrite setenvif speling status unique_id userdir usertrack vhost_alias"
ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux"
LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses
text" LINGUAS="en_GB" USERLAND="GNU" VIDEO_CARDS="fbdev nv nvidia vesa"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, PORTAGE_COMPRESS,
PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

I had the same... Downgrading fontforge have resolve problem.

I confirm (again). This wine version compiles and installs fine with
fontforge-20080203.

Yes, downgrading fontforge allows wine to compile but I find it odd that I
cannot successfully mask fontforge-20080203. The line
"=media-gfx/fontforge-20080203" in package.mask is completely ignored when
doing an "emerge -uDav world", which wants to reinstall the borked package.
Other packages seem to mask just fine.

(In reply to comment #5)
> The line
> "=media-gfx/fontforge-20080203" in package.mask is completely ignored when
> doing an "emerge -uDav world", which wants to reinstall the borked package.

20080203 is the version you want. You need to mask
=media-gfx/fontforge-20080302.

(In reply to comment #6)
> 20080203 is the version you want. You need to mask
> =media-gfx/fontforge-20080302.

? I don't want 20080203 - wine dowsn't compile with it - that's why I'm masking
it in package.mask, but portage doesn't care. it wants to install it anyway. 

*** Bug 212758 has been marked as a duplicate of this bug. ***

I think this should be renamed to be a bug against
media-gfx/fontforge-20080302, not wine, since it is a segfault in fontforge
which may also affect other packages. (And probably also happens with other
versions of wine, too.)

(In reply to comment #7)
> (In reply to comment #6)
> > 20080203 is the version you want. You need to mask
> > =media-gfx/fontforge-20080302.
> 
> ? I don't want 20080203 - wine doesn't compile with it -
Then that is another bug and should be handled seperately...

(In reply to comment #5)
> Yes, downgrading fontforge allows wine to compile but I find it odd that I
> cannot successfully mask fontforge-20080203. The line
> "=media-gfx/fontforge-20080203" in package.mask is completely ignored when
> doing an "emerge -uDav world", which wants to reinstall the borked package.
> Other packages seem to mask just fine.

No offense intended but being dyslexic myself I must ask are you sure you are
not confusing 20080302 (which is borked and should be masked) with 20080203
which compiles wine on every system I've tried? I did a double take myself
since the day and month are reversed in the two versions.

(In reply to comment #10)
> No offense intended but being dyslexic myself I must ask are you sure you are
> not confusing 20080302 (which is borked and should be masked) with 20080203
> which compiles wine on every system I've tried? I did a double take myself
> since the day and month are reversed in the two versions.

Yes, that was the case. 

i had the same problem, compiling fontforge with -O0 fixed it (-O1 didn't work,
the same segfault)

*** Bug 212906 has been marked as a duplicate of this bug. ***

Confirming on ~amd64 here.

CFLAGS="-O0" emerge -v fontforge && emerge wine
solved it for me, thanks! :)

Cheers! /Charlie

(In reply to comment #14)
> Confirming on ~amd64 here.
> 
> CFLAGS="-O0" emerge -v fontforge && emerge wine
> solved it for me, thanks! :)
> 
> Cheers! /Charlie
> 

Doesn't work for me.

(In reply to comment #14)
> Confirming on ~amd64 here.
> 
> CFLAGS="-O0" emerge -v fontforge && emerge wine
> solved it for me, thanks! :)

Worked for me as well on ~amd64.

Sébastien, are you sure you're emerging media-gfx/fontforge-20080302?  Are you
per chance on x86 instead?

Also, it appears that the offending version of fontforge has been hard masked.
from /usr/portage/profiles/package.mask: 
# Doug Goldstein <cardoe@gentoo.org> (10 Mar 2008)
# masked for bug #212715 until the issue can be
# resolved
=media-gfx/fontforge-20080302

> Sébastien, are you sure you're emerging media-gfx/fontforge-20080302?  Are you
> per chance on x86 instead?
> 
> Also, it appears that the offending version of fontforge has been hard masked.
> from /usr/portage/profiles/package.mask: 
> # Doug Goldstein <cardoe@gentoo.org> (10 Mar 2008)
> # masked for bug #212715 until the issue can be
> # resolved
> =media-gfx/fontforge-20080302
>


Yes, by chance, I'm on x86 and yes, I tried to emerge wine-0.9.57 with
fontforge-20080302, and with and without -O0 ( I even tried with
MAKEOPTS="-j1").

After I downgarded to fontconfig-20080203, wine-0.9.57 compiled fine.  

Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0xb749a6c0 (LWP 28998)]
_IO_ferror (fp=0x1) at ferror.c:37
37        _IO_flockfile (fp);
(gdb) bt
#0  _IO_ferror (fp=0x1) at ferror.c:37
#1  0xb7eae9ce in ttfcopyfile (ttf=0x8399c70, other=0x1, pos=60, 
    tab_name=0xb7f2754c "cmap-applecjk") at tottf.c:564
#2  0xb7eb3630 in dumpcmap (at=0xbfe3b88c, sf=0x836ca98, 
    format=<value optimized out>) at tottf.c:4837
#3  0xb7eb9aa2 in initTables (at=0xbfe3b88c, sf=0x836ca98, format=ff_ttfsym, 
    bsizes=0x0, bf=bf_none, flags=32) at tottf.c:5279
#4  0xb7ebbf60 in _WriteTTFFont (ttf=0x836eff8, sf=0x836ca98, format=ff_ttf, 
    bsizes=0x0, bf=bf_none, flags=32, map=0x836dde8, layer=1) at tottf.c:5902
#5  0xb7ebc5d0 in WriteTTFFont (fontname=0x836ef80 "marlett.ttf", 
    sf=0x836ca98, format=ff_ttf, bsizes=0x0, bf=bf_none, flags=32, 
    map=0x836dde8, layer=1) at tottf.c:5930
#6  0xb7dcbf70 in _DoSave (sf=0x836ca98, newname=0x836ef80 "marlett.ttf", 
    sizes=0x0, res=-1, map=0x836dde8, subfontdefinition=0x0, layer=1)
    at savefont.c:819
#7  0xb7dcd918 in GenerateScript (sf=0x836ca98, 
    filename=0x836ef80 "marlett.ttf", bitmaptype=0x833b1f8 "ttf", fmflags=0, 
    res=-1, subfontdefinition=0x0, sfs=0x0, map=0x836dde8, rename_to=0x0, 
    layer=1) at savefont.c:1238
#8  0xb7ddff74 in bGenerate (c=0xbfe3c544) at scripting.c:1792
#9  0xb7de98b4 in docall (c=0xbfe3cce0, name=0xbfe3c8b7 "Generate", 
    val=0xbfe3cc84) at scripting.c:8482
#10 0xb7dea82e in term (c=0xbfe3cce0, val=0x0) at scripting.c:8566
#11 0xb7debd5e in mul (c=0x0, val=0x0) at scripting.c:8943
#12 0xb7debf9f in add (c=0x0, val=0x0) at scripting.c:8988
#13 0xb7dec4be in comp (c=0x0, val=0x0) at scripting.c:9063
#14 0xb7dec76c in _and (c=0xbfe3cce0, val=0x0) at scripting.c:9106
#15 0xb7dec941 in assign (c=0xbfe3cce0, val=0xbfe3cc84) at scripting.c:9137
#16 0xb7ded106 in ff_statement (c=0xbfe3cce0) at scripting.c:9247
#17 0xb7dedebc in ProcessNativeScript (argc=5, argv=0xbfe3d5f4, 
    script=0x833e088) at scripting.c:9564
#18 0xb7dee6cf in CheckIsScript (argc=5, argv=0xbfe3d5f4) at scripting.c:9652
#19 0x08192802 in main (argc=5, argv=0xbfe3d5f4) at startui.c:566

Created an attachment (id=145872) [details]
Stack trace

Created an attachment (id=145873) [details]
marlett.patch

Obvious patch.  Do we have an upstream?

Thanks Ed.  Upstream has fixed this in a slightly different way, which I'm
testing now.

Fixed.