Date: Sun, 24 Aug 2014 14:07:11 +0000 From: bugzilla-noreply@freebsd.org To: chromium@FreeBSD.org Subject: [Bug 192685] www/chromium 36.0.1985.143 fails to build on 10-stable Message-ID: <bug-192685-28929-3wxFaIN0GJ@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-192685-28929@https.bugs.freebsd.org/bugzilla/> References: <bug-192685-28929@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192685 --- Comment #14 from oleg.nauman@gmail.com --- It seems that patch failed to apply correctly: ===> Applying FreeBSD patch /usr/ports/www/chromium/files/patch-chromium-gles2 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- ./gpu/command_buffer/common/gles2_cmd_format.h.orig 2014-08-20 21:02:37.000000000 +0200^M |+++ ./gpu/command_buffer/common/gles2_cmd_format.h 2014-08-24 00:50:27.000000000 +0200^M -------------------------- Patching file ./gpu/command_buffer/common/gles2_cmd_format.h using Plan A... Hunk #1 failed at 39. 1 out of 1 hunks failed--saving rejects to ./gpu/command_buffer/common/gles2_cmd_format.h.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |^M |--- ./third_party/khronos/GLES2/gl2.h.orig 2014-08-20 21:03:05.000000000 +0200^M |+++ ./third_party/khronos/GLES2/gl2.h 2014-08-24 11:39:22.000000000 +0200^M -------------------------- Patching file ./third_party/khronos/GLES2/gl2.h using Plan A... Hunk #1 failed at 38. Hunk #2 failed at 68. 2 out of 2 hunks failed--saving rejects to ./third_party/khronos/GLES2/gl2.h.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |^M |--- ./third_party/mesa/src/include/GLES2/gl2.h.orig 2014-08-20 21:03:54.000000000 +0200^M |+++ ./third_party/mesa/src/include/GLES2/gl2.h 2014-08-24 01:13:41.000000000 +0200^M -------------------------- Patching file ./third_party/mesa/src/include/GLES2/gl2.h using Plan A... Hunk #1 failed at 4. Hunk #2 failed at 36. 2 out of 2 hunks failed--saving rejects to ./third_party/mesa/src/include/GLES2/gl2.h.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |^M |--- ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc.orig 2014-08-24 12:26:40.000000000 +0200^M |+++ ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc 2014-08-24 12:33:01.000000000 +0200^M -------------------------- Patching file ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc using Plan A... Hunk #1 failed at 31. Hunk #2 failed at 74. 2 out of 2 hunks failed--saving rejects to ./gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc.rej done => Patch patch-chromium-gles2 failed to apply cleanly. -- You are receiving this mail because: You are the assignee for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-192685-28929-3wxFaIN0GJ>