diff mbox series

[meta-gnome,4/20] gnome-console: upgrade 47.1 -> 50.0

Message ID 20260801131138.3299410-4-ankur.tyagi85@gmail.com
State New
Headers show
Series [meta-oe,1/20] imagemagick: upgrade 7.1.28 -> 7.1.29 | expand

Commit Message

Ankur Tyagi Aug. 1, 2026, 1:11 p.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch which is now merged in the upstream version.

https://gitlab.gnome.org/GNOME/console/-/blob/50.0/NEWS?ref_type=tags

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../0001-include-locale.h-for-setlocale.patch | 34 -------------------
 ...-console_47.1.bb => gnome-console_50.0.bb} |  4 +--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch
 rename meta-gnome/recipes-gnome/gnome-console/{gnome-console_47.1.bb => gnome-console_50.0.bb} (78%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch b/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch
deleted file mode 100644
index 28f26476ce..0000000000
--- a/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From e72f6da3d509561b75e223667a0380772e7bd48a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Sep 2024 20:38:09 -0700
-Subject: [PATCH] include locale.h for setlocale()
-
-This issue is surfaced on systems+clang
-
-Fixes
-../gnome-console-47.0/src/main.c:29:3: error: call to undeclared function 'setlocale'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-   29 |   setlocale (LC_ALL, "");
-      |   ^
-../gnome-console-47.0/src/main.c:29:14: error: use of undeclared identifier 'LC_ALL'
-   29 |   setlocale (LC_ALL, "");
-      |              ^
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/console/-/merge_requests/171]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index af9c5a5..5d16160 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -17,7 +17,7 @@
-  */
- 
- #include <glib/gi18n.h>
--
-+#include <locale.h>
- #include <kgx.h>
- 
- int
diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console_47.1.bb b/meta-gnome/recipes-gnome/gnome-console/gnome-console_50.0.bb
similarity index 78%
rename from meta-gnome/recipes-gnome/gnome-console/gnome-console_47.1.bb
rename to meta-gnome/recipes-gnome/gnome-console/gnome-console_50.0.bb
index fd1e98a992..0ec64f9cc8 100644
--- a/meta-gnome/recipes-gnome/gnome-console/gnome-console_47.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-console/gnome-console_50.0.bb
@@ -17,8 +17,8 @@  DEPENDS = " \
     pcre2 \
     vte \
 "
-SRC_URI += "file://0001-include-locale.h-for-setlocale.patch"
-SRC_URI[archive.sha256sum] = "d3f600b45b51716691aee92870332e9c9a8ca89d553565f3131d9e28074725d0"
+
+SRC_URI[archive.sha256sum] = "e4950207f0547e6a6c0f18eebfcf6e1a10461eab0f2fae0aae512b1044c7ac6e"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"