summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-01-08 21:19:31 +0800
committerKhem Raj <raj.khem@gmail.com>2024-01-08 19:54:41 -0800
commit983eb6a25799bb9cf1fa48939fa446862558f2ff (patch)
tree9e9aac1be1f4f5c12ef6b96b10658d3e1a2c3bad
parent922b99f8c8017945d8dd602b82511419b1933098 (diff)
downloadmeta-openembedded-983eb6a25799bb9cf1fa48939fa446862558f2ff.tar.gz
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 <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch50
-rw-r--r--meta-gnome/recipes-gnome/ghex/ghex_45.1.bb (renamed from meta-gnome/recipes-gnome/ghex/ghex_45.0.bb)3
2 files changed, 1 insertions, 52 deletions
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 @@
1From b00b8332ab19e41c75ce143f45ab4585502c020b Mon Sep 17 00:00:00 2001
2From: Logan Rathbone <poprocks@gmail.com>
3Date: Tue, 24 Oct 2023 14:06:04 -0400
4Subject: [PATCH] gtkhex: Local variables in switch statement should be in own
5 scope
6
7Fixes: #74
8
9Thanks to: David C. Manuelda
10
11Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/ghex/-/commit/b00b8332ab19e41c75ce143f45ab4585502c020b]
12---
13 src/gtkhex.c | 4 ++++
14 1 file changed, 4 insertions(+)
15
16diff --git a/src/gtkhex.c b/src/gtkhex.c
17index b401cd9..18e0433 100644
18--- a/src/gtkhex.c
19+++ b/src/gtkhex.c
20@@ -1941,6 +1941,7 @@ key_press_cb (GtkEventControllerKey *controller,
21 break;
22
23 case GDK_KEY_Home:
24+ {
25 gint64 line_beg = self->cursor_pos;
26
27 while (line_beg % self->cpl != 0)
28@@ -1948,9 +1949,11 @@ key_press_cb (GtkEventControllerKey *controller,
29
30 hex_widget_set_cursor (self, line_beg);
31 ret = GDK_EVENT_STOP;
32+ }
33 break;
34
35 case GDK_KEY_End:
36+ {
37 gint64 line_end = self->cursor_pos;
38
39 while (line_end % self->cpl != self->cpl - 1)
40@@ -1958,6 +1961,7 @@ key_press_cb (GtkEventControllerKey *controller,
41
42 hex_widget_set_cursor (self, MIN (line_end, payload_size));
43 ret = GDK_EVENT_STOP;
44+ }
45 break;
46
47 default:
48--
492.42.0
50
diff --git a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb b/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb
index 42c53471bb..2b6adaf91c 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'
15 15
16inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen 16inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen
17 17
18SRC_URI += "file://0001-gtkhex-Local-variables-in-switch-statement-should-be.patch" 18SRC_URI[archive.sha256sum] = "fb2b0823cd16249edbeaee8302f9bd5005e0150368b35f1e47c26680cacac2fa"
19SRC_URI[archive.sha256sum] = "05cecc4561ca40b257c5db31da9f68d696133efc0ae427ed82fb985a986e840e"
20 19
21FILES:${PN} += "${libdir} ${datadir}/metainfo" 20FILES:${PN} += "${libdir} ${datadir}/metainfo"