diff mbox series

[meta-gnome,05/28] gnome-font-viewer: upgrade 46.0 -> 47.0

Message ID 1726716733-14548-5-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe,01/28] bdwgc: upgrade 8.2.6 -> 8.2.8 | expand

Commit Message

Mingyu Wang (Fujitsu) Sept. 19, 2024, 3:31 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-window-Fix-function-callback-definition.patch
removed since it's included in 47.0

Changelog:
=========
* Set application name and icon
* Remove unused dependency on gnome-desktop
* Add slant preview
* Fix install button mnemonic
* Fix the "Install" button stuck in "Installing" when font install is successful
* Use adaptive dialogs

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...dow-Fix-function-callback-definition.patch | 43 -------------------
 ...ewer_46.0.bb => gnome-font-viewer_47.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
 rename meta-gnome/recipes-gnome/gnome-font-viewer/{gnome-font-viewer_46.0.bb => gnome-font-viewer_47.0.bb} (71%)
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
deleted file mode 100644
index be4c002fc..000000000
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-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_47.0.bb
similarity index 71%
rename from meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
rename to meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_47.0.bb
index ccf8262dc..4763d1717 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_47.0.bb
@@ -15,8 +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"
+SRC_URI[archive.sha256sum] = "b8e5a042e0b241b0c7cae43f74da0d5f88e6423017a91feb86e7617edb4080ed"
 
 FILES:${PN} += " \
     ${datadir}/dbus-1 \