From patchwork Sun Jul 7 12:31:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3192 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AB2C93F1F3 for ; Sun, 7 Jul 2024 14:31:38 +0200 (CEST) Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2ee94b0e2e1sf25747691fa.2 for ; Sun, 07 Jul 2024 05:31:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720355498; cv=pass; d=google.com; s=arc-20160816; b=Z8QNrW6LVHqUUI8kHpnowsA1LP36DBUUTKr71DKgW0AmPauJB7QhU87hRW7kmhJlq2 edEcarh35SDVBaqFXgGFChkvkT851FqIUGIu3Q8edWJpDFhpFJEUsw1gUZJTFcv9Jx6R WRYnkTK44SkAcQ9HVlA3Dz4myOadAZgKHZZSSDf7owNUKNJYxKrDspOKmBKDovgb9aAZ MexmAyAKYXp9ygu9J10/GEVOM29PRCNQbLZRdnJ7seCJx+yDrRxvSEmhemevohZqIIPD nnGGeQYPUMZfQc0GfLTOyrIh677uJcIkq7VyWF3RjyFyyQ1BkTkiC00VBIQgSJmCyGsL Xdzg== 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=ErFL3wToVxOPAAIWuYCPo3tm7hxMQPIYG0JWOwpcrVc=; fh=ZPnFCohw9F18PT8o/nyUS5r9BIozpRVEAfrWAyRgN08=; b=DYvSjAFRC7eNd6mFUGk53NsgAAqADLqJUCUwK0QHsjzPuhNPOR9J53bKFGkAgPCNoD Fixe2hC83EwgIVJk5wRezkpqIoVuoX0ZxdKJAazmFYol4spKXZrOyNC3jYtVI68iPc2P WuK5VlappeOkkQPO2i/UFErTqsxajgmqEp0T+xIOIAlPsbOHeAwtHmCOf0QC7Ip7jubX NfUeRk7rgCnZ5SG8OH4rBKGLCmc9goadBRt/QZPjlnpBNkpZO6NeOlW0ibiDbUcatrIb ZpqrCkC2VjgEM7ecwmiUBcKNdQ07al9EuPcxwyNOkx9lfq7BbpIQ5GM+8Y5EJURFU1I1 H4Rg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YOYJr8FK; 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=1720355498; x=1720960298; 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=ErFL3wToVxOPAAIWuYCPo3tm7hxMQPIYG0JWOwpcrVc=; b=B3I8KuxsCKrK+K9/cpQM5S4SEk2VwWK6+POp0f2/UjybfgVUxaPYxVUZ1PROLAOrPN eOzEKkOKI2L0VJunfFy6HfuzJA0ukTK3IK1I6Q5eELdcSKs66xA8VjsaFi9NL9UkauiX sdSnpeZ7lAa7jmVpGRnnfTNT/2sg8SgvowVLo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720355498; x=1720960298; 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=ErFL3wToVxOPAAIWuYCPo3tm7hxMQPIYG0JWOwpcrVc=; b=Z6jX1EFojG8LAaO+1m8lXXC2uaH4yCNhrpt49GuX1bb7cg1oEoiSsTfQJPqTiFMHBb latL7lI8jaKyLr19FzhCRg56lwySlmrqbU6ovvS9AW+VAZXf0SUiJydXGyhNT4J8LrYe 5xMjDLSnpTvgPCILeTmzEctxBNomq3Z6DKi0pKd6FGmlmfd7R2osIVZxiYL7TAMvUSf/ C8Hb7hVfIrJeyXnixwvaIlAezVcvUuW9IJ0bMs1LBqLDV1PPhzgYxhl7KpPV5XzTo1AJ gFK/oCCTZeBqHf6d8YQq1eCimlurzZ1MLbOjle2NqxHGt8qHZYuE8d6jJ7UhCkFCXNLq PpkA== X-Forwarded-Encrypted: i=2; AJvYcCUnGBG78tKa4eLHvll3Gg9alpaJgpTrKG5H4a9R7WMFm1y66syibOaBGtzsUX9voTHc42tiVsq7pMDG1uMc3hlVKarTk78QY7DJ598zGUFvM1uE7v59Y9npnBGdWA== X-Gm-Message-State: AOJu0YwmbGRNA7ggRS/n7uTbRjxTtfFevLiVu/0WzLAP+uNfPZZJbUoc j6NpdAGNDf1gdBLp+yzL3r6LNTNHwfNCyX5wamLx386YpCwIKHP7jq28f35dqSBl8g== X-Google-Smtp-Source: AGHT+IF/mJnmtoomyp4WpFCZJaMk77f/Nszp6QaHIkaBCaqGbNme9fReLlEM7Scl3iHSMNgsnDGnzA== X-Received: by 2002:a2e:9611:0:b0:2ee:7b02:7fda with SMTP id 38308e7fff4ca-2ee8ee0f71fmr56862121fa.51.1720355497835; Sun, 07 Jul 2024 05:31:37 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:cd6a:0:b0:58f:749f:1c6c with SMTP id 4fb4d7f45d1cf-58f74ae6031ls800430a12.1.-pod-prod-01-eu; Sun, 07 Jul 2024 05:31:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlMeAQ9JmrN41uOBRrQ33v5pAZaP/JvwuV6omRU2p917+FeccGC2ido3DATnSRRVhRTXqT2Mi7X/RlErqT9psM+BCUjMlafnc/OFXMYYLd7RvU X-Received: by 2002:a17:906:f0d1:b0:a72:af26:1a12 with SMTP id a640c23a62f3a-a77ba468151mr610508766b.18.1720355496396; Sun, 07 Jul 2024 05:31:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720355496; cv=none; d=google.com; s=arc-20160816; b=G2xvHAdx45ZQASLk9iBNfz8tdAhsg/FdayX41otH+CoBPUnPK16TE6DWec3lPcnkc1 kVfQc7sZBsyS4kxC3nF7B0M7qkmaJckONJjnaj/05iSXUfiVAItSXFdqLQgin98WLYMA oGE5YzVvfr6m/Wga+eB/yGjcNQrXwjFHt2KefP669PkZa64ucgvdA9LdHq6ul8tX0CzG iS60SqRGvD89OLqLuYd93qvCMOHpQRdVlmSJGX/VG67mkgwKXWcB0t+Nj83/d4kqJRBG tc5fnh1ZIG/tW95nPinXSOIAZ0ujTWrjcOpFrRiwbZv4X0KGQzH25U+sZBX2GOtK6Uqp aM1Q== 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=UbpKF3Lp3cM6rnp7/EFBQ5Ej/g/KA9OsmgiZ/LPsHv8=; fh=LKaaSpSKjCI4Bx0+JBW4q9udq1kFFi9ZGp0spqn8WbM=; b=R/by1HCVvQLalIeqtJIGtRAv2k10d+jZ+tM2uDOd98YdYsnL98iHnoOT7FN/SkbXVq Q9eGv9pBmDfLltgLaxrOuNjXHFpBJzTaKDUWmVSmZnZm9X29iwgtjSisuSqYVVwMM+QL YzheJ9FnkwLnB1FjlnKcE3I9mhZkZ0hccBr21ctq4B4NsKZLuutVWuywFFQ7d+KRKqas bn+7E0xlAvHZKh8ET6qRF4U2Q5zGNg7ZUghUldfapOR6gUtDuHfW32f349ahpk2vlgDC G7Bt+xI7NWRjFIcK1f9ThG2EUaAm5gXMltPG6h7SHI3MN593sA5+N9kZQ4xacPrLcmkF o0Dg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YOYJr8FK; 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-a77e4a1b640sor59300666b.9.2024.07.07.05.31.36 for (Google Transport Security); Sun, 07 Jul 2024 05:31: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; AJvYcCWqNUX9xV/470Ogrjanisv25Uo5we45aE/0NqB35gmxOBMzKiCq2dercV1zHNkFl5feaqxtCgc3hLxy0IKHKtT9f+5DaPVXiU6eWF+f+8qnKjXh X-Received: by 2002:a17:907:6e87:b0:a6f:12:8c45 with SMTP id a640c23a62f3a-a77ba7295f2mr778062066b.72.1720355495596; Sun, 07 Jul 2024 05:31: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 a640c23a62f3a-a77cb954f26sm218709366b.0.2024.07.07.05.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 05:31:35 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Eric Limpens , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/ympd: update the patches to be applied with fuzz 0 Date: Sun, 7 Jul 2024 14:31:29 +0200 Message-ID: <20240707123129.4045342-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=YOYJr8FK; 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, ympd fails to build with output: Applying 0002-added-forward-declarations.patch using patch: patching file src/mpd_client.c Hunk #1 succeeded at 29 (offset -1 lines). patching file src/mpd_client.h Hunk #1 FAILED at 96. 1 out of 1 hunk FAILED -- saving rejects to file src/mpd_client.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- package/ympd/0002-added-forward-declarations.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/ympd/0002-added-forward-declarations.patch b/package/ympd/0002-added-forward-declarations.patch index 90ee1eae6868..d96307d2a472 100644 --- a/package/ympd/0002-added-forward-declarations.patch +++ b/package/ympd/0002-added-forward-declarations.patch @@ -8,6 +8,8 @@ Subject: [PATCH] added forward declarations from: https://github.com/notandy/ympd/pull/191/commits/2268e0f0f372a61827b912155a1796490968b3ff] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/mpd_client.c | 2 ++ src/mpd_client.h | 6 ++++-- @@ -17,7 +19,7 @@ diff --git a/src/mpd_client.c b/src/mpd_client.c index 2911e461..9f003ab0 100644 --- a/src/mpd_client.c +++ b/src/mpd_client.c -@@ -30,6 +30,8 @@ +@@ -29,6 +29,8 @@ /* forward declaration */ static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev); @@ -30,7 +32,7 @@ diff --git a/src/mpd_client.h b/src/mpd_client.h index 447dd563..9342c550 100644 --- a/src/mpd_client.h +++ b/src/mpd_client.h -@@ -96,6 +96,8 @@ struct t_mpd { +@@ -92,7 +92,9 @@ int song_id; unsigned queue_version;