Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 151237 - gaim-2.0.0_beta3-r3: bad patch file: gaim-2.0.0_beta3-icq.patch
Summary: gaim-2.0.0_beta3-r3: bad patch file: gaim-2.0.0_beta3-icq.patch
Status: RESOLVED DUPLICATE of bug 151102
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Lowest normal
Assignee: Gentoo Linux bug wranglers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-10-13 15:23 UTC by Jon Malachowski
Modified: 2006-10-13 15:25 UTC (History)
0 users

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 Jon Malachowski 2006-10-13 15:23:35 UTC
To me it looks like the patch was taken in reverse.

/var/tmp/portage/gaim-2.0.0_beta3-r3/temp/gaim-2.0.0_beta3-icq.patch-19759.out  
included as instructed 

***** gaim-2.0.0_beta3-icq.patch *****

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

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch < /usr/portage/net-im/gaim/files/gaim-2.0.0_beta3-icq.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:
--------------------------
|--- family_feedbag.c   2006-07-25 00:13:56.000000000 +0200
|+++ family_feedbag.c.old       2006-07-25 00:13:46.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
======================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < /usr/portage/net-im/gaim/files/gaim-2.0.0_beta3-icq.patch

======================================
missing header for unified diff at line 3 of 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:
--------------------------
|--- family_feedbag.c   2006-07-25 00:13:56.000000000 +0200
|+++ family_feedbag.c.old       2006-07-25 00:13:46.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
======================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch < /usr/portage/net-im/gaim/files/gaim-2.0.0_beta3-icq.patch

======================================
missing header for unified diff at line 3 of 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:
--------------------------
|--- family_feedbag.c   2006-07-25 00:13:56.000000000 +0200
|+++ family_feedbag.c.old       2006-07-25 00:13:46.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
======================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch < /usr/portage/net-im/gaim/files/gaim-2.0.0_beta3-icq.patch

======================================
missing header for unified diff at line 3 of 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:
--------------------------
|--- family_feedbag.c   2006-07-25 00:13:56.000000000 +0200
|+++ family_feedbag.c.old       2006-07-25 00:13:46.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
======================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch < /usr/portage/net-im/gaim/files/gaim-2.0.0_beta3-icq.patch

======================================
missing header for unified diff at line 3 of 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:
--------------------------
|--- family_feedbag.c   2006-07-25 00:13:56.000000000 +0200
|+++ family_feedbag.c.old       2006-07-25 00:13:46.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored

=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-==-=--=-=-=-=-=-=-=-=-=--=
Patch file included:


The patch file gaim-2.0.0_beta3-icq.patch looks like it was taken in reverse
--- family_feedbag.c    2006-07-25 00:13:56.000000000 +0200
+++ family_feedbag.c.old        2006-07-25 00:13:46.000000000 +0200
@@ -936,8 +936,8 @@ faim_export int aim_ssi_deldeny(OscarSes
 faim_export int aim_ssi_movebuddy(OscarSession *sess, const char *oldgn, const char *newgn, const char *sn)
 {
        char *alias = aim_ssi_getalias(sess->ssi.local, oldgn, sn);
-       aim_ssi_delbuddy(sess, sn, oldgn);
        aim_ssi_addbuddy(sess, sn, newgn, alias, NULL, NULL, aim_ssi_waitingforauth(sess->ssi.local, oldgn, sn));
+       aim_ssi_delbuddy(sess, sn, oldgn);
        free(alias);
        return 0;
 }
Comment 1 Jakub Moc (RETIRED) gentoo-dev 2006-10-13 15:25:22 UTC

*** This bug has been marked as a duplicate of 151102 ***