summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2024-05-22 13:31:07 -0400
committerMike Gilbert <floppym@gentoo.org>2024-05-22 13:33:24 -0400
commit836bf3fddd54b483b4a68a0ac7b2ec2a2b3d0805 (patch)
tree62409b8a55da8dd983e4f9017fdc463f71246126 /net-misc/freerdp
parentnet-misc/r8125: crank copyright (diff)
downloadgentoo-836bf3fddd54b483b4a68a0ac7b2ec2a2b3d0805.tar.gz
gentoo-836bf3fddd54b483b4a68a0ac7b2ec2a2b3d0805.tar.bz2
gentoo-836bf3fddd54b483b4a68a0ac7b2ec2a2b3d0805.zip
net-misc/freerdp: fix pointer/integer type mismatch
Closes: https://bugs.gentoo.org/932407 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-misc/freerdp')
-rw-r--r--net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch24
-rw-r--r--net-misc/freerdp/freerdp-2.11.7.ebuild1
2 files changed, 25 insertions, 0 deletions
diff --git a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch
new file mode 100644
index 000000000000..731bbee4cb3c
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch
@@ -0,0 +1,24 @@
+From b50f3818ab4dfca852e8c1dd009b6b64c31a0382 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 22 May 2024 13:23:36 -0400
+Subject: [PATCH] X11: fix pointer/integer type mismatch
+
+This was fixed on master as part of
+641022b7953bb04e80b5058cd07149d0cf454aee.
+---
+ client/X11/xf_graphics.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
+index 5aa1fd48b5a3..a3793e64d9f1 100644
+--- a/client/X11/xf_graphics.c
++++ b/client/X11/xf_graphics.c
+@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer)
+
+ #endif
+ fail:
+- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1);
++ WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : NULL);
+ return rc;
+ }
+
diff --git a/net-misc/freerdp/freerdp-2.11.7.ebuild b/net-misc/freerdp/freerdp-2.11.7.ebuild
index b17a66b5c459..966ad5d7d626 100644
--- a/net-misc/freerdp/freerdp-2.11.7.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.7.ebuild
@@ -106,6 +106,7 @@ src_prepare() {
local PATCHES=(
"${FILESDIR}/freerdp-2.11.2-clang.patch"
"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
+ "${FILESDIR}/freerdp-2.11.7-type-mismatch.patch"
)
cmake_src_prepare
}