Skip to content

Commit

Permalink
package/freerdp: update the patches to be applied with fuzz 0
Browse files Browse the repository at this point in the history
Commit 8f88a64 ("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 <[email protected]>
Signed-off-by: Arnout Vandecappelle <[email protected]>
  • Loading branch information
passgat authored and arnout committed Jul 2, 2024
1 parent e987d16 commit 93a52a7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
17 changes: 11 additions & 6 deletions package/freerdp/0001-Fix-variable-declaration-in-loop.patch
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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 <[email protected]>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <[email protected]>
---
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);

Expand All @@ -30,3 +32,6 @@ index 76fbef5bd6..bf71b563c3 100644
{
XFreeCursor(xfc->display, xpointer->cursors[i]);
}
--
2.43.0

17 changes: 11 additions & 6 deletions package/freerdp/0002-Fixed-variable-declaration-in-loop.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
From 4f8a48d96e472e43a5f856c449f61669792ce9fa Mon Sep 17 00:00:00 2001
From b0b856590b523869358875594841f3e6c2919569 Mon Sep 17 00:00:00 2001
From: akallabeth <[email protected]>
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 <[email protected]>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <[email protected]>
---
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;
Expand All @@ -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

0 comments on commit 93a52a7

Please sign in to comment.