From patchwork Sun Jul 7 19:44:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3198 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id EED5F3F1F3 for ; Sun, 7 Jul 2024 21:44:49 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-58bd8406816sf2714758a12.0 for ; Sun, 07 Jul 2024 12:44:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720381489; cv=pass; d=google.com; s=arc-20160816; b=i09Sz1+lMN+5fP2ZqdVQA8P1JI3K+440/TaSs4ImwQ3TXx+Z5xri0jYRtS6uobQMHa FedGwV+BfFPlaQi1Zl9plhjXqlJ2ru8FXlHBxc4cmYMo2+uWtG5xllL8bNxpPNAWOUdK FP7163NHZvf1HjSMLnVx5bjAgbkywfyVZn4CMHvZGfhqrUi6uzY+VVzVtl+3k8sGNWA8 RCJ1yNJj7Kk9IT8Mu0QbyxX0YVoeRiwm1PG0rtPuY+PJUuKPRvps2KKZ50h5ocX0GpuH hufKL1y5RjDTbxX97YKhht7NsaBclO3uxEt8afWAItaltSsWDgnrTi2G7myjnVFGsoXv gd7Q== 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=sxXoarFLml4ybyd8JI6aYuT1V2vuvJU7okeIY3h3yOc=; fh=MCfwFSJ68RnJTb1FqlcK3Ww1VTj4TMDOargp89jdmlE=; b=rQ6JjzgOF9uqqJMSVis4OKLxwfoNcV0qXYIIklToK4VYdvDiwCjXIz5wJjxPE7KLej 4WasL3XceI6J/1OyvrgD9CxcOcyJ7rXsGLIuJrilkXpqahGbXe7su1vxBjk28hEY7M3y ecF/4x0hXEWZEWxrtHOQ12i9XSLmy+k7tnfsPi/iD3nV1W9NMnkvQGi9jzG0UHUjs0N8 VlsoUdiov9MVOO3Vr2q0Am7AE7JRIScKW7lZTiUTKulTxFYX7dZcf/+LumOUCGu3Ahoz FVBB0JKX8/DBQ7P6QLEPQai6icwTWtNSN/HoXl2J+tZExuO2iI8I6PswwIYYpDzyXspZ M/CQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jVSy2zop; 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=1720381489; x=1720986289; 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=sxXoarFLml4ybyd8JI6aYuT1V2vuvJU7okeIY3h3yOc=; b=Pb6p9Q3N5q4ss5c6YhgjZlDMi/c2ERcPMmwtjuk/kicjYHzNvnvK4xTviI6yDF0x2S H786rsnDKKvJCFzA22TUv7FcHb8IMO1qYkPjz1YcCAnRo+Ree9PHHRRQE7w++cUrqHAx TOzy7Gm+/84ST+oCj81tHRFjk/7pwxKgNs4xA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720381489; x=1720986289; 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=sxXoarFLml4ybyd8JI6aYuT1V2vuvJU7okeIY3h3yOc=; b=VIwBYhubs9GQzPT7/f1nsfECLXbPRrdNWZMv3EqWRfKbew619BC96QAH/m1Zz5T4Fz YjyBVZyrjh3JRi2W+f5F/UohJQ+6+HD2Q+6SYuedz0xxFiqOSTqu3VSLqkhAkdjBHbf3 cBHNEBudB7Gnw4gP63OXbvIKXrIlUAMlhr0AA108gayxYtHGJWo6MUN475CLOXc0q4R1 NXdZ2KUj7yljkB8fVmLfo1u5sW92adyqhWGOGNtKlhsawopoDGTPAeP0qu21BpOhCJJp 1kdYJKmlXoG8p4oF2Xlz+AX39xYlTESYbWLuqTTkeadKmlv9O3KjpFnEbjkBFzu5EHfo XlJQ== X-Forwarded-Encrypted: i=2; AJvYcCV4dfMCZMVthVcsHmya+64XrVe9m5dFnp9YNqJL0z3sQwy3NNoA/LXJeo1RGm1H34uMIsh3D1SpaMJvO85JfqCsM4nfAS29gEw2wt1MzxM3geV3FhhLIgKc+0VXFg== X-Gm-Message-State: AOJu0Yz2epLlxdPAzqTpxqyIIxPBerMpDr8RkZ10UjkOH/OGdeM1sSgw GXkHtD6rMgJIPwASAAmeu4XI1pytz9eiaQeiFLQZr0QZjaXoEMDR72nI2n3DRzt/dA== X-Google-Smtp-Source: AGHT+IH+vHePIsJPbSOw0/u7TMnGy+Sm2FIJaBMFb1pj37/FKlGgOE0ZI5cdEFJogsh8yQvDpfJywQ== X-Received: by 2002:a05:6402:34d4:b0:58e:450b:d9f9 with SMTP id 4fb4d7f45d1cf-58e5c72fe77mr6319612a12.29.1720381489492; Sun, 07 Jul 2024 12:44:49 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1d2e:b0:58c:3dc1:35d4 with SMTP id 4fb4d7f45d1cf-58e2009a50els1707318a12.0.-pod-prod-01-eu; Sun, 07 Jul 2024 12:44:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUh4zuTrGLJcRnSdfPZZG22ygxJB2bwjkF3zTkYtRXoNrvKbk0L+jEyIhEpkp4NRfETFGs9CKT9F9+R2r5gLd8bW4wfk/zZijNUziZKd9dOfhYz X-Received: by 2002:a05:6402:40cc:b0:585:59d1:52da with SMTP id 4fb4d7f45d1cf-58e5a8e698cmr7489924a12.1.1720381487888; Sun, 07 Jul 2024 12:44:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720381487; cv=none; d=google.com; s=arc-20160816; b=jNhBdbUvd6sG8AMBSiXzGlneauieo0qum9hqZuGGYmS1ovpoFmEHWkipllRq23Px61 CzLrh86+j/GQhrM8MxUCnJbJ/3haRyUCFB72aRhweQ429jyJlu6fuAlXlkBOC4TJ8ud2 TDblOA/L8TxC6lqjwzJilTSghYKTOnpcQ6J2rzlUzXLs8uwPYZmjkbZUfmt91W73cRi8 w1KqO6r+iu8xvmSzIaf71WVB6pDZeWLPzjtjNsQE2dR0fh4oSKyB3ihn2Z76GSIMhSjd 8TWrbieDGHrVbU7vzRzk1RtBCw/fqgrAV+oovzsY5GRYMOAsG1fmCjgBriMXD8WP7Fcj jjow== 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=yPDkcsIkHcRw4F+Al7TxfdqyrbWKKd9xx944ZMi+QtM=; fh=t/24ZEV3DWowqz47ooqBM8MxGkQ4M2liGzJdUZw8TZA=; b=aBygiHxtWoGqEuGOsIZDNGkVyIvzy5oqGKs9Mjw1xPqp9ep4nowuexJPzsT4R3/2xe 1qvdrZdqO6LoRZjTXkhqtPeT9JW2GdOda/8qMFvnXpe0y38IWFswUsFWQAdkjNpHas+V 2mpa2oHGX2Nr3ud5JxRr9XP9MfM84lLGInaFSPlRem7l5J1JrF6s1BsT7Q8dQqEB7j7d aiFUIOVpoTng2cqGlTCe19jUstw+8WWKm2FzXAI/nweqlDpefUbSCp3RACsBTOiyWRck qCO+/QfmK0+z4r+a5v2eLf4UKBqJvjq77D5Fud9G/VFxraCBshgNQcj1KyQ0PMcBUZg8 s97A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jVSy2zop; 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 4fb4d7f45d1cf-58b36c9a907sor2986535a12.11.2024.07.07.12.44.47 for (Google Transport Security); Sun, 07 Jul 2024 12:44:47 -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; AJvYcCXMTvrbQSWXrIBDBYir/R3TTfgraP1Se2Ax2z7DLz0FyNq4mOFpJEpJ4qeyAsE8dvXTaZQo3Hgd2ladiEmfNGVncfiQrXPof3/OoiaS2+KtzBzp X-Received: by 2002:aa7:d5d6:0:b0:58d:703b:c1d5 with SMTP id 4fb4d7f45d1cf-58e5cd151b2mr5488147a12.38.1720381487389; Sun, 07 Jul 2024 12:44:47 -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-58dfd5aeda6sm4764325a12.78.2024.07.07.12.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 12:44:47 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Julien Corjon , Giulio Benetti , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/qt5/qt5webkit: fix patch fuzz Date: Sun, 7 Jul 2024 21:44:39 +0200 Message-ID: <20240707194439.371088-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=jVSy2zop; 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, qt5webkit fails to build with output: Applying 0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch using patch: patching file Source/WTF/wtf/glib/GRefPtr.h Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file Source/WTF/wtf/glib/GRefPtr.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- ...Remove-invalid-g_object-declarations-to-fix-build-wi.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch index 48605e4fe4fb..e3a1faec9c90 100644 --- a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch +++ b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch @@ -8,6 +8,8 @@ g_object_ref_sink is defined as a macro meanwhile and so the build fails. Just remove the declarations, glib.h is included anyway. Signed-off-by: James Hilliard [Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058] +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Source/WTF/wtf/glib/GRefPtr.h | 3 --- 1 file changed, 3 deletions(-) @@ -17,8 +19,8 @@ index 06133d82cb35..d9a1d2f145f5 100644 --- a/Source/WTF/wtf/glib/GRefPtr.h +++ b/Source/WTF/wtf/glib/GRefPtr.h @@ -29,9 +29,6 @@ + #include #include - #include -extern "C" void g_object_unref(gpointer); -extern "C" gpointer g_object_ref_sink(gpointer);