mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
package/ncmpc: update the patches to be applied with fuzz 0
Commit 8f88a644ed ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, ncmpc fails to build with output:
Applying 0001-meson.build-add-atomic-dependency-for-sparc.patch using patch:
patching file meson.build
Hunk #1 succeeded at 232 (offset 58 lines).
Hunk #2 FAILED at 355.
1 out of 2 hunks FAILED -- saving rejects to file meson.build.rej
This commit refreshes the package patch on the current package version.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
committed by
Romain Naour
parent
a82ad53371
commit
99423ee495
@@ -1053,7 +1053,6 @@ package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream
|
|||||||
package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream
|
package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream
|
||||||
package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream
|
package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream
|
||||||
package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream
|
package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream
|
||||||
package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream
|
|
||||||
package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream
|
package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream
|
||||||
package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream
|
package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream
|
||||||
package/neard/S53neard Shellcheck lib_sysv.Indent lib_sysv.Variables
|
package/neard/S53neard Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001
|
From 72ef4c1c3c11fc05c057f2b40b87de92a573f2eb Mon Sep 17 00:00:00 2001
|
||||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
Date: Mon, 11 Feb 2019 21:42:01 +0100
|
Date: Mon, 11 Feb 2019 21:42:01 +0100
|
||||||
Subject: [PATCH] meson.build: add atomic dependency for sparc
|
Subject: [PATCH] meson.build: add atomic dependency for sparc
|
||||||
@@ -11,16 +11,18 @@ Fixes:
|
|||||||
- http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
|
- http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
|
||||||
|
|
||||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45]
|
Upstream: https://github.com/MusicPlayerDaemon/ncmpc/pull/45
|
||||||
|
[Dario: make the patch to be applied with fuzz factor 0]
|
||||||
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
||||||
---
|
---
|
||||||
meson.build | 4 ++++
|
meson.build | 4 ++++
|
||||||
1 file changed, 4 insertions(+)
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index 2e6defc..b393e39 100644
|
index fa0eff9408b6..819674cbede4 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/meson.build
|
+++ b/meson.build
|
||||||
@@ -174,6 +174,9 @@ else
|
@@ -232,6 +232,9 @@ else
|
||||||
pcre_dep = declare_dependency()
|
pcre_dep = declare_dependency()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -30,14 +32,14 @@ index 2e6defc..b393e39 100644
|
|||||||
inc = include_directories(
|
inc = include_directories(
|
||||||
'src',
|
'src',
|
||||||
|
|
||||||
@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc',
|
@@ -445,6 +448,7 @@ ncmpc = executable('ncmpc',
|
||||||
sources,
|
sources,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
+ atomic_dep,
|
+ atomic_dep,
|
||||||
thread_dep,
|
thread_dep,
|
||||||
boost_dep,
|
event_dep,
|
||||||
pcre_dep,
|
pcre_dep,
|
||||||
--
|
--
|
||||||
2.14.1
|
2.43.0
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user