commit: 45a3c66532de7f6623828424ec0ee2fe9f64b24b Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jun 30 14:22:57 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Jun 30 14:22:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a3c665
net-misc/freerdp: backport bug fix Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../freerdp/files/2.1.2-mask-cached_brush.patch | 23 ++++++++++++++++++++++ ...reerdp-2.1.2.ebuild => freerdp-2.1.2-r1.ebuild} | 3 +++ 2 files changed, 26 insertions(+) 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 00000000000..bb8fedb1992 --- /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.no...@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 similarity index 97% rename from net-misc/freerdp/freerdp-2.1.2.ebuild rename to net-misc/freerdp/freerdp-2.1.2-r1.ebuild index 0370121a8a9..539d21bc322 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 }