From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v1] package/libinput: bump version to 1.13.1
Date: Wed, 24 Apr 2019 22:44:18 +0200 [thread overview]
Message-ID: <20190424224418.725174dc@windsurf> (raw)
In-Reply-To: <20190423204113.20563-1-ps.report@gmx.net>
On Tue, 23 Apr 2019 22:41:13 +0200
Peter Seiderer <ps.report@gmx.net> wrote:
> - for changelog see [1] and [2]
> - removed 0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch
> (upstream applied, see [3])
>
> [1] https://lists.freedesktop.org/archives/wayland-devel/2019-March/040363.html
> [2] https://lists.freedesktop.org/archives/wayland-devel/2019-April/040403.html
> [3] https://gitlab.freedesktop.org/libinput/libinput/commit/4516ba977c1e22d01da4cc50a8ebffa5d11d73f1
>
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> ...le-CPP-include-check-only-in-case-CP.patch | 54 -------------------
> package/libinput/libinput.hash | 10 ++--
> package/libinput/libinput.mk | 2 +-
> 3 files changed, 6 insertions(+), 60 deletions(-)
> delete mode 100644 package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch
Applied to master, thanks. For some reason, your patch was not applying properly:
Applying patch #1089746 using "git am -s"
Description: [v1] package/libinput: bump version to 1.13.1
Applying: package/libinput: bump version to 1.13.1
error: patch failed: package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch:1
error: package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch: patch does not apply
Patch failed at 0001 package/libinput: bump version to 1.13.1
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 when applying.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2019-04-24 20:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 20:41 [Buildroot] [PATCH v1] package/libinput: bump version to 1.13.1 Peter Seiderer
2019-04-24 20:44 ` Thomas Petazzoni [this message]
2019-04-24 21:59 ` Peter Seiderer
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=20190424224418.725174dc@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