325187 – chromium-9999 patches failed

Bug 325187 - chromium-9999 patches failed

Summary: chromium-9999 patches failed

Status:	RESOLVED FIXED

Alias:	None

Product:	Gentoo Linux
Classification:	Unclassified
Component:	Current packages (show other bugs)
Hardware:	All Linux

Importance:	High normal (vote)
Assignee:	Bernard Cafarelli

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2010-06-23 09:45 UTC by Mathieu Z
Modified:	2010-06-23 14:54 UTC (History)
CC List:	1 user (show)

See Also:
Package list:
Runtime testing required:	---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Mathieu Z 2010-06-23 09:45:32 UTC

chromium-optional-cups-r1.patch and chromium-disable-vp8-r1.patch failed to patch against latest chunk.

Will post rejs as comment later.

Reproducible: Always

Steps to Reproduce:
1. emerge -1 chromium
2.
3.

Actual Results:  
===========================================
patching file chrome/chrome.gyp
Hunk #1 succeeded at 700 with fuzz 1 (offset -398 lines).
Hunk #2 FAILED at 1117.
1 out of 2 hunks FAILED -- saving rejects to file chrome/chrome.gyp.rej
===========================================
=========================================
patching file media/filters/ffmpeg_demuxer.cc
Hunk #1 FAILED at 413.
1 out of 1 hunk FAILED -- saving rejects to file media/filters/ffmpeg_demuxer.cc.rej
patching file net/base/mime_util.cc
Hunk #1 FAILED at 227.
Hunk #2 FAILED at 297.
2 out of 2 hunks FAILED -- saving rejects to file net/base/mime_util.cc.rej
=========================================

Comment 1 Bernard Cafarelli gentoo-dev

2010-06-23 14:54:31 UTC

Thanks for the report! I fixed this a few minutes ago (cups patch is merged, and vp8 is enabled now in -9999):

+  23 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> chromium-9999.ebuild:
+  Install resources.pak, bug #324645 by Mike Gilbert
+  <floppymaster@gmail.com>. Drop cups patch, it's merged usptream, and
+  enable WebM support