[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnewsense-dev] patch for irssi bug.
From: |
Richard Hinojosa |
Subject: |
Re: [Gnewsense-dev] patch for irssi bug. |
Date: |
Fri, 13 Sep 2013 17:59:33 -0500 |
On Fri, 2013-09-13 at 21:37 +0200, Sam Geeraerts wrote:
> Op Thu, 12 Sep 2013 21:23:06 -0500
> schreef Richard Hinojosa <address@hidden>:
>
> > I get this error when applying 03firsttimer_text.patch:
> >
> > patching file patches/03firsttimer_text-gnewsense
> > Hunk #1 FAILED at 21.
> > 1 out of 1 hunk FAILED -- rejects in file
> > patches/03firsttimer_text-gnewsense
> > Patch 03firsttimer_text.patch does not apply (enforce with -f)
>
> I hadn't looked closely at the provided patch. It's a patch on Debian's
> patch file instead of the source. Quilt only handles patches on the
> source. The patch from the bug report is meant to be applied using the
> patch command straight up.
>
> While that is an option, I prefer to leave Debian's patch files
> untouched and instead add our own patch files that may overwrite some
> of Debian's changes to the source. So you should do (on the unmodified
> source package):
>
> quilt push -a
> quilt new name-of-patch
> quilt edit src/fe-text/irssi.c
> etc.
>
> Edit irssi.c in such a way as the provided patch would do. In the end
> you'll have 2 patches (1 from Debian and 1 for gNewSense) that operate
> on the same piece of code.
>
> _______________________________________________
> gNewSense-dev mailing list
> address@hidden
> https://lists.nongnu.org/mailman/listinfo/gnewsense-dev
I worked through the remaining instructions and I got a diff file. I am
going to add as attachment for review.
irssi_0.8.15-3gnewsense1.diff
Description: Text Data