Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 314147 - multiple www-client/chromium-9999 patches fail to apply
Summary: multiple www-client/chromium-9999 patches fail to apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: AMD64 Linux
: High normal (vote)
Assignee: Paweł Hajdan, Jr. (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-04-09 13:37 UTC by David Pyke
Modified: 2010-04-09 14:57 UTC (History)
1 user (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description David Pyke 2010-04-09 13:37:32 UTC
The Chromium-ffmpeg.patch fails to apply due to recent svn changes.

Reproducible: Always




***** chromium-ffmpeg.patch *****

=================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-ffmpeg.patch'

=================================
patching file third_party/ffmpeg/ffmpeg.gyp
Hunk #1 FAILED at 55.
1 out of 1 hunk FAILED -- saving rejects to file third_party/ffmpeg/ffmpeg.gyp.rej
patching file net/base/mime_util.cc
=================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-ffmpeg.patch'

=================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-04-03 18:29:54.000000000 +0200
|+++ third_party/ffmpeg/ffmpeg.gyp      2010-04-03 18:31:02.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- net/base/mime_util.cc.orig 2010-04-03 18:32:32.000000000 +0200
|+++ net/base/mime_util.cc      2010-04-03 18:33:09.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
=================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-ffmpeg.patch'

=================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-04-03 18:29:54.000000000 +0200
|+++ third_party/ffmpeg/ffmpeg.gyp      2010-04-03 18:31:02.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- net/base/mime_util.cc.orig 2010-04-03 18:32:32.000000000 +0200
|+++ net/base/mime_util.cc      2010-04-03 18:33:09.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
=================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-ffmpeg.patch'

=================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-04-03 18:29:54.000000000 +0200
|+++ third_party/ffmpeg/ffmpeg.gyp      2010-04-03 18:31:02.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- net/base/mime_util.cc.orig 2010-04-03 18:32:32.000000000 +0200
|+++ net/base/mime_util.cc      2010-04-03 18:33:09.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
=================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-ffmpeg.patch'

=================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-04-03 18:29:54.000000000 +0200
|+++ third_party/ffmpeg/ffmpeg.gyp      2010-04-03 18:31:02.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- net/base/mime_util.cc.orig 2010-04-03 18:32:32.000000000 +0200
|+++ net/base/mime_util.cc      2010-04-03 18:33:09.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
Comment 1 David Pyke 2010-04-09 13:50:04 UTC
chromium-fix-make-build.patch also fails

***** chromium-fix-make-build.patch *****

=========================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-fix-make-build.patch'

=========================================
patching file ./tools/gyp/pylib/gyp/generator/make.py
Hunk #1 FAILED at 148.
1 out of 1 hunk FAILED -- saving rejects to file ./tools/gyp/pylib/gyp/generator/make.py.rej
=========================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-fix-make-build.patch'

=========================================
patching file tools/gyp/pylib/gyp/generator/make.py
Hunk #1 FAILED at 148.
1 out of 1 hunk FAILED -- saving rejects to file tools/gyp/pylib/gyp/generator/make.py.rej
=========================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-fix-make-build.patch'

=========================================
patching file tools/gyp/pylib/gyp/generator/make.py
Hunk #1 FAILED at 148.
1 out of 1 hunk FAILED -- saving rejects to file tools/gyp/pylib/gyp/generator/make.py.rej
=========================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-fix-make-build.patch'

=========================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ru ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py ./tools/gyp/pylib/gyp/generator/make.py
|--- ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py        2010-01-25 23:04:11.000000000 +0100
|+++ ./tools/gyp/pylib/gyp/generator/make.py    2010-02-19 00:48:45.381303499 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=========================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch < '/var/paludis/repositories/gentoo/www-client/chromium/files/chromium-fix-make-build.patch'

=========================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ru ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py ./tools/gyp/pylib/gyp/generator/make.py
|--- ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py        2010-01-25 23:04:11.000000000 +0100
|+++ ./tools/gyp/pylib/gyp/generator/make.py    2010-02-19 00:48:45.381303499 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
Comment 2 Paweł Hajdan, Jr. (RETIRED) gentoo-dev 2010-04-09 14:57:44 UTC
Fixed in CVS.