diff mbox series

[meta-gnome] ghex: upgrade 45.0 -> 45.1

Message ID 1704719971-29844-1-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-gnome] ghex: upgrade 45.0 -> 45.1 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 8, 2024, 1:19 p.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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 <wangmy@fujitsu.com>
---
 ...iables-in-switch-statement-should-be.patch | 50 -------------------
 .../ghex/{ghex_45.0.bb => ghex_45.1.bb}       |  3 +-
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch
 rename meta-gnome/recipes-gnome/ghex/{ghex_45.0.bb => ghex_45.1.bb} (71%)
diff mbox series

Patch

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 61cd3b180..000000000
--- 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 <poprocks@gmail.com>
-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.1.bb
similarity index 71%
rename from meta-gnome/recipes-gnome/ghex/ghex_45.0.bb
rename to meta-gnome/recipes-gnome/ghex/ghex_45.1.bb
index 42c53471b..2b6adaf91 100644
--- a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb
+++ b/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb
@@ -15,7 +15,6 @@  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"
+SRC_URI[archive.sha256sum] = "fb2b0823cd16249edbeaee8302f9bd5005e0150368b35f1e47c26680cacac2fa"
 
 FILES:${PN} += "${libdir} ${datadir}/metainfo"