Bug 109226 - app-misc/fujiplay-1.33 fails to apply patch
|
Bug#:
109226
|
Product: Gentoo Linux
|
Version: unspecified
|
Platform: All
|
|
OS/Version: Linux
|
Status: RESOLVED
|
Severity: normal
|
Priority: P2
|
|
Resolution: FIXED
|
Assigned To: maintainer-needed@gentoo.org
|
Reported By: swegener@gentoo.org
|
|
Component: Ebuilds
|
|
|
URL:
|
|
Summary: app-misc/fujiplay-1.33 fails to apply patch
|
|
Keywords:
|
|
Status Whiteboard:
|
|
Opened: 2005-10-13 16:37 0000
|
>>> Unpacking source...
>>> Unpacking fujiplay.tgz to /var/tmp/portage/fujiplay-1.33/work
* Applying fujiplay-1.33-unterminated-strings.patch ...
* Failed Patch: fujiplay-1.33-unterminated-strings.patch !
* (
/usr/portage/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch )
*
* Include in your bugreport the contents of:
*
*
/var/tmp/portage/fujiplay-1.33/temp/fujiplay-1.33-unterminated-strings.patch-16730.out
!!! ERROR: app-misc/fujiplay-1.33 failed.
!!! Function epatch, Line 361, Exitcode 0
!!! Failed Patch: fujiplay-1.33-unterminated-strings.patch!
!!! If you need support, post the topmost build error, NOT this status message.
***** fujiplay-1.33-unterminated-strings.patch *****
====================================================
PATCH COMMAND: patch -p0 -g0 --no-backup-if-mismatch <
/usr/portage/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
====================================================
patching file fujiplay.c
Hunk #1 FAILED at 759.
1 out of 1 hunk FAILED -- saving rejects to file fujiplay.c.rej
====================================================
mmmh, still not fixed :-)
The patch in portage doesn't work, but the one here does.
I did a diff between them, and it seems that's a cr/lf problem.
Well no, not cr/lf. There is a slight change in fujiplay.c :
< -Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $
---
> -Fujiplay, $Id: fujiplay-1.33-unterminated-strings.patch,v 1.2 2006/11/25 01:11:16 masterdriverz Exp $
70c70
< +"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n" \
---
> +"Fujiplay, $Id: fujiplay-1.33-unterminated-strings.patch,v 1.2 2006/11/25 01:
I've disabled CVS keyword replacement for the file. Should be all fixed now.