diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2024-09-19 11:31:50 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-09-18 21:03:14 -0700 |
| commit | 0fbddf00e73cc50c7a48de1371486d469910157c (patch) | |
| tree | f0cd7b5f29d75386da2a7ea42ab2c15ef52359ab | |
| parent | 0d117dfdcee1eb7bf88d416f0f7e23ce06d80e54 (diff) | |
| download | meta-openembedded-0fbddf00e73cc50c7a48de1371486d469910157c.tar.gz | |
gnome-font-viewer: upgrade 46.0 -> 47.0
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch | 43 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_47.0.bb (renamed from meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb) | 3 |
2 files changed, 1 insertions, 45 deletions
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 be4c002fc3..0000000000 --- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Matt Turner <mattst88@gmail.com> | ||
| 3 | Date: Sat, 8 Jul 2023 00:01:07 -0400 | ||
| 4 | Subject: [PATCH] window: Fix function callback definition | ||
| 5 | |||
| 6 | Without this, the build fails with clang with | ||
| 7 | CFLAGS=-Werror=incompatible-function-pointer-types | ||
| 8 | |||
| 9 | ``` | ||
| 10 | ../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] | ||
| 11 | gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb); | ||
| 12 | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
| 13 | /usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here | ||
| 14 | GtkWidgetActionActivateFunc activate); | ||
| 15 | ^ | ||
| 16 | ``` | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54] | ||
| 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 20 | --- | ||
| 21 | src/font-view-window.c | 5 ++++- | ||
| 22 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 23 | |||
| 24 | diff --git a/src/font-view-window.c b/src/font-view-window.c | ||
| 25 | index 639ac33..24461f7 100644 | ||
| 26 | --- a/src/font-view-window.c | ||
| 27 | +++ b/src/font-view-window.c | ||
| 28 | @@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self) | ||
| 29 | } | ||
| 30 | |||
| 31 | static void | ||
| 32 | -action_toggle_search_cb (FontViewWindow *self) | ||
| 33 | +action_toggle_search_cb (GtkWidget *widget, | ||
| 34 | + const char *action_name, | ||
| 35 | + GVariant *parameter) | ||
| 36 | { | ||
| 37 | + FontViewWindow *self = FONT_VIEW_WINDOW (widget); | ||
| 38 | |||
| 39 | gtk_toggle_button_set_active (self->search_button, | ||
| 40 | !gtk_toggle_button_get_active (self->search_button)); | ||
| 41 | -- | ||
| 42 | 2.45.1 | ||
| 43 | |||
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 index ccf8262dcd..4763d1717d 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 | |||
| 15 | 15 | ||
| 16 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | 16 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
| 17 | 17 | ||
| 18 | SRC_URI += "file://0001-window-Fix-function-callback-definition.patch" | 18 | SRC_URI[archive.sha256sum] = "b8e5a042e0b241b0c7cae43f74da0d5f88e6423017a91feb86e7617edb4080ed" |
| 19 | SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c" | ||
| 20 | 19 | ||
| 21 | FILES:${PN} += " \ | 20 | FILES:${PN} += " \ |
| 22 | ${datadir}/dbus-1 \ | 21 | ${datadir}/dbus-1 \ |
