Since the fix for bug 458950 landed, builds on FreeBSD are broken: [...] gmake[8]: Entering directory `/work/build/browser/toolkit/mozapps/update/src' gmake[9]: Entering directory `/work/build/browser/toolkit/mozapps/update/src/updater' updater.cpp bspatch.cpp c++ -o bspatch.o [...] /work/src/mozilla/toolkit/mozapps/update/src/updater/bspatch.cpp c++ -o updater.o [...] /work/src/mozilla/toolkit/mozapps/update/src/updater/updater.cpp archivereader.cpp c++ -o archivereader.o -c -I../../../../../dist/system_wrappers -include /work/src/mozilla/config/gcc_hidden.h -DOSTYPE=\"FreeBSD7\" -DOSARCH=FreeBSD -DNS_NO_XPCOM -I/work/src/mozilla/toolkit/mozapps/update/src/updater -I. -I../../../../../dist/include -I../../../../../dist/include/nsprpub -I/work/build/browser/dist/include/nspr -I/work/build/browser/dist/include/nss -I/usr/local/include -fPIC -I/usr/local/include -I/usr/local/include -fno-rtti -fno-exceptions -Wall -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align -Wno-invalid-offsetof -Wno-long-long -pedantic -fno-strict-aliasing -fshort-wchar -pipe -D_THREAD_SAFE -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/atk-1.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/gtk-unix-print-2.0 -DNDEBUG -DTRIMMED -O -I/usr/local/include -I/usr/local/include -DMOZILLA_CLIENT -include ../../../../../mozilla-config.h -Wp,-MD,.deps/archivereader.pp /work/src/mozilla/toolkit/mozapps/update/src/updater/archivereader.cpp /work/src/mozilla/toolkit/mozapps/update/src/updater/updater.cpp: In function 'int copy_file(const char*, const char*)': /work/src/mozilla/toolkit/mozapps/update/src/updater/updater.cpp:465: error: base operand of '->' has non-pointer type 'AutoFile' /work/src/mozilla/toolkit/mozapps/update/src/updater/updater.cpp: In function 'int DoUpdate()': /work/src/mozilla/toolkit/mozapps/update/src/updater/updater.cpp:1529: error: base operand of '->' has non-pointer type 'AutoFile' gmake[9]: *** [updater.o] Error 1 gmake[9]: *** Waiting for unfinished jobs.... gmake[9]: Leaving directory `/work/build/browser/toolkit/mozapps/update/src/updater' gmake[8]: *** [libs] Error 2 [...]

Attaching Thinker's patch from bug 522478. (Thinker, I hope you don't mind :-)

The landing for bug 542222 (changeset 37934:2d873df39b6a) broke the original patch. This one has the path corrected.

Comment on attachment 425627 [details] [diff] [review] patch v2 for unbreaking builds in updater (mozilla-central) This will be fixed by bug 535942 so minusing