From 983eb6a25799bb9cf1fa48939fa446862558f2ff Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 8 Jan 2024 21:19:31 +0800 Subject: ghex: upgrade 45.0 -> 45.1 0001-gtkhex-Local-variables-in-switch-statement-should-be.patch removed since it included in 45.1 Changelog ======== - gtkhex: Local variables in switch statement should be in own scope (ie, fix clang build issues) - appwin: Mark error message string properly translatable Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...l-variables-in-switch-statement-should-be.patch | 50 ---------------------- meta-gnome/recipes-gnome/ghex/ghex_45.0.bb | 21 --------- meta-gnome/recipes-gnome/ghex/ghex_45.1.bb | 20 +++++++++ 3 files changed, 20 insertions(+), 71 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch delete mode 100644 meta-gnome/recipes-gnome/ghex/ghex_45.0.bb create mode 100644 meta-gnome/recipes-gnome/ghex/ghex_45.1.bb diff --git a/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch b/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch deleted file mode 100644 index 61cd3b1809..0000000000 --- a/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b00b8332ab19e41c75ce143f45ab4585502c020b Mon Sep 17 00:00:00 2001 -From: Logan Rathbone -Date: Tue, 24 Oct 2023 14:06:04 -0400 -Subject: [PATCH] gtkhex: Local variables in switch statement should be in own - scope - -Fixes: #74 - -Thanks to: David C. Manuelda - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/ghex/-/commit/b00b8332ab19e41c75ce143f45ab4585502c020b] ---- - src/gtkhex.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gtkhex.c b/src/gtkhex.c -index b401cd9..18e0433 100644 ---- a/src/gtkhex.c -+++ b/src/gtkhex.c -@@ -1941,6 +1941,7 @@ key_press_cb (GtkEventControllerKey *controller, - break; - - case GDK_KEY_Home: -+ { - gint64 line_beg = self->cursor_pos; - - while (line_beg % self->cpl != 0) -@@ -1948,9 +1949,11 @@ key_press_cb (GtkEventControllerKey *controller, - - hex_widget_set_cursor (self, line_beg); - ret = GDK_EVENT_STOP; -+ } - break; - - case GDK_KEY_End: -+ { - gint64 line_end = self->cursor_pos; - - while (line_end % self->cpl != self->cpl - 1) -@@ -1958,6 +1961,7 @@ key_press_cb (GtkEventControllerKey *controller, - - hex_widget_set_cursor (self, MIN (line_end, payload_size)); - ret = GDK_EVENT_STOP; -+ } - break; - - default: --- -2.42.0 - diff --git a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb b/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb deleted file mode 100644 index 42c53471bb..0000000000 --- a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "GHex - a hex editor for GNOME" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - - -DEPENDS = " \ - desktop-file-utils-native \ - glib-2.0-native \ - gtk4 \ - libadwaita \ -" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen - -SRC_URI += "file://0001-gtkhex-Local-variables-in-switch-statement-should-be.patch" -SRC_URI[archive.sha256sum] = "05cecc4561ca40b257c5db31da9f68d696133efc0ae427ed82fb985a986e840e" - -FILES:${PN} += "${libdir} ${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb b/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb new file mode 100644 index 0000000000..2b6adaf91c --- /dev/null +++ b/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "GHex - a hex editor for GNOME" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + + +DEPENDS = " \ + desktop-file-utils-native \ + glib-2.0-native \ + gtk4 \ + libadwaita \ +" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen + +SRC_URI[archive.sha256sum] = "fb2b0823cd16249edbeaee8302f9bd5005e0150368b35f1e47c26680cacac2fa" + +FILES:${PN} += "${libdir} ${datadir}/metainfo" -- cgit v1.2.3-54-g00ecf