summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch32
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp_2.10.0.bb (renamed from meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb)7
2 files changed, 3 insertions, 36 deletions
diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch
deleted file mode 100644
index ce230dbf22..0000000000
--- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 9c785ca0535d9c24e6699ee1243b427c1407acb5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 17 Jan 2023 19:31:17 -0800
4Subject: [PATCH] Fix incompatible function pointer types
5
6clang 16+ is flagging the function pointer prototype mismatches,
7therefore fix it.
8
9Fixes Issue #8487
10
11Upstream-Status: Submitted [https://github.com/FreeRDP/FreeRDP/pull/8622]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 client/X11/xf_disp.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c
18index 32ddb626c..ef0cb93ff 100644
19--- a/client/X11/xf_disp.c
20+++ b/client/X11/xf_disp.c
21@@ -248,7 +248,7 @@ static void xf_disp_OnTimer(void* context, TimerEventArgs* e)
22 xf_disp_sendResize(xfDisp);
23 }
24
25-static void xf_disp_OnWindowStateChange(void* context, const WindowStateChangeEventArgs* e)
26+static void xf_disp_OnWindowStateChange(void* context, WindowStateChangeEventArgs* e)
27 {
28 xfContext* xfc;
29 xfDispContext* xfDisp;
30--
312.39.1
32
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.10.0.bb
index 3b8fee0f5f..a1bf67ca11 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.10.0.bb
@@ -13,11 +13,10 @@ inherit pkgconfig cmake gitpkgv
13PE = "1" 13PE = "1"
14PKGV = "${GITPKGVTAG}" 14PKGV = "${GITPKGVTAG}"
15 15
16SRCREV = "fa8e1b1c765a4466030ac52240f052c0b440a4d1" 16SRCREV = "7471ae383e7b7a613f275e19f7b54958a193c891"
17SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ 17SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
18 file://winpr-makecert-Build-with-install-RPATH.patch \ 18 file://winpr-makecert-Build-with-install-RPATH.patch \
19 file://0001-Fix-incompatible-function-pointer-types.patch \ 19 "
20"
21 20
22S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
23 22