commit: e8b9fd5af31bc85a1d1f73ad57c889b698833bc9 Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com> AuthorDate: Mon Sep 18 22:38:23 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Sep 19 01:52:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b9fd5a
media-gfx/gnome-font-viewer: Version bump to 45.0 Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32915 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-gfx/gnome-font-viewer/Manifest | 1 + ...0-window-Fix-function-callback-definition.patch | 42 ++++++++++++++++++++++ .../gnome-font-viewer-45.0.ebuild | 34 ++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest index 6a13952cb57e..8272c179c8b2 100644 --- a/media-gfx/gnome-font-viewer/Manifest +++ b/media-gfx/gnome-font-viewer/Manifest @@ -1,2 +1,3 @@ DIST gnome-font-viewer-44.0.tar.xz 299644 BLAKE2B 9eceda601332601a3918331c0b4dae1f588ec88d9c28323694291f22e9add115ccfd70ef8c2d3b1a410bcf7c7443810abdb58a156927c235fb895412dea54213 SHA512 f2da77fadbd76eaaf661cb518043ebad6f964a90f1cede5b58160a3aa08a0fe42a9972bc4871725dc7ae16eb4199329ef2ea08734b8017306e61341e51c37bea +DIST gnome-font-viewer-45.0.tar.xz 300420 BLAKE2B 3cc71c056a1254447a9b0c5e838a8950e0414293b9788373b1de90657e364b55784fcef7749abd4e75e29cc6246b081baab66135276744020695ef1e8952a03f SHA512 94289be78831dbc9be8d73348fd423379ebe691b08cf2547acd2648e0e7b1dafcd6c63ffa2c9ec033786b7b65912187c782bb279cc0fb6227d6ee74c1541701e DIST gnome-font-viewer-45.alpha.tar.xz 300188 BLAKE2B dde514abf5fdca8e95bf41ec6dbf2d13e038dbcd242de87a04afc85f43a36713566c60623c345765e62f31b2e911fe9631390c5ffc9457ccd4e333ccd837b149 SHA512 f906086f52989fc26775fa025618f01f3653d4360f3c59f270cd40747bef1164f31688772712e49fcbf280cc3776cdbac6e5833bb080a6c855286caf812e6e78 diff --git a/media-gfx/gnome-font-viewer/files/45.0-window-Fix-function-callback-definition.patch b/media-gfx/gnome-font-viewer/files/45.0-window-Fix-function-callback-definition.patch new file mode 100644 index 000000000000..a7a27dbb361c --- /dev/null +++ b/media-gfx/gnome-font-viewer/files/45.0-window-Fix-function-callback-definition.patch @@ -0,0 +1,42 @@ +https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54 + +From 359a3c2ea1614195c647c2c57e940805986e7ab3 Mon Sep 17 00:00:00 2001 +From: Matt Turner <matts...@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); + ^ +``` +--- + 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.41.0 + diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild new file mode 100644 index 000000000000..a47295aa9d10 --- /dev/null +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnome.org meson xdg + +DESCRIPTION="Font viewer utility for GNOME" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"; + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + >=gui-libs/gtk-4.5.0:4 + >=gui-libs/libadwaita-1.4_alpha:1 + >=media-libs/harfbuzz-0.9.9:= + media-libs/fontconfig:1.0 + media-libs/freetype:2 + gnome-base/gnome-desktop:4= + dev-libs/fribidi +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/appstream-glib + dev-libs/libxml2:2 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PV}-window-Fix-function-callback-definition.patch +)
