mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

gnome-font-viewer: upgrade 46.0 -> 47.0

Browse Source 
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Wang Mingyu
2024-09-19 11:31:50 +08:00
committed by Khem Raj
parent ccf80accab
commit c4f9170a42
2 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
View File

@@ -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

3
meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb → meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_47.0.bb
View File

@@ -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 \