diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2020-07-13 23:03:47 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2020-07-13 23:03:47 +0300 |
| commit | 877c8a956648f6d07bd889efcf54ee1768a9917e (patch) | |
| tree | 4645b3c6ac122a7ac1a631d67fb599d3e4bf1f2c /snap | |
| parent | ef5bab22b3c92f67315212cfc8d90e49aee5387a (diff) | |
Adding 0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch from FreeRDP
Diffstat (limited to 'snap')
| -rw-r--r-- | snap/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch | 28 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 8 |
2 files changed, 36 insertions, 0 deletions
diff --git a/snap/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch b/snap/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch new file mode 100644 index 000000000..b56c3af38 --- /dev/null +++ b/snap/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch @@ -0,0 +1,28 @@ +From 62530e2d9dab999d1c5ddd1368d67c599dccd580 Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.novak@thincast.com> +Date: Tue, 23 Jun 2020 09:24:35 +0200 +Subject: [PATCH 03/34] Fixed #6298: Mask CACHED_BRUSH when checking brush + style + +(cherry picked from commit ce1a9d8d1969ecbb4d24b9f4812654638a44abc2) +--- + libfreerdp/core/orders.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c +index dc4e51a87..537e69426 100644 +--- a/libfreerdp/core/orders.c ++++ b/libfreerdp/core/orders.c +@@ -139,7 +139,8 @@ static BYTE get_bmf_bpp(UINT32 bmf, BOOL* pValid) + { + if (pValid) + *pValid = TRUE; +- switch (bmf) ++ /* Mask out highest bit */ ++ switch (bmf & (~CACHED_BRUSH)) + { + case 1: + return 1; +-- +2.25.4 + diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e9aed94f4..1cf25d5c1 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -48,10 +48,18 @@ apps: command: winpr-hash parts: + patches: + source: snap/patches + plugin: dump + prime: + - -* freerdp: + after: + - patches plugin: cmake source: https://github.com/FreeRDP/FreeRDP.git source-tag: 2.1.2 + prepare: git apply $SNAPCRAFT_STAGE/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch source-depth: 1 build-packages: - build-essential |