diff mbox series

[meta-gnome,12/22] gnome-font-viewer: Fix build with GCC-14

Message ID 20240521181024.426176-12-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,01/22] libsdl: Fix build with musl | expand

Commit Message

Khem Raj May 21, 2024, 6:10 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...dow-Fix-function-callback-definition.patch | 43 +++++++++++++++++++
 .../gnome-font-viewer_46.0.bb                 |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
new file mode 100644
index 0000000000..be4c002fc3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
@@ -0,0 +1,43 @@ 
+From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 8 Jul 2023 00:01:07 -0400
+Subject: [PATCH] window: Fix function callback definition
+
+Without this, the build fails with clang with
+CFLAGS=-Werror=incompatible-function-pointer-types
+
+```
+../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types]
+  gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb);
+                                                                            ^~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here
+                                                         GtkWidgetActionActivateFunc  activate);
+                                                                                      ^
+```
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/font-view-window.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/font-view-window.c b/src/font-view-window.c
+index 639ac33..24461f7 100644
+--- a/src/font-view-window.c
++++ b/src/font-view-window.c
+@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self)
+ }
+ 
+ static void
+-action_toggle_search_cb (FontViewWindow *self)
++action_toggle_search_cb (GtkWidget  *widget,
++                         const char *action_name,
++                         GVariant   *parameter)
+ {
++  FontViewWindow *self = FONT_VIEW_WINDOW (widget);
+ 
+  gtk_toggle_button_set_active (self->search_button,
+                                !gtk_toggle_button_get_active (self->search_button));
+-- 
+2.45.1
+
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
index dbce71d121..ccf8262dcd 100644
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
@@ -15,6 +15,7 @@  inherit gnomebase gtk-icon-cache gettext features_check mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
+SRC_URI += "file://0001-window-Fix-function-callback-definition.patch"
 SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c"
 
 FILES:${PN} += " \