* Failed Patch: bug-606109.patch ! * ( /portage/net-libs/xulrunner/files/bug-606109.patch ) * $ cat /var/tmp/portage/net-libs/xulrunner-1.9.2.12/temp/bug-606109.patch.out ***** bug-606109.patch ***** ============================ PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < '/portage/net-libs/xulrunner/files/bug-606109.patch' ============================ can't find file to patch at input line 9 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |# HG changeset patch |# User Jory A. Pratt <anarchy@gentoo.org> |# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c |Add missing ifde MOZ_MEDIA | |diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp |--- a/content/base/src/nsContentSink.cpp |+++ b/content/base/src/nsContentSink.cpp -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored ============================ PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < '/portage/net-libs/xulrunner/files/bug-606109.patch' ============================ patching file content/base/src/nsContentSink.cpp Hunk #1 FAILED at 1860. Hunk #2 FAILED at 1952. 2 out of 2 hunks FAILED -- saving rejects to file content/base/src/nsContentSink.cpp.rej ============================ PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < '/portage/net-libs/xulrunner/files/bug-606109.patch' ============================ can't find file to patch at input line 9 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |# HG changeset patch |# User Jory A. Pratt <anarchy@gentoo.org> |# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c |Add missing ifde MOZ_MEDIA | |diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp |--- a/content/base/src/nsContentSink.cpp |+++ b/content/base/src/nsContentSink.cpp -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored ============================ PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch < '/portage/net-libs/xulrunner/files/bug-606109.patch' ============================ can't find file to patch at input line 9 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |# HG changeset patch |# User Jory A. Pratt <anarchy@gentoo.org> |# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c |Add missing ifde MOZ_MEDIA | |diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp |--- a/content/base/src/nsContentSink.cpp |+++ b/content/base/src/nsContentSink.cpp -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored ============================ PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch < '/portage/net-libs/xulrunner/files/bug-606109.patch' ============================ can't find file to patch at input line 9 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |# HG changeset patch |# User Jory A. Pratt <anarchy@gentoo.org> |# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c |Add missing ifde MOZ_MEDIA | |diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp |--- a/content/base/src/nsContentSink.cpp |+++ b/content/base/src/nsContentSink.cpp -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored
Created attachment 252523 [details] emerge --info
Created attachment 252525 [details] build.log
Created attachment 252527 [details] emerge -pqv
I have tested this twice now and patch has applied fine both times. Please sync up and retest.
I've tried syncing several times and it still happens.
(In reply to comment #5) > I've tried syncing several times and it still happens. > I have double checked with a few of my herd members and they are all reporting same results to me. What version of patch do you have installed? Did you completely remove ${PORTSDIR}/net-libs/xulrunner and sync again?
(In reply to comment #6) > I have double checked with a few of my herd members and they are all reporting > same results to me. What version of patch do you have installed? Did you > completely remove ${PORTSDIR}/net-libs/xulrunner and sync again? Am using patch-2.6.1. I did downgrade to patch-2.5.9-r1 but experienced the same issue. I did remove the xulrunner directory and re-sync. I am using the portage-2.2 series and I even tried downgrading to 2.1, but still the same issue. I now have this issue reproducible on two different systems, that synced from two different servers. I will continue to look into it. Perhaps an emerge -e world will fix it.
This is my fault. I had reported bug #341901. A patch was proposed. I tested it by monkey-patching the ebuild via /etc/portage/env... and after it started working I had since forgotten about it. Well this patch was the same as bug-606109.patch so it was attempting to apply it twice. Well I have learned a lesson. Sorry to waste your time.
(In reply to comment #8) > This is my fault. > > I had reported bug #341901. A patch was proposed. I tested it by > monkey-patching the ebuild via /etc/portage/env... and after it started working > I had since forgotten about it. Well this patch was the same as > bug-606109.patch so it was attempting to apply it twice. > > Well I have learned a lesson. Sorry to waste your time. > Yeah we use the upstream bug numbers when we place them in the tree, this has actually already landed on firefox-1.9.2.13 but it will not be released for a few weeks hopefully. Sorry for the confusion.
