Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 25094 Details for
Bug 40630
Unable to patch battstat-acpi-events correctly (gnome-applets-2.4.2)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
Error log for the patch failure
battstat-acpi-events-2.3.90.diff-17328.out (text/plain), 11.12 KB, created by
Paulo J. Matos
on 2004-02-06 12:30:29 UTC
(
hide
)
Description:
Error log for the patch failure
Filename:
MIME Type:
Creator:
Paulo J. Matos
Created:
2004-02-06 12:30:29 UTC
Size:
11.12 KB
patch
obsolete
>***** battstat-acpi-events-2.3.90.diff ***** > >============================================ > >PATCH COMMAND: patch -p0 < /usr/portage/gnome-base/gnome-applets/files/battstat-acpi-events-2.3.90.diff > >============================================ >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 -urN battstat.orig/acpi-linux.c battstat/acpi-linux.c >|--- battstat.orig/acpi-linux.c 2003-07-26 17:28:17.000000000 -0400 >|+++ battstat/acpi-linux.c 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >4 out of 4 hunks ignored >can't find file to patch at input line 363 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/acpi-linux.h battstat/acpi-linux.h >|--- battstat.orig/acpi-linux.h 2001-11-04 18:41:22.000000000 -0500 >|+++ battstat/acpi-linux.h 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored >can't find file to patch at input line 387 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat_applet.c battstat/battstat_applet.c >|--- battstat.orig/battstat_applet.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat_applet.c 2003-09-07 17:52:43.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >10 out of 10 hunks ignored >can't find file to patch at input line 573 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat.h battstat/battstat.h >|--- battstat.orig/battstat.h 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat.h 2003-09-07 17:18:38.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >2 out of 2 hunks ignored >can't find file to patch at input line 593 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/properties.c battstat/properties.c >|--- battstat.orig/properties.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/properties.c 2003-09-07 17:18:56.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored >============================================ > >PATCH COMMAND: patch -p1 < /usr/portage/gnome-base/gnome-applets/files/battstat-acpi-events-2.3.90.diff > >============================================ >patching file acpi-linux.c >Hunk #1 FAILED at 36. >Hunk #2 FAILED at 138. >Hunk #3 FAILED at 200. >Hunk #4 FAILED at 223. >4 out of 4 hunks FAILED -- saving rejects to file acpi-linux.c.rej >patching file acpi-linux.h >Hunk #1 FAILED at 19. >1 out of 1 hunk FAILED -- saving rejects to file acpi-linux.h.rej >patching file battstat_applet.c >Hunk #1 FAILED at 221. >Hunk #2 FAILED at 248. >Hunk #3 FAILED at 265. >Hunk #4 FAILED at 293. >Hunk #5 FAILED at 385. >Hunk #6 succeeded at 781 with fuzz 2 (offset 56 lines). >Hunk #7 FAILED at 999. >Hunk #8 FAILED at 1564. >Hunk #9 FAILED at 1573. >Hunk #10 FAILED at 1629. >9 out of 10 hunks FAILED -- saving rejects to file battstat_applet.c.rej >patching file battstat.h >Hunk #1 FAILED at 118. >Hunk #2 FAILED at 155. >2 out of 2 hunks FAILED -- saving rejects to file battstat.h.rej >patching file properties.c >Hunk #1 FAILED at 334. >1 out of 1 hunk FAILED -- saving rejects to file properties.c.rej >============================================ > >PATCH COMMAND: patch -p2 < /usr/portage/gnome-base/gnome-applets/files/battstat-acpi-events-2.3.90.diff > >============================================ >missing header for unified diff at line 4 of 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 -urN battstat.orig/acpi-linux.c battstat/acpi-linux.c >|--- battstat.orig/acpi-linux.c 2003-07-26 17:28:17.000000000 -0400 >|+++ battstat/acpi-linux.c 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >4 out of 4 hunks ignored >missing header for unified diff at line 363 of patch >can't find file to patch at input line 363 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/acpi-linux.h battstat/acpi-linux.h >|--- battstat.orig/acpi-linux.h 2001-11-04 18:41:22.000000000 -0500 >|+++ battstat/acpi-linux.h 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored >missing header for unified diff at line 387 of patch >can't find file to patch at input line 387 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat_applet.c battstat/battstat_applet.c >|--- battstat.orig/battstat_applet.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat_applet.c 2003-09-07 17:52:43.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >10 out of 10 hunks ignored >missing header for unified diff at line 573 of patch >can't find file to patch at input line 573 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat.h battstat/battstat.h >|--- battstat.orig/battstat.h 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat.h 2003-09-07 17:18:38.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >2 out of 2 hunks ignored >missing header for unified diff at line 593 of patch >can't find file to patch at input line 593 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/properties.c battstat/properties.c >|--- battstat.orig/properties.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/properties.c 2003-09-07 17:18:56.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored >============================================ > >PATCH COMMAND: patch -p3 < /usr/portage/gnome-base/gnome-applets/files/battstat-acpi-events-2.3.90.diff > >============================================ >missing header for unified diff at line 4 of 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 -urN battstat.orig/acpi-linux.c battstat/acpi-linux.c >|--- battstat.orig/acpi-linux.c 2003-07-26 17:28:17.000000000 -0400 >|+++ battstat/acpi-linux.c 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >4 out of 4 hunks ignored >missing header for unified diff at line 363 of patch >can't find file to patch at input line 363 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/acpi-linux.h battstat/acpi-linux.h >|--- battstat.orig/acpi-linux.h 2001-11-04 18:41:22.000000000 -0500 >|+++ battstat/acpi-linux.h 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored >missing header for unified diff at line 387 of patch >can't find file to patch at input line 387 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat_applet.c battstat/battstat_applet.c >|--- battstat.orig/battstat_applet.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat_applet.c 2003-09-07 17:52:43.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >10 out of 10 hunks ignored >missing header for unified diff at line 573 of patch >can't find file to patch at input line 573 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat.h battstat/battstat.h >|--- battstat.orig/battstat.h 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat.h 2003-09-07 17:18:38.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >2 out of 2 hunks ignored >missing header for unified diff at line 593 of patch >can't find file to patch at input line 593 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/properties.c battstat/properties.c >|--- battstat.orig/properties.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/properties.c 2003-09-07 17:18:56.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored >============================================ > >PATCH COMMAND: patch -p4 < /usr/portage/gnome-base/gnome-applets/files/battstat-acpi-events-2.3.90.diff > >============================================ >missing header for unified diff at line 4 of 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 -urN battstat.orig/acpi-linux.c battstat/acpi-linux.c >|--- battstat.orig/acpi-linux.c 2003-07-26 17:28:17.000000000 -0400 >|+++ battstat/acpi-linux.c 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >4 out of 4 hunks ignored >missing header for unified diff at line 363 of patch >can't find file to patch at input line 363 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/acpi-linux.h battstat/acpi-linux.h >|--- battstat.orig/acpi-linux.h 2001-11-04 18:41:22.000000000 -0500 >|+++ battstat/acpi-linux.h 2003-09-07 16:30:45.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored >missing header for unified diff at line 387 of patch >can't find file to patch at input line 387 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat_applet.c battstat/battstat_applet.c >|--- battstat.orig/battstat_applet.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat_applet.c 2003-09-07 17:52:43.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >10 out of 10 hunks ignored >missing header for unified diff at line 573 of patch >can't find file to patch at input line 573 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/battstat.h battstat/battstat.h >|--- battstat.orig/battstat.h 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/battstat.h 2003-09-07 17:18:38.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >2 out of 2 hunks ignored >missing header for unified diff at line 593 of patch >can't find file to patch at input line 593 >Perhaps you used the wrong -p or --strip option? >The text leading up to this was: >-------------------------- >|diff -urN battstat.orig/properties.c battstat/properties.c >|--- battstat.orig/properties.c 2003-07-23 22:02:45.000000000 -0400 >|+++ battstat/properties.c 2003-09-07 17:18:56.000000000 -0400 >-------------------------- >No file to patch. Skipping patch. >1 out of 1 hunk ignored
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 40630
: 25094