Skip to content

Commit 99423ee

Browse files
passgatRomainNaour
authored andcommitted
package/ncmpc: update the patches to be applied with fuzz 0
Commit 8f88a64 ("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>
1 parent a82ad53 commit 99423ee

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

.checkpackageignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,6 @@ package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream
10531053
package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream
10541054
package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream
10551055
package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream
1056-
package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream
10571056
package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream
10581057
package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream
10591058
package/neard/S53neard Shellcheck lib_sysv.Indent lib_sysv.Variables
Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001
1+
From 72ef4c1c3c11fc05c057f2b40b87de92a573f2eb Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
33
Date: Mon, 11 Feb 2019 21:42:01 +0100
44
Subject: [PATCH] meson.build: add atomic dependency for sparc
@@ -11,16 +11,18 @@ Fixes:
1111
- http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
1212

1313
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
14-
[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45]
14+
Upstream: https://github.com/MusicPlayerDaemon/ncmpc/pull/45
15+
[Dario: make the patch to be applied with fuzz factor 0]
16+
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
1517
---
1618
meson.build | 4 ++++
1719
1 file changed, 4 insertions(+)
1820

1921
diff --git a/meson.build b/meson.build
20-
index 2e6defc..b393e39 100644
22+
index fa0eff9408b6..819674cbede4 100644
2123
--- a/meson.build
2224
+++ b/meson.build
23-
@@ -174,6 +174,9 @@ else
25+
@@ -232,6 +232,9 @@ else
2426
pcre_dep = declare_dependency()
2527
endif
2628

@@ -30,14 +32,14 @@ index 2e6defc..b393e39 100644
3032
inc = include_directories(
3133
'src',
3234

33-
@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc',
35+
@@ -445,6 +448,7 @@ ncmpc = executable('ncmpc',
3436
sources,
3537
include_directories: inc,
3638
dependencies: [
3739
+ atomic_dep,
3840
thread_dep,
39-
boost_dep,
41+
event_dep,
4042
pcre_dep,
4143
--
42-
2.14.1
44+
2.43.0
4345

0 commit comments

Comments
 (0)