diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-06-30 10:22:57 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-06-30 10:22:57 -0400 |
| commit | 45a3c66532de7f6623828424ec0ee2fe9f64b24b (patch) | |
| tree | bbc40ce5f80e2bba334161168a06c7d9cf673c71 /net-misc/freerdp | |
| parent | net-misc/freerdp: remove old (diff) | |
| download | gentoo-45a3c66532de7f6623828424ec0ee2fe9f64b24b.tar.gz gentoo-45a3c66532de7f6623828424ec0ee2fe9f64b24b.tar.bz2 gentoo-45a3c66532de7f6623828424ec0ee2fe9f64b24b.zip | |
net-misc/freerdp: backport bug fix
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-misc/freerdp')
| -rw-r--r-- | net-misc/freerdp/files/2.1.2-mask-cached_brush.patch | 23 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-2.1.2-r1.ebuild (renamed from net-misc/freerdp/freerdp-2.1.2.ebuild) | 3 |
2 files changed, 26 insertions, 0 deletions
diff --git a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch new file mode 100644 index 000000000000..bb8fedb19926 --- /dev/null +++ b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch @@ -0,0 +1,23 @@ +From ce1a9d8d1969ecbb4d24b9f4812654638a44abc2 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] Fixed #6298: Mask CACHED_BRUSH when checking brush style + +--- + 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 dc4e51a873..537e694264 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; diff --git a/net-misc/freerdp/freerdp-2.1.2.ebuild b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild index 0370121a8a94..539d21bc322f 100644 --- a/net-misc/freerdp/freerdp-2.1.2.ebuild +++ b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild @@ -90,6 +90,9 @@ BDEPEND=" " src_prepare() { + local PATCHES=( + "${FILESDIR}/2.1.2-mask-cached_brush.patch" + ) cmake_src_prepare echo "${PV}" > .source_version || die } |