Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/ncmpc: fix build with gcc 5
Date: Sat, 9 Mar 2019 14:53:32 +0100	[thread overview]
Message-ID: <20190309145332.50877f3b@windsurf> (raw)
In-Reply-To: <20190309113127.24045-2-fontaine.fabrice@gmail.com>

Hello Fabrice,

On Sat,  9 Mar 2019 12:31:27 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fixes:
>  - http://autobuild.buildroot.org/results/655eb4905c6e308d34293658acee4fc4e1fe0bbc
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...TagListPage.cxx-fix-build-with-gcc-5.patch | 42 +++++++++++++++++++
>  1 file changed, 42 insertions(+)
>  create mode 100644 package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch

This patch didn't apply cleanly:

$ git pwam 1053833
Applying patch #1053833 using "git am -s"
Description: [2/2] package/ncmpc: fix build with gcc 5
Applying: package/ncmpc: fix build with gcc 5
.git/rebase-apply/patch:46: space before tab in indent.
 	unsigned i = lw.selected;
.git/rebase-apply/patch:47: space before tab in indent.
 	if (parent != nullptr) {
.git/rebase-apply/patch:48: space before tab in indent.
 		if (i == 0)
.git/rebase-apply/patch:51: trailing whitespace.
 
.git/rebase-apply/patch:52: space before tab in indent.
 		--i;
error: corrupt patch at line 56
Patch failed at 0001 package/ncmpc: fix build with gcc 5
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128

I fixed it up manually and applied. I'm not entirely sure that the fix
is the best/correct one as I'm not proficient enough in C++, but we'll
see what upstream says about the pull request later on.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

  reply	other threads:[~2019-03-09 13:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-09 11:31 [Buildroot] [PATCH 1/2] package/ncmpc: remove first patch Fabrice Fontaine
2019-03-09 11:31 ` [Buildroot] [PATCH 2/2] package/ncmpc: fix build with gcc 5 Fabrice Fontaine
2019-03-09 13:53   ` Thomas Petazzoni [this message]
2019-03-09 13:52 ` [Buildroot] [PATCH 1/2] package/ncmpc: remove first patch Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190309145332.50877f3b@windsurf \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox