[1/1] package/ncmpc: update the patches to be applied with fuzz 0
Commit Message
Commit 8f88a644ed7d6 ("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>
---
.checkpackageignore | 1 -
...n.build-add-atomic-dependency-for-sparc.patch | 16 +++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
Comments
Hello Dario,
Le 03/07/2024 à 21:58, Dario Binacchi a écrit :
> Commit 8f88a644ed7d6 ("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>
Applied to master, thanks.
Best regards,
Romain
> ---
> .checkpackageignore | 1 -
> ...n.build-add-atomic-dependency-for-sparc.patch | 16 +++++++++-------
> 2 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 9a7a3af757d3..0a1d2627455e 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -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/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/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/0002-fix-build-without-C.patch lib_patch.Upstream
> package/neard/S53neard Shellcheck lib_sysv.Indent lib_sysv.Variables
> diff --git a/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch b/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
> index fd2458976053..2b726b743753 100644
> --- a/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
> +++ b/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
> @@ -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>
> Date: Mon, 11 Feb 2019 21:42:01 +0100
> Subject: [PATCH] meson.build: add atomic dependency for sparc
> @@ -11,16 +11,18 @@ Fixes:
> - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
>
> 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 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/meson.build b/meson.build
> -index 2e6defc..b393e39 100644
> +index fa0eff9408b6..819674cbede4 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -174,6 +174,9 @@ else
> +@@ -232,6 +232,9 @@ else
> pcre_dep = declare_dependency()
> endif
>
> @@ -30,14 +32,14 @@ index 2e6defc..b393e39 100644
> inc = include_directories(
> 'src',
>
> -@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc',
> +@@ -445,6 +448,7 @@ ncmpc = executable('ncmpc',
> sources,
> include_directories: inc,
> dependencies: [
> + atomic_dep,
> thread_dep,
> - boost_dep,
> + event_dep,
> pcre_dep,
> --
> -2.14.1
> +2.43.0
>
To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
@@ -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/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/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/0002-fix-build-without-C.patch lib_patch.Upstream
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>
Date: Mon, 11 Feb 2019 21:42:01 +0100
Subject: [PATCH] meson.build: add atomic dependency for sparc
@@ -11,16 +11,18 @@ Fixes:
- http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
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 ++++
1 file changed, 4 insertions(+)
diff --git a/meson.build b/meson.build
-index 2e6defc..b393e39 100644
+index fa0eff9408b6..819674cbede4 100644
--- a/meson.build
+++ b/meson.build
-@@ -174,6 +174,9 @@ else
+@@ -232,6 +232,9 @@ else
pcre_dep = declare_dependency()
endif
@@ -30,14 +32,14 @@ index 2e6defc..b393e39 100644
inc = include_directories(
'src',
-@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc',
+@@ -445,6 +448,7 @@ ncmpc = executable('ncmpc',
sources,
include_directories: inc,
dependencies: [
+ atomic_dep,
thread_dep,
- boost_dep,
+ event_dep,
pcre_dep,
--
-2.14.1
+2.43.0