diff mbox series

[meta-oe] freerdp: remove 0001-Fix-const-qualifier-error.patch

Message ID 20260326174714.3811074-1-martin.jansa@gmail.com
State New
Headers show
Series [meta-oe] freerdp: remove 0001-Fix-const-qualifier-error.patch | expand

Commit Message

Martin Jansa March 26, 2026, 5:47 p.m. UTC 
From: Martin Jansa <martin.jansa@gmail.com>

Instead of fixing the build with clang this is now breaking it after 2.11.8 commit:
https://github.com/FreeRDP/FreeRDP/commit/67818bddb31900cdf3acb26cb0b673cc90b71cc9

freerdp/2.11.8/git/client/Wayland/wlfreerdp.c:637:19: error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(const void *)') from 'void *(void *)' [-Wincompatible-function-pointer-types]
  637 |         obj->fnObjectNew = uwac_event_clone;
      |                          ^ ~~~~~~~~~~~~~~~~

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 .../0001-Fix-const-qualifier-error.patch      | 57 -------------------
 .../recipes-support/freerdp/freerdp_2.11.8.bb |  1 -
 2 files changed, 58 deletions(-)
 delete mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch

Comments

Khem Raj March 26, 2026, 5:53 p.m. UTC | #1 
Ankur sent a patch earlier, does that fix it ?
https://lore.kernel.org/openembedded-devel/20260324192553.2628357-2-ankur.tyagi85@gmail.com/T/#u

On Thu, Mar 26, 2026 at 10:47 AM Martin Jansa via lists.openembedded.org
<martin.jansa=gmail.com@lists.openembedded.org> wrote:

