x11-libs/goocanvas: fix gcc-14

Closes: https://bugs.gentoo.org/919442
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36901
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Alfred Wingate 2024-05-30 18:33:22 +03:00 committed by Pacho Ramos
parent 0554a5d980
commit c611f2e0d7
No known key found for this signature in database
GPG Key ID: 7CB10C207FC07DBC
3 changed files with 41 additions and 0 deletions

View File

@ -0,0 +1,33 @@
https://gitlab.gnome.org/Archive/goocanvas/-/merge_requests/15
https://bugs.gentoo.org/919442
From d025d0eeae1c5266063bdc1476dbdff121bcfa57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 31 Jan 2024 17:44:59 +0100
Subject: [PATCH] Fix building with GCC 14
GCC 14 becomes stricter regarging pointer types:
goocanvasitemsimple.c: In function 'goo_canvas_item_simple_set_model':
goocanvasitemsimple.c:1539:15: error: assignment to 'GooCanvasItemModelSimple *' {aka 'struct _GooCanvasItemModelSimple *'} from incompatible pointer type 'GooCanvasItemModel *' {aka 'struct _GooCanvasItemModel *'} [-Wincompatible-pointer-types]
1539 | item->model = g_object_ref (model);
| ^
make[3]: *** [Makefile:595: goocanvasitemsimple.lo] Error 1
It looks like missing a pointer cast.
<https://bugzilla.redhat.com/2261209>
--- a/src/goocanvasitemsimple.c
+++ b/src/goocanvasitemsimple.c
@@ -1536,7 +1536,7 @@ goo_canvas_item_simple_set_model (GooCanvasItemSimple *item,
goo_canvas_item_simple_free_data (item->simple_data);
g_slice_free (GooCanvasItemSimpleData, item->simple_data);
- item->model = g_object_ref (model);
+ item->model = (GooCanvasItemModelSimple *) g_object_ref (model);
item->simple_data = &item->model->simple_data;
if (accessibility_enabled)
--
GitLab

View File

@ -27,6 +27,10 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}"/goocanvas-3.0.0-fix-gcc14.patch
)
src_prepare() {
# Do not build demos
sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \

View File

@ -27,6 +27,10 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}"/goocanvas-3.0.0-fix-gcc14.patch
)
src_prepare() {
# Do not build demos
sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \