Patch failed to apply cleanly [chromium-20.0.1132.57] FreeBSD 9.0-RELEASE

[Wayne Sierke]

On Thu, 2012-07-12 at 22:33 +0300, Alexander Kapshuk wrote:
> When attempting to upgrade chromium-19.0.1084.56_1 to 
> chromium-20.0.1132.57 on FreeBSD9.0 (FreeBSD box2 9.0-RELEASE FreeBSD 
> 9.0-RELEASE #0: Tue Jan  3 07:15:25 UTC 2012 
> root at obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386), one of 
> the patches failed to apply:
> --------------------------------------
> ===>  Applying extra patch /usr/ports/www/chromium/files/extra-patch-gcc
> ===>  Applying FreeBSD patches for chromium-20.0.1132.57
> patch: **** malformed patch at line 15:  #if PLATFORM(CHROMIUM)
> => Patch patch-third_party__WebKit__Source__WebCore__config.h failed to 
> apply cleanly.
> --------------------------------------
> There seems to be a patch available that has been reported as having 
> worked on a 9.0-RELEASE/amd64:
> http://www.mail-archive.com/freebsd-chromium@freebsd.org/msg00340.html
> -----------------------------
> www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h.orig 
> 
>      2012-07-12 09:19:26.000000000 +0000
> +++ www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h
> 2012-07-12 10:49:20.000000000 +0000
> @@ -1,6 +1,6 @@
> ---- third_party/WebKit/Source/WebCore/config.h.orig    2012-05-30
> 10:05:35.000000000 +0300
> -+++ third_party/WebKit/Source/WebCore/config.h 2012-06-05 
> 22:32:48.000000000
> +0300
> -@@ -127,6 +127,11 @@
> +--- third_party/WebKit/Source/WebCore/config.h.orig    2012-07-10
> 07:52:48.000000000 +0000
> ++++ third_party/WebKit/Source/WebCore/config.h 2012-07-12 
> 10:48:15.000000000
> +0000
> +@@ -127,6 +127,14 @@
>    #define WTF_USE_NEW_THEME 1
>    #endif // PLATFORM(MAC)
> -------------------------------------
> Is there a patch available to an x86 based system?

The same patch will work for x86.

In lieu of the patch simply edit
www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h
and change the line:

@@ -127,6 +127,11 @@

to:

@@ -127,6 +127,14 @@


Wayne