From 283fc0ea2ead994a07e6c3c5b8009e2bdcb348ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 28 Mar 2025 22:38:24 +0100 Subject: [PATCH] package/freerdp: bump to latest commit on legacy stable branch FreeRDP fails to build on newer gcc: /freerdp-2.11.7/libfreerdp/core/info.c:88:39: error: initialization of 'const WCHAR *' {aka 'const short unsigned int *'} from incompatible pointer type 'BYTE *' {aka 'unsigned char *'} [-Wincompatible-pointer-types] 88 | const WCHAR* domain = Stream_Pointer(s); | ^~~~~~~~~~~~~~ There is a patch upstream [0] to fix that one, but then another similar build failure triggers, which is also fixed upstream, but then a third failre triggers, again fixed upstream [2], but then... FreeRDP 2.x has been kinda discontinued, and the new stable is 3.x. However, bumping to 3.x looks like a huge leap. So, rather than backport, just bump to the latest commit on the stable-2.0 branch, which carries 12 non-merge commits with build fixes: 562ae3588 [winpr,pubsub] add NULL parameter checks 68c7c21b9 X11 client: ignore grab related LeaveNotify events a9deecc99 fix [core]: 'invalid hHandle' errors 052c525e0 [core] eliminate rdpRdp::instance be23ed4ba [server,proxy] deactivate capture module 5b2b53b15 [warnings] fix -Wincompatible-pointer-types 67818bddb [client,wayland] fix const correctness d2b6771c7 X11: fix pointer/integer type mismatch [2] 7894a7dfc redirection: Fix incompatible pointer type [1] f3ed1f1ac redirection: Fix incompatible pointer type [0] 4f411197d info: Fix incompatible pointer type a383740a2 next-dev-2.11.8-dev Fixes: http://autobuild.buildroot.org/results/e1b/e1b95b4fb0005d4e933b027b508cec9ad510bd73/ http://autobuild.buildroot.org/results/ba0/ba0beae13e1be2573878ee50b1566f4427b269a3/ ... Signed-off-by: Yann E. MORIN Signed-off-by: Julien Olivain (cherry picked from commit 15f15cfe019fc1788c01e5819d238328d4282aa1) --- package/freerdp/freerdp.hash | 4 +--- package/freerdp/freerdp.mk | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 1007215cd6..83b83db121 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,3 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.7.tar.gz.sha256 -sha256 5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3 freerdp-2.11.7.tar.gz - # Locally calculated +sha256 f7cc2bf43b9778e9079cd229ea8e37fc1843eb1c11a8e4e003034af71858ce6a freerdp-2.11.7-18-g0ee17e2f8e49d56ab5b90d5160fa8f87ffc445e0-git4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index e8c8f320a9..3a1ba61621 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,8 +4,10 @@ # ################################################################################ -FREERDP_VERSION = 2.11.7 -FREERDP_SITE = https://pub.freerdp.com/releases +# Latest, and probably last, commit on the stable-2.0 branch +FREERDP_VERSION = 2.11.7-18-g0ee17e2f8e49d56ab5b90d5160fa8f87ffc445e0 +FREERDP_SITE = https://github.com/FreeRDP/FreeRDP +FREERDP_SITE_METHOD = git FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 FREERDP_LICENSE_FILES = LICENSE