Date: Fri, 11 Jan 2013 11:15:17 +0100 From: Emanuel Haupt <ehaupt@critical.ch> To: Andrey Chernov <ache@FreeBSD.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, Florian Smeets <flo@FreeBSD.org>, ports-committers@FreeBSD.org Subject: Re: svn commit: r310217 - in head/www: firefox/files seamonkey/files Message-ID: <20130111111517.8e45b0cad0a3d3391ebf703c@critical.ch> In-Reply-To: <50EFCAD4.3050201@freebsd.org> References: <201301110715.r0B7Fw5p008173@svn.freebsd.org> <50EFCAD4.3050201@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Andrey Chernov <ache@FreeBSD.org> wrote: > On 11.01.2013 11:15, Florian Smeets wrote: > > Log: > > Fix patching by restoring the original expanded $FreeBSD... $ > > value in a patch file and set fbsd:nokeywords property on these > > files to prevent expansion by svn. > > Thanks, but now another patch fails: > > ===> Applying FreeBSD patches for firefox-18.0,1 > 1 out of 1 hunks failed--saving rejects to > media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp.rej > => Patch > patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp > failed to apply cleanly. > => Patch(es) patch-alsapulse patch-browser-app-nsBrowserApp.cpp > patch-bug685258 patch-bug722975 patch-bug732340 patch-bug778078 > patch-bug781457 patch-bug783463 patch-bug783505 patch-bug787804 > patch-bug788955 patch-bug791305 patch-bug798354 patch-bug800401 > patch-bug806139 patch-bug807492 patch-bug815025 patch-bug817481 > patch-bug826985 patch-bug828003 patch-build-pgo-profileserver.py > patch-clang32-libc++-visibility-hack patch-config-baseconfig.mk > patch-content-base-src-nsTextFragmentImpl.h > patch-content-media-nsAudioStream.cpp > patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp > patch-ipc-chromium-Makefile.in > patch-ipc-chromium-src-base-message_pump_libevent.cc > patch-ipc-chromium-src-base-platform_thread_posix.cc > patch-js-src-js-confdefs.h.in patch-js-src-methodjit-MethodJIT.cpp > patch-media-libsydneyaudio-src-sydney_audio_oss.c > patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc > applied cleanly. > *** [do-patch] Error code 1 > > Stop in /usr/ports/www/firefox. > *** [build] Error code 1 > Patch: http://people.freebsd.org/~ehaupt/firefox.patch Emanuel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130111111517.8e45b0cad0a3d3391ebf703c>