Skip to content

Commit 93a52a7

Browse files
passgatarnout
authored andcommitted
package/freerdp: update the patches to be applied with fuzz 0
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 <dario.binacchi@amarulasolutions.com> Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
1 parent e987d16 commit 93a52a7

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
From ddde652460350b962d32036981ff8ed77ed2f1ed Mon Sep 17 00:00:00 2001
1+
From 48f25939f4a48b01072f3cd2ece1e36a41c0ad44 Mon Sep 17 00:00:00 2001
22
From: Armin Novak <armin.novak@thincast.com>
33
Date: Wed, 16 Sep 2020 09:30:37 +0200
44
Subject: [PATCH] Fix variable declaration in loop
55

66
Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed
77
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
8+
[Dario: make the patch to be applied with fuzz factor 0]
9+
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
810
---
911
client/X11/xf_graphics.c | 3 ++-
1012
1 file changed, 2 insertions(+), 1 deletion(-)
1113

1214
diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
13-
index 76fbef5bd6..bf71b563c3 100644
15+
index 5aa1fd48b5a3..c8f24362aec7 100644
1416
--- a/client/X11/xf_graphics.c
1517
+++ b/client/X11/xf_graphics.c
16-
@@ -386,6 +386,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer)
17-
static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
18-
{
18+
@@ -447,6 +447,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
19+
WLog_DBG(TAG, "%s: %p", __func__, pointer);
20+
1921
#ifdef WITH_XCURSOR
2022
+ UINT32 i;
2123
xfContext* xfc = (xfContext*)context;
2224
xfPointer* xpointer = (xfPointer*)pointer;
2325

24-
@@ -395,7 +396,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
26+
@@ -456,7 +457,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
2527
free(xpointer->cursorWidths);
2628
free(xpointer->cursorHeights);
2729

@@ -30,3 +32,6 @@ index 76fbef5bd6..bf71b563c3 100644
3032
{
3133
XFreeCursor(xfc->display, xpointer->cursors[i]);
3234
}
35+
--
36+
2.43.0
37+
Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
From 4f8a48d96e472e43a5f856c449f61669792ce9fa Mon Sep 17 00:00:00 2001
1+
From b0b856590b523869358875594841f3e6c2919569 Mon Sep 17 00:00:00 2001
22
From: akallabeth <akallabeth@posteo.net>
33
Date: Tue, 22 Sep 2020 07:43:56 +0200
44
Subject: [PATCH] Fixed variable declaration in loop
55

66
Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa
77
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
8+
[Dario: make the patch to be applied with fuzz factor 0]
9+
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
810
---
911
client/X11/xf_graphics.c | 4 ++--
1012
1 file changed, 2 insertions(+), 2 deletions(-)
1113

1214
diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
13-
index bf71b563c3..c50726c8e4 100644
15+
index c8f24362aec7..c8b604cc6ad4 100644
1416
--- a/client/X11/xf_graphics.c
1517
+++ b/client/X11/xf_graphics.c
16-
@@ -240,7 +240,7 @@ static BOOL _xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpP
18+
@@ -246,7 +246,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpPo
1719
double xscale;
1820
double yscale;
1921
size_t size;
@@ -22,12 +24,15 @@ index bf71b563c3..c50726c8e4 100644
2224

2325
if (!context || !pointer || !context->gdi)
2426
return FALSE;
25-
@@ -255,7 +255,7 @@ static BOOL _xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpP
26-
xTargetSize = pointer->width * xscale;
27-
yTargetSize = pointer->height * yscale;
27+
@@ -264,7 +264,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, const rdpPo
28+
WLog_DBG(TAG, "%s: scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32, __func__,
29+
xfc->scaledWidth, xfc->savedHeight, settings->DesktopWidth, settings->DesktopHeight);
2830

2931
- for (int i = 0; i < xpointer->nCursors; i++)
3032
+ for (i = 0; i < xpointer->nCursors; i++)
3133
{
3234
if (xpointer->cursorWidths[i] == xTargetSize && xpointer->cursorHeights[i] == yTargetSize)
3335
{
36+
--
37+
2.43.0
38+

0 commit comments

Comments
 (0)