From patchwork Wed Jul 3 19:58:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3166 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C802A3F102 for ; Wed, 3 Jul 2024 21:58:39 +0200 (CEST) Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2ee87e69b53sf11428601fa.0 for ; Wed, 03 Jul 2024 12:58:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720036719; cv=pass; d=google.com; s=arc-20160816; b=CCvgOy8cAG/9I75FFKuyII8T1MkjSS0aAmfFAlYXC+BEqm2OJbpfstHVj30uQi1Lrj FkivrjpG4wHjl57uQgJaFAQYPQRxNbJsWLMnsHVMI7MDMlhbLnpn5HXW7j8qJfooddwk mSQhy8OnQd3UpSFsvq9J7VPBfM7XFxJ2ofoA6EvmxWbEhL89x+el3VlGcFaiVYfWEopl gHLf8fi3eHo6846OXBFju3tD0HB7FjSBTT/Ct0huO4TMcUvR9EU68U/aX5o0bkh5d0nv qDFdTdNrNDHnsjeeo+gbCDhPP+J0HZ5mikn/sxNREwjly3i7B1oOkUF+HjZxye2ikQT1 RhCw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=giCdSGvGmEyp7WctaaSbOndSBeWnA3G+BJ6iN8nkhsE=; fh=PqlqGVul3qetx71/eG/DeiNfh9EPGiE9GGvOFRPoJic=; b=V+gLorM9T7b1aji4WB4sqs/ttVnwHSRbws+sRRl0nBA4qsPoCfQcmE76kBTgq8uSdJ MuDUVAhzEbQ2eu9Nm/VVcJ7HCITutRxsxWT5sK2LodBQMoFFSHXYfOfIr+Gopi5L1CzR paIM5Ll0A+A5PaNe6dzuBS2mIpxOgWNyjhtts8i7bOEXhTz1j8TMGvQBLJZPLNnklb74 xEAbqdIKBGp6eJ8sLhNdx6UoxSvlk1ULbZPp+UdgeGBzvvhRvfRKePmXBWXwEIwgnDW7 adj6ogKnGyyT5r4w+ZsmKCG4BVaannaOf8vN8m5tOZZBEulP2Iwkt6CO6vDdjk1GoAox lqlw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hBmVmMMG; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720036719; x=1720641519; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=giCdSGvGmEyp7WctaaSbOndSBeWnA3G+BJ6iN8nkhsE=; b=njQSUkvtzcE1AzMgjBqGVayQ6aUVsy7KLOnDibkiaxda9jtuJZ1MCIbhW4Lhc3Zvm8 T95Ot4wS1OHAWeXhRD+s+uVbXaTQutc2ozl18FwL2mBj7uBq3NIe2VR8EHUZwXt3TQ79 f93lxJLS9AxzNNv+qwEfQLOqALc7vnYPwiDd8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720036719; x=1720641519; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=giCdSGvGmEyp7WctaaSbOndSBeWnA3G+BJ6iN8nkhsE=; b=liEJuKUMIR64UjMMdCGBoecX4P8MLDehC8aKAc8ES6aBGHAs71S6y6JUUMeGCSIMYW LZ9yMFCXJCRLLoAv0G/rc/cFDbfMm0+Xv92/7GvQHekf4Y4qUJfET2rbovKiIGiE2z7q noD75MkL8Nbr4G1NHYx9duKGjuecNiFIk0oz462NV8igAVk3BYb0fjHH2Dji6MQ6fgAV yip0QvexUNgnNPBaHoGMhFApsxhOIo1zADkqfdTg3r7t3ouMCB/utGhysGUFLTcaO9XC CqznMB1Rbqlw75H/0AauZG/aPguH3tRgWHTpFtT72VwFjTdCX38UO1LuCibr/lmRPzp4 JTaQ== X-Forwarded-Encrypted: i=2; AJvYcCUn0UbHLe0wqoSpBpcTrmlcPLx7pRJdAUzoF5lHSsEteurm13CeLDhWDhy8qHV/5xXz7Ij6dvRxVMlrjPFMJEfT/1ytnFZ3HOugoIL8G+4vaIvD/AIml0uIESTmKg== X-Gm-Message-State: AOJu0Ywf1L1D+fE5oCrfVx8IhwZVFWFUgq1+7SfY6zfhT32Lbi7IgIPh q8eoeGtq1LHmzMnC8FazjyFPF+0So1CAYiQrhWroPXFk+QDvRv0q1LaAo3Teh2cSAw== X-Google-Smtp-Source: AGHT+IHo3XVB1WTrHmU8Jlw+wlPZsNGi3rfo4ZJABKHUn/vwPv9YapmD0Zweam5Oh7ns8mY1+UUkcQ== X-Received: by 2002:a05:651c:2223:b0:2ee:4d37:91df with SMTP id 38308e7fff4ca-2ee5e3bb7fdmr124483331fa.27.1720036718849; Wed, 03 Jul 2024 12:58:38 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:651c:2041:b0:2ec:447d:c292 with SMTP id 38308e7fff4ca-2ee8cdbe872ls133081fa.2.-pod-prod-05-eu; Wed, 03 Jul 2024 12:58:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVAadFsSsNZYeq85u/HAi/XyKHuXXZBfhhsngu+ID2pacFLlOI6DRpzOAIzvgJ/FD910PVVMbOcs0HIluZWlMPOwGIt6B+VvMAp2waPl6JjCS2x X-Received: by 2002:a05:6512:33d5:b0:52c:ab21:7c05 with SMTP id 2adb3069b0e04-52e8274a85amr10524966e87.67.1720036716077; Wed, 03 Jul 2024 12:58:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720036716; cv=none; d=google.com; s=arc-20160816; b=Uz9r+ENGd3uMa0ZEggN56KTK5vqy57sv4FPRez6SCZ3zCUg3/tr6E95399aEBBXxuV /Iatx6416RiyD7J1uvoAYoIHjSFCmEaoenY59rSAceOgKDNpGwQL6PoYFXkBUdQudpGH nnjJK9MUIFKnK4e/Kho8zxLui4yGFnV3gAXIIFavwrPJ/sh0yD+tBYKk8qG1V9adWKyR LE9ofpCb/TAZws2v2foQhyEp2/roc0/LQKu9+XQjnRETMs5BtqsweKN7JwF1Yn7NFJzA eXHgkBoW4FogMPlb6vuTC3l5tOyDQnzEA6qQ2I1pU8UovKeSidiSlREtsS96REt9OErL OIMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=D/PULVwvvkF2drspSjDnVbvIR/Lh5367/5t1wl8HynY=; fh=qIkkQTnW/rErBfiPXj7qMXi6JOL84nnzEeLN4FzL1rw=; b=ZvWIs2NVPh8woGbKJh2N48VrJhtnBAx2S0dB9NbqzRjfPhdNG4TULpal6oVehwTKlp wCLSvl+XxTsGSU3vKkJFZNHvD+TufLUBS0dZUIXElCYxhJKsgFUCXEjanCn4F0b8gp7F WxZxa1lky4YEmqzlNH9p5E9WBnvn8Bt0kqFWsq/oky+AGrgjZ87jOth8baD75D5WLLFu CVhxcdY3VEg6Ad35yh2vQxODIvX42aDsa8Tc81KY+KkrPQD8k8CMZmAHar5Tb3+sxpMh kjeT7OlR8iBOpe1LrYDYYENh5J05O6T1HnwvfUYjKl8HUNRfH96RNeinRaC6OSa4GICS xHNw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hBmVmMMG; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a729d840394sor163325166b.12.2024.07.03.12.58.35 for (Google Transport Security); Wed, 03 Jul 2024 12:58:36 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWD4nhykPoZvZq5n8msp7ES+0lQJtPL+FrJvg+ZpSaBlgY07MyGf2ELD6Ur5KtT579Tpf5uUYbSBIvW6afTS7NVJwABKUujRZDtMYuu9/yZSmnT X-Received: by 2002:a05:6402:2549:b0:57d:42f6:63fe with SMTP id 4fb4d7f45d1cf-5879f69b504mr11690148a12.22.1720036715618; Wed, 03 Jul 2024 12:58:35 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58d4b19b6eesm929705a12.76.2024.07.03.12.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 12:58:35 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Fabrice Fontaine , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/ncmpc: update the patches to be applied with fuzz 0 Date: Wed, 3 Jul 2024 21:58:32 +0200 Message-ID: <20240703195832.2891159-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hBmVmMMG; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- .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 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 -[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 --- 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