Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 545678 - media-gfx/iscan-2.29.1.5 : Failed Patch: iscan-2.28.1.3+libpng-1.5.patch
Summary: media-gfx/iscan-2.29.1.5 : Failed Patch: iscan-2.28.1.3+libpng-1.5.patch
Status: RESOLVED INVALID
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Matthew Schultz
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-04-06 05:38 UTC by Thomas
Modified: 2015-04-09 13:49 UTC (History)
1 user (show)

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


Attachments
patch to remove iscan-2.28.1.3+libpng-1.5.patch from iscan-2.29.1.5.ebuild (iscan-2.29.1.5-r1.ebuild.patch,376 bytes, patch)
2015-04-06 05:44 UTC, Thomas
Details | Diff
output of the patch command that fails (iscan-2.28.1.3+libpng-1.5.patch.out,4.69 KB, text/plain)
2015-04-08 16:58 UTC, Thomas
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas 2015-04-06 05:38:34 UTC
building media-gfx/iscan-2.29.1.5 fails in patch phase, while applying a patch which was obviously created for version 2.28.1.3.

Reproducible: Always

Steps to Reproduce:
emerge -v1 =media-gfx/iscan-2.29.1.5
(USE flags don't matter, I also tried with USE=-png)
Actual Results:  

------------------------------------------------------------
------------------------------------------------------------
>>> Emerging (1 of 1) media-gfx/iscan-2.29.1.5::gentoo
 * iscan_2.29.1-5.tar.gz SHA256 SHA512 WHIRLPOOL size ;-) ...                                                      [ ok ]
>>> Unpacking source...
>>> Unpacking iscan_2.29.1-5.tar.gz to /var/tmp/portage/media-gfx/iscan-2.29.1.5/work
>>> Source unpacked in /var/tmp/portage/media-gfx/iscan-2.29.1.5/work
 * Applying user patches from /etc/portage/patches//media-gfx/iscan ...
 *   iscan-2.28.1-libpng15.patch ...                                                                               [ ok ]
 * Done with patching
>>> Preparing source in /var/tmp/portage/media-gfx/iscan-2.29.1.5/work/iscan-2.29.1 ...
>>> Converting NEWS.ja to UTF-8
iconv: illegal input sequence at position 11
>>> Converting README.ja to UTF-8
iconv: illegal input sequence at position 188
>>> Converting non-free/AVASYSPL.ja.txt to UTF-8
iconv: illegal input sequence at position 91
 * Applying iscan-2.29.1-drop-ltdl.patch ...                                                                       [ ok ]
 * Applying iscan-2.25.0-fix-g++-test.patch ...                                                                    [ ok ]
 * Applying iscan-2.28.1.3+libpng-1.5.patch ...

 * Failed Patch: iscan-2.28.1.3+libpng-1.5.patch !
 *  ( /var/portage/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/media-gfx/iscan-2.29.1.5/temp/iscan-2.28.1.3+libpng-1.5.patch.out

 * ERROR: media-gfx/iscan-2.29.1.5::gentoo failed (prepare phase):
 *   Failed Patch: iscan-2.28.1.3+libpng-1.5.patch!
 * 
 * Call stack:
 *     ebuild.sh, line   93:  Called src_prepare
 *   environment, line 3173:  Called epatch '/var/portage/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch'
 *   environment, line 1565:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
------------------------------------------------------------
------------------------------------------------------------

here the output of the patch command:

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  < '/var/portage/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch'

===========================================
checking file lib/pngstream.cc
Hunk #1 FAILED at 83.
Hunk #2 FAILED at 167.
Hunk #3 FAILED at 176.
3 out of 3 hunks FAILED
checking file lib/pngstream.hh
Hunk #1 FAILED at 108.
1 out of 1 hunk FAILED
------------------------------------------------------------
------------------------------------------------------------
Comment 1 Thomas 2015-04-06 05:44:57 UTC
Created attachment 400646 [details, diff]
patch to remove iscan-2.28.1.3+libpng-1.5.patch from iscan-2.29.1.5.ebuild

I removed the patch that was producing the failure from the ebuild
(see attached patch for iscan-2.29.1.5.ebuild).

The package builds fine now and the program seems to work too.
Comment 2 Ian Delaney (RETIRED) gentoo-dev 2015-04-08 06:21:41 UTC
I think we're now awaiting maintainer to take the patch and runtest it.
Comment 3 Matthew Schultz 2015-04-08 13:12:42 UTC
It patches cleanly for me and I've tested with this patch all the way up to 2.30.1.1 which also applies cleanly.
Comment 4 Thomas 2015-04-08 16:56:29 UTC
That can not be.
It is fine that you say it works for you, but that doesn't solve anything, it definitely fails here - 100% reproducibly!
Look at the output I pasted into the bug report!

Here my USE flags (although they shouldn't matter)
media-gfx/iscan-2.29.1.5  USE="X gimp jpeg png tiff -doc"
Comment 5 Thomas 2015-04-08 16:58:32 UTC
Created attachment 400856 [details]
output of the patch command that fails
Comment 6 Matthew Schultz 2015-04-08 17:08:47 UTC
(In reply to Thomas from comment #5)
> Created attachment 400856 [details]
> output of the patch command that fails

Have you considered that your patch file might be corrupted?  Try removing it and doing a sync again.  Also post emerge --info.
Comment 7 Thomas 2015-04-09 04:40:50 UTC
A corrupted patch file in portage? That's practically impossible, portage would have detected that and complain about bad MD5 sum and so on... But ok, I tried it, removed the whole directory and synced again, and as expected the result is identical.

But the hint was good, I found out that a file named "iscan-2.28.1.3+libpng-1.5.patch" was in /etc/portage/patches/media-gfx/iscan and that one caused the trouble, probably a leftover from 2012 (bug #419729).

After removing it the build works fine.
Sorry for the inconvenience !
Comment 8 Matthew Schultz 2015-04-09 13:49:10 UTC
(In reply to Thomas from comment #7)
> A corrupted patch file in portage? That's practically impossible, portage
> would have detected that and complain about bad MD5 sum and so on... But ok,
> I tried it, removed the whole directory and synced again, and as expected
> the result is identical.
> 
> But the hint was good, I found out that a file named
> "iscan-2.28.1.3+libpng-1.5.patch" was in
> /etc/portage/patches/media-gfx/iscan and that one caused the trouble,
> probably a leftover from 2012 (bug #419729).
> 
> After removing it the build works fine.
> Sorry for the inconvenience !

It's possible to redigest an ebuild and have it accept a broken patch or failing that, checking for overrides would have been my next suggestion.  I'm glad you were able to figure out the problem. :-)