From owner-freebsd-questions@FreeBSD.ORG Mon Jul 16 01:58:14 2012 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D8181065670 for ; Mon, 16 Jul 2012 01:58:14 +0000 (UTC) (envelope-from ws@au.dyndns.ws) Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [IPv6:2001:44b8:8060:ff02:300:1:6:4]) by mx1.freebsd.org (Postfix) with ESMTP id 7B5118FC0A for ; Mon, 16 Jul 2012 01:58:13 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApwEAPp0A1CWZWdv/2dsb2JhbABFuTqCIAEBBXkQCxguVwYTiAwMuiSLQBqGLQOISZJIijCCb4FP Received: from ppp103-111.static.internode.on.net (HELO lillith-iv.ovirt.dyndns.ws) ([150.101.103.111]) by ipmail04.adl6.internode.on.net with ESMTP; 16 Jul 2012 11:27:48 +0930 X-Envelope-From: ws@au.dyndns.ws X-Envelope-To: freebsd-questions@freebsd.org Received: from [172.17.17.134] (ws@predator-ii.buffyverse [172.17.17.134]) by lillith-iv.ovirt.dyndns.ws (8.14.4/8.14.4) with ESMTP id q6G1vXFs097986; Mon, 16 Jul 2012 11:27:34 +0930 (CST) (envelope-from ws@au.dyndns.ws) From: Wayne Sierke To: Alexander Kapshuk In-Reply-To: <4FFF269F.406@gmail.com> References: <4FFF269F.406@gmail.com> Content-Type: text/plain; charset="ASCII" Date: Mon, 16 Jul 2012 11:27:35 +0930 Message-ID: <1342403856.3212.3.camel@predator-ii.buffyverse> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (lillith-iv.ovirt.dyndns.ws [172.17.17.142]); Mon, 16 Jul 2012 11:27:34 +0930 (CST) X-Scanned-By: MIMEDefang 2.72 on 172.17.17.142 X-Scanned-By: SpamAssassin 3.003002(2011-06-06) X-Scanned-By: ClamAV X-Spam-Score: -2.9 () ALL_TRUSTED,BAYES_00 Cc: freebsd-questions Subject: re: Patch failed to apply cleanly [chromium-20.0.1132.57] FreeBSD 9.0-RELEASE X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 01:58:14 -0000 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@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