From patchwork Tue Jul 2 07:39:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3143 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 9053B41733 for ; Tue, 2 Jul 2024 09:39:32 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-58b92b79a46sf412407a12.0 for ; Tue, 02 Jul 2024 00:39:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719905972; cv=pass; d=google.com; s=arc-20160816; b=z+WZdZGO71UpU4RPsMbttR5TP7eD/pytIere1vZdz1GpZ5CxqA6SpVjzdxDqOC6jw5 wUhCVPg/Q3vBFPxGHPbIpDwNgxhcbfV7/x/Pb84+GVc+BlBVvHTLiax5YiPHPUEW5/4y gnS3fZjeNpK65XQB6ajdR3+kK8sp1k99d/MKJ9D/cONDUf8g3NON6rdO9hs8zV6ekxlg bWF7k3lAnANScDmqBkY2btujmVMwooAbNaWHGhLJyvGZwR4KhmcwCTWQzMpvNALiOBgM Y9chfHzJNPWwqnhQ8GG5xRG9LDBc7rCRmlbth8SOt/YmOBv8ArGkA4rULvfNo7ior+7N wZ9Q== 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=IxsIsAglkjSbUpJUk4S92SG+zJIwsjdPnUeTHSuJYus=; fh=ACpkK8/sSE+7meF0ZdqeZofD1ZRbYmua4ZoCgKyAKps=; b=qqltR5sMDyYk3uZ0pf0kpdnvOkJAdUWFnzWbHBKjUa8S0Bx0W3YrnpFmagYSdFxHt6 GEkC82/2NbGyCdQFVlNrEal7AQ1KXPCLzJqXOSvnhmeISFwZ4nlH5prhHLhmbkomrPOl aO1QHd7O/wBkfeBFje1db+NidyT/wAM51hmCDWxvR9cRPN9zW1uepQxp59BjbTkTDLgD sWvHd4xoYDCGibTwezTt71TaXi7RwkQxqrEVmyGmEHYgWX+3fADkJNliAJN/TGhuUW1/ RvYYuOOGvv1I8uiVfSju1YeIr+dEiac9BZQVQwZfZTptgISMVCaDzAlhgzcrVqOMIea2 x2lw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=A0XCvGLe; 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=1719905972; x=1720510772; 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=IxsIsAglkjSbUpJUk4S92SG+zJIwsjdPnUeTHSuJYus=; b=gIp1YoO8OjcZyWUOmyfqGO6nke13YsogZJmXfj2ZPnx72UsNeIghy/kURHkX3RQZT8 C2gaW0XEPBn3Kym8zI26TMbaXDQO09SdddimzawKAnFn6CZatocBE1blSAqq0LwGYiC/ 1f3xlXmRo6k+n2ORVjBDvKs3cxFh/HjB2tnfU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719905972; x=1720510772; 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=IxsIsAglkjSbUpJUk4S92SG+zJIwsjdPnUeTHSuJYus=; b=r40+WYP44s7NGvBiue1XdvHHNTUc448kZ21RhqzL+InkudwFnA0DJfJNLL3Qnh+rwh 36ISElC/ds6VOImFACM6W/W6exswXcEj70jE1xONDPsvNqVgcQm/BVKNE+inMMqNCYyY 5ZoX7Dkm4burUM8V/0iETwNfUoJvr3gHP5ZLi/tBKzG3NvGJC4Z6vwBv5z4JaJen20ss jsQagsCnbwRzX0A73Z9Ahw+ZghlSkklC7uDHGKBq3r4O4q3ReNo/4d627pw0OnfRk/wb +fPjpqv65kbuyFxZ4eGSH7Zq4EeOw5mXkFGA3776TjY0soJK4k5i1c9TQkrFyGbKzAWD Rdng== X-Forwarded-Encrypted: i=2; AJvYcCVtHGSwlG+rcmaPcyfO5d8MeF3H7K5VnKLlWu1Qr7yQHxqP5ooqTSB1ZzlpRy/6riYPWkqs/tzeevkpBdq/k6OJSc3J0ulS8Ma7TeUlxgYkQGbEabFj5x+rF2PIsQ== X-Gm-Message-State: AOJu0Yxzwq5H1+JmF3aS8DjoQURLr2GyoNJqvEQXmV2GSCzUBtPFWvkE oY2v3SGndVN+OfAambBMa/ms9DwFRk9/yI3E/kcHUMbB2D0aV+YpRAM4hzBCaPr1wQ== X-Google-Smtp-Source: AGHT+IHNq+1MYIjq9kGoRgpCHSMHgOv3ENVQFSu4mIxswmBHTUzjoxEweDmGZq2DIXsaFeAsM9sd6A== X-Received: by 2002:a05:6402:3550:b0:57c:53c9:ccc7 with SMTP id 4fb4d7f45d1cf-5877d29aaabmr6613269a12.0.1719905971852; Tue, 02 Jul 2024 00:39:31 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:cc11:0:b0:583:9e8e:cd8c with SMTP id 4fb4d7f45d1cf-58628a13d80ls2770647a12.1.-pod-prod-00-eu; Tue, 02 Jul 2024 00:39:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjGpHPuqfu8/FfTpa0DT6maLC8PD2fd5BgWZ4QYRsWgPggUrxWyOHAJl94aS1CgeSLQsTz+PSVZX8kQeZ13s+Z0Ox+OHTAoENbBm7GY99habmb X-Received: by 2002:a17:906:3993:b0:a72:7b17:5d68 with SMTP id a640c23a62f3a-a751386eccfmr597492966b.3.1719905970273; Tue, 02 Jul 2024 00:39:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719905970; cv=none; d=google.com; s=arc-20160816; b=Yklsjdg/t2kvv7uorRGm9ToysL0BJNZu2Fdi1uEVcFKL7O0jS7ywf6STqlnfe5A+iJ 1UKN6em9MuJyn3gdYeFehDYA5QsbixNIY1HlDkDprazGgMzLmL2w7XKBRvueji8IP3Y3 uwN0h1sGGPoKB8FvkvXW1F9Qdpoheo7JhyxuzTfuDm2U3/xJa9F0Pvo9sscXN31ueHmj bSKZxPlYAqw1TFAQVfYt7tPk3ItvXeZ6Cmh9Dxo62RwDxPa6QfzjbimQ1rtCEmERy8/P a0cYn/5KBksBFDg154oYCCRBNbeB5xaFaYp+d+gIKIaPMOSE2oq+9XcrkaY2dbRI3SEN 3CrA== 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=l+ScL1iIqE8b07sgrmsqyr2vFXRPChTp+izF0lpnx3s=; fh=huM8L1C0HD+tku1NRbn+guPhZT1gp/wKDuAS660LIDM=; b=v/40GvAQXo/qPy7gxOyqmlYhGrYmQfErYy7WN4BF85gAQpxFOCJgWoInypUJIu6ri6 f5Qs4UgySNzYiov/Fs1GYm22aBHwwXyOZs7oXQ0+8u8sUB66Am1tnuERkh5klNt4LnPA 3gNdXQXRWUv/cT/dFpd+ToBCHU88UBBN8bL7DH9II81ZH2AZgxGzskSLDTj+9DtVAL4q xRHdA7x8rumIcpCbAoPkwa/KJ40lce0pLjJiqb+BrBTE728tSQgDwQxd7UZmi9qARW6V pp/1rygQAFaxEFOqCjrnocGhDwTkzZyDVHXc11CCncu8QeSOnDZWLgFE0fYQso9wA6Gg AiEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=A0XCvGLe; 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-a7288061b3asor466300166b.2.2024.07.02.00.39.30 for (Google Transport Security); Tue, 02 Jul 2024 00:39:30 -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; AJvYcCV+9pgUTOB77ouUIODoK88BGg5FZuimS9nUVpVqoTDwsSruPdQEiDOEk6Xgkd8k5L8I4bj3Rqd4L8S46vvgYTOYT/Hy4dtblJ3easOOAJ/kTpcJ X-Received: by 2002:a05:6402:2353:b0:57c:a8e5:35f0 with SMTP id 4fb4d7f45d1cf-587800699ecmr6637939a12.2.1719905969551; Tue, 02 Jul 2024 00:39:29 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:c733:f73f:670d:ca47]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58612c83583sm5342086a12.5.2024.07.02.00.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 00:39:29 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/freerdp: update the patches to be applied with fuzz 0 Date: Tue, 2 Jul 2024 09:39:26 +0200 Message-ID: <20240702073926.2379089-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=A0XCvGLe; 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, freerdp fails to build with output: Applying 0001-Fix-variable-declaration-in-loop.patch using patch: patching file client/X11/xf_graphics.c Hunk #1 FAILED at 386. Hunk #2 succeeded at 456 (offset 61 lines). 1 out of 2 hunks FAILED -- saving rejects to file client/X11/xf_graphics.c.rej Applying 0002-Fixed-variable-declaration-in-loop.patch using patch: patching file client/X11/xf_graphics.c Hunk #1 succeeded at 246 (offset 6 lines). Hunk #2 FAILED at 255. 1 out of 2 hunks FAILED -- saving rejects to file client/X11/xf_graphics.c.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi --- .../0001-Fix-variable-declaration-in-loop.patch | 17 +++++++++++------ ...002-Fixed-variable-declaration-in-loop.patch | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index 799a92734be7..ec1795364afe 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -1,27 +1,29 @@ -From ddde652460350b962d32036981ff8ed77ed2f1ed Mon Sep 17 00:00:00 2001 +From 48f25939f4a48b01072f3cd2ece1e36a41c0ad44 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- client/X11/xf_graphics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c -index 76fbef5bd6..bf71b563c3 100644 +index 5aa1fd48b5a3..c8f24362aec7 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c -@@ -386,6 +386,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) - static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) - { +@@ -447,6 +447,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) + WLog_DBG(TAG, "%s: %p", __func__, pointer); + #ifdef WITH_XCURSOR + UINT32 i; xfContext* xfc = (xfContext*)context; xfPointer* xpointer = (xfPointer*)pointer; -@@ -395,7 +396,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) +@@ -456,7 +457,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) free(xpointer->cursorWidths); free(xpointer->cursorHeights); @@ -30,3 +32,6 @@ index 76fbef5bd6..bf71b563c3 100644 { XFreeCursor(xfc->display, xpointer->cursors[i]); } +-- +2.43.0 + diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 1a4e89943073..838844d63523 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -1,19 +1,21 @@ -From 4f8a48d96e472e43a5f856c449f61669792ce9fa Mon Sep 17 00:00:00 2001 +From b0b856590b523869358875594841f3e6c2919569 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- client/X11/xf_graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c -index bf71b563c3..c50726c8e4 100644 +index c8f24362aec7..c8b604cc6ad4 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c -@@ -240,7 +240,7 @@ static BOOL _xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpP +@@ -246,7 +246,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpPo double xscale; double yscale; size_t size; @@ -22,12 +24,15 @@ index bf71b563c3..c50726c8e4 100644 if (!context || !pointer || !context->gdi) return FALSE; -@@ -255,7 +255,7 @@ static BOOL _xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpP - xTargetSize = pointer->width * xscale; - yTargetSize = pointer->height * yscale; +@@ -264,7 +264,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpPo + WLog_DBG(TAG, "%s: scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32, __func__, + xfc->scaledWidth, xfc->savedHeight, settings->DesktopWidth, settings->DesktopHeight); - for (int i = 0; i < xpointer->nCursors; i++) + for (i = 0; i < xpointer->nCursors; i++) { if (xpointer->cursorWidths[i] == xTargetSize && xpointer->cursorHeights[i] == yTargetSize) { +-- +2.43.0 +