(In reply to comment #8)
> I can confirm that the upstream patch works with cups-1.6.
> But I had quite some trouble applying the patch because it seems like the
> hplip sources have DOS line breaks and portage's epatch doesn't like that
> even though the patch itself has DOS line breaks as well. So I ended up
> using edos2unix on the two files the patch is modifying and converted the
> patch itself to Unix line breaks, too.
Note that you only need this on the first file (prnt/cupsext/cupsext.c). The problem is that this file has CRLF line endings while the other file in the patch has LF line endings. So if you just use epatch (converts CRLF to LF) it'll fail on the first file, if you use epatch --binary (won't convert) it'll fail on the second file.
(In reply to comment #8)
> I can confirm that the upstream patch works with cups-1.6.
> But I had quite some trouble applying the patch because it seems like the
> hplip sources have DOS line breaks and portage's epatch doesn't like that
> even though the patch itself has DOS line breaks as well. So I ended up
> using edos2unix on the two files the patch is modifying and converted the
> patch itself to Unix line breaks, too.
Note that you only need this on the first file (prnt/cupsext/ cupsext. c). The problem is that this file has CRLF line endings while the other file in the patch has LF line endings. So if you just use epatch (converts CRLF to LF) it'll fail on the first file, if you use epatch --binary (won't convert) it'll fail on the second file.