> From: Martin Jansa <martin.jansa@gmail.com>
>
> Instead of fixing the build with clang this is now breaking it after
> 2.11.8 commit:
>
> https://github.com/FreeRDP/FreeRDP/commit/67818bddb31900cdf3acb26cb0b673cc90b71cc9
>
> freerdp/2.11.8/git/client/Wayland/wlfreerdp.c:637:19: error: incompatible
> function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(const
> void *)') from 'void *(void *)' [-Wincompatible-function-pointer-types]
>   637 |         obj->fnObjectNew = uwac_event_clone;
>       |                          ^ ~~~~~~~~~~~~~~~~
>
> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> ---
>  .../0001-Fix-const-qualifier-error.patch      | 57 -------------------
>  .../recipes-support/freerdp/freerdp_2.11.8.bb |  1 -
>  2 files changed, 58 deletions(-)
>  delete mode 100644
> meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
>
> diff --git
> a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
> b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
> deleted file mode 100644
> index 87a456d16d..0000000000
> ---
> a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001
> -From: Wang Mingyu <wangmy@fujitsu.com>
> -Date: Mon, 11 Sep 2023 09:00:39 +0000
> -Subject: [PATCH] Fix const qualifier error
> -
> -Fixes clang error
> -error: incompatible function pointer types assigning to 'OBJECT_NEW_FN'
> (aka 'void *(*)(void *)') from 'void *(const void *)'
> [-Wincompatible-function-pointer-types]
> -|         obj->fnObjectNew = uwac_event_clone;
> -|                          ^ ~~~~~~~~~~~~~~~~
> -
> -
> https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8
> -Upstream-Status
> <https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8-Upstream-Status>:
> Backport
> -
> -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ----
> - libfreerdp/codec/rfx.c            | 4 ++--
> - winpr/include/winpr/collections.h | 2 +-
> - 2 files changed, 3 insertions(+), 3 deletions(-)
> -
> -diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
> -index ccbc5af..eec7365 100644
> ---- a/libfreerdp/codec/rfx.c
> -+++ b/libfreerdp/codec/rfx.c
> -@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj)
> -       }
> - }
> -
> --static void* rfx_decoder_tile_new(void* val)
> -+static void* rfx_decoder_tile_new(const void* val)
> - {
> -       RFX_TILE* tile = NULL;
> -       WINPR_UNUSED(val);
> -@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj)
> -       }
> - }
> -
> --static void* rfx_encoder_tile_new(void* val)
> -+static void* rfx_encoder_tile_new(const void* val)
> - {
> -       WINPR_UNUSED(val);
> -       return calloc(1, sizeof(RFX_TILE));
> -diff --git a/winpr/include/winpr/collections.h
> b/winpr/include/winpr/collections.h
> -index 807f011..b8c8d9d 100644
> ---- a/winpr/include/winpr/collections.h
> -+++ b/winpr/include/winpr/collections.h
> -@@ -36,7 +36,7 @@ extern "C"
> - {
> - #endif
> -
> --      typedef void* (*OBJECT_NEW_FN)(void* val);
> -+      typedef void* (*OBJECT_NEW_FN)(const void* val);
> -       typedef void (*OBJECT_INIT_FN)(void* obj);
> -       typedef void (*OBJECT_UNINIT_FN)(void* obj);
> -       typedef void (*OBJECT_FREE_FN)(void* obj);
> ---
> -2.34.1
> -
> diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
> b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
> index 9c3d532438..c596aaa328 100644
> --- a/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
> +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
> @@ -16,7 +16,6 @@ PKGV = "${GITPKGVTAG}"
>  SRCREV = "9b678b6d5a40ce01607d8c3b1b1416437c8416c4"
>  SRC_URI = "git://
> github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
>             file://winpr-makecert-Build-with-install-RPATH.patch \
> -           file://0001-Fix-const-qualifier-error.patch \
>             file://0002-Do-not-install-tools-a-CMake-targets.patch \
>             file://CVE-2024-32661.patch \
>             "
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#125765):
> https://lists.openembedded.org/g/openembedded-devel/message/125765
> Mute This Topic: https://lists.openembedded.org/mt/118522890/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Martin Jansa March 26, 2026, 5:57 p.m. UTC | #2 
I'm sorry, I've missed [scarthgap] in subject, the issue is I think
only in scarthgap after
https://git.openembedded.org/meta-openembedded/commit/?h=scarthgap&id=e7dcdee56806f08175ed9516c6febdae36a465a1
merged yesterday, haven't tried 2.11.8 in master (which looks
different than what was merged in scarthgap unfortunately)

On Thu, Mar 26, 2026 at 6:54 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> Ankur sent a patch earlier, does that fix it ?
> https://lore.kernel.org/openembedded-devel/20260324192553.2628357-2-ankur.tyagi85@gmail.com/T/#u
>
> On Thu, Mar 26, 2026 at 10:47 AM Martin Jansa via lists.openembedded.org <martin.jansa=gmail.com@lists.openembedded.org> wrote:
>>
>> From: Martin Jansa <martin.jansa@gmail.com>
>>
>> Instead of fixing the build with clang this is now breaking it after 2.11.8 commit:
>> https://github.com/FreeRDP/FreeRDP/commit/67818bddb31900cdf3acb26cb0b673cc90b71cc9
>>
>> freerdp/2.11.8/git/client/Wayland/wlfreerdp.c:637:19: error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(const void *)') from 'void *(void *)' [-Wincompatible-function-pointer-types]
>>   637 |         obj->fnObjectNew = uwac_event_clone;
>>       |                          ^ ~~~~~~~~~~~~~~~~
>>
>> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
>> ---
>>  .../0001-Fix-const-qualifier-error.patch      | 57 -------------------
>>  .../recipes-support/freerdp/freerdp_2.11.8.bb |  1 -
>>  2 files changed, 58 deletions(-)
>>  delete mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
>>
>> diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
>> deleted file mode 100644
>> index 87a456d16d..0000000000
>> --- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
>> +++ /dev/null
>> @@ -1,57 +0,0 @@
>> -From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001
>> -From: Wang Mingyu <wangmy@fujitsu.com>
>> -Date: Mon, 11 Sep 2023 09:00:39 +0000
>> -Subject: [PATCH] Fix const qualifier error
>> -
>> -Fixes clang error
>> -error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const void *)' [-Wincompatible-function-pointer-types]
>> -|         obj->fnObjectNew = uwac_event_clone;
>> -|                          ^ ~~~~~~~~~~~~~~~~
>> -
>> -https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8
>> -Upstream-Status: Backport
>> -
>> -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>> ----
>> - libfreerdp/codec/rfx.c            | 4 ++--
>> - winpr/include/winpr/collections.h | 2 +-
>> - 2 files changed, 3 insertions(+), 3 deletions(-)
>> -
>> -diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
>> -index ccbc5af..eec7365 100644
>> ---- a/libfreerdp/codec/rfx.c
>> -+++ b/libfreerdp/codec/rfx.c
>> -@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj)
>> -       }
>> - }
>> -
>> --static void* rfx_decoder_tile_new(void* val)
>> -+static void* rfx_decoder_tile_new(const void* val)
>> - {
>> -       RFX_TILE* tile = NULL;
>> -       WINPR_UNUSED(val);
>> -@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj)
>> -       }
>> - }
>> -
>> --static void* rfx_encoder_tile_new(void* val)
>> -+static void* rfx_encoder_tile_new(const void* val)
>> - {
>> -       WINPR_UNUSED(val);
>> -       return calloc(1, sizeof(RFX_TILE));
>> -diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h
>> -index 807f011..b8c8d9d 100644
>> ---- a/winpr/include/winpr/collections.h
>> -+++ b/winpr/include/winpr/collections.h
>> -@@ -36,7 +36,7 @@ extern "C"
>> - {
>> - #endif
>> -
>> --      typedef void* (*OBJECT_NEW_FN)(void* val);
>> -+      typedef void* (*OBJECT_NEW_FN)(const void* val);
>> -       typedef void (*OBJECT_INIT_FN)(void* obj);
>> -       typedef void (*OBJECT_UNINIT_FN)(void* obj);
>> -       typedef void (*OBJECT_FREE_FN)(void* obj);
>> ---
>> -2.34.1
>> -
>> diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
>> index 9c3d532438..c596aaa328 100644
>> --- a/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
>> +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
>> @@ -16,7 +16,6 @@ PKGV = "${GITPKGVTAG}"
>>  SRCREV = "9b678b6d5a40ce01607d8c3b1b1416437c8416c4"
>>  SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
>>             file://winpr-makecert-Build-with-install-RPATH.patch \
>> -           file://0001-Fix-const-qualifier-error.patch \
>>             file://0002-Do-not-install-tools-a-CMake-targets.patch \
>>             file://CVE-2024-32661.patch \
>>             "
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#125765): https://lists.openembedded.org/g/openembedded-devel/message/125765
>> Mute This Topic: https://lists.openembedded.org/mt/118522890/1997914
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
deleted file mode 100644
index 87a456d16d..0000000000
--- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch
+++ /dev/null
@@ -1,57 +0,0 @@ 
-From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Mon, 11 Sep 2023 09:00:39 +0000
-Subject: [PATCH] Fix const qualifier error
-
-Fixes clang error
-error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const void *)' [-Wincompatible-function-pointer-types]
-|         obj->fnObjectNew = uwac_event_clone;
-|                          ^ ~~~~~~~~~~~~~~~~
-
-https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8
-Upstream-Status: Backport
-
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- libfreerdp/codec/rfx.c            | 4 ++--
- winpr/include/winpr/collections.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
-index ccbc5af..eec7365 100644
---- a/libfreerdp/codec/rfx.c
-+++ b/libfreerdp/codec/rfx.c
-@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj)
- 	}
- }
- 
--static void* rfx_decoder_tile_new(void* val)
-+static void* rfx_decoder_tile_new(const void* val)
- {
- 	RFX_TILE* tile = NULL;
- 	WINPR_UNUSED(val);
-@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj)
- 	}
- }
- 
--static void* rfx_encoder_tile_new(void* val)
-+static void* rfx_encoder_tile_new(const void* val)
- {
- 	WINPR_UNUSED(val);
- 	return calloc(1, sizeof(RFX_TILE));
-diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h
-index 807f011..b8c8d9d 100644
---- a/winpr/include/winpr/collections.h
-+++ b/winpr/include/winpr/collections.h
-@@ -36,7 +36,7 @@ extern "C"
- {
- #endif
- 
--	typedef void* (*OBJECT_NEW_FN)(void* val);
-+	typedef void* (*OBJECT_NEW_FN)(const void* val);
- 	typedef void (*OBJECT_INIT_FN)(void* obj);
- 	typedef void (*OBJECT_UNINIT_FN)(void* obj);
- 	typedef void (*OBJECT_FREE_FN)(void* obj);
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
index 9c3d532438..c596aaa328 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.8.bb
@@ -16,7 +16,6 @@  PKGV = "${GITPKGVTAG}"
 SRCREV = "9b678b6d5a40ce01607d8c3b1b1416437c8416c4"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
            file://winpr-makecert-Build-with-install-RPATH.patch \
-           file://0001-Fix-const-qualifier-error.patch \
            file://0002-Do-not-install-tools-a-CMake-targets.patch \
            file://CVE-2024-32661.patch \
            "