From 61ba06324f4132a76250dfdc1b55ab694b6f39a8 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Apr 05 2025 13:39:12 +0000 Subject: groups.d/211.native_packages_cmdline.d/datamash.package: bump to v1.9 Signed-off-by: Ørjan Malde --- diff --git a/groups.d/211.native_packages_cmdline.d/datamash.package b/groups.d/211.native_packages_cmdline.d/datamash.package index d160a3b..c942f30 100644 --- a/groups.d/211.native_packages_cmdline.d/datamash.package +++ b/groups.d/211.native_packages_cmdline.d/datamash.package @@ -1,5 +1,5 @@ -: ${PKG_DATAMASH_SHA256SUM:=7ad97e8c7ef616dd03aa5bd67ae24c488272db3e7d1f5774161c18b75f29f6fd}; -: ${PKG_DATAMASH_VERSION:=1.8}; +: ${PKG_DATAMASH_SHA256SUM:=f382ebda03650dd679161f758f9c0a6cc9293213438d4a77a8eda325aacb87d2}; +: ${PKG_DATAMASH_VERSION:=1.9}; : ${PKG_DATAMASH_URL:=https://ftp.gnu.org/gnu/datamash/datamash-${PKG_DATAMASH_VERSION}.tar.gz}; ex_pkg_register "datamash" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/patches/datamash-1.9.local.patch b/patches/datamash-1.9.local.patch new file mode 100644 index 0000000..06e1efd --- /dev/null +++ b/patches/datamash-1.9.local.patch @@ -0,0 +1,21 @@ +diff -ru datamash-1.9.orig/lib/getlocalename_l-unsafe.c datamash-1.9/lib/getlocalename_l-unsafe.c +--- datamash-1.9.orig/lib/getlocalename_l-unsafe.c 2025-03-28 20:25:41.000000000 +0100 ++++ datamash-1.9/lib/getlocalename_l-unsafe.c 2025-04-05 15:32:36.072309321 +0200 +@@ -30,7 +30,7 @@ + #endif + #include "setlocale_null.h" + +-#if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__ ++#if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__ || defined __midipix__ + # include + #endif + #if defined __sun +@@ -480,7 +480,7 @@ + nl_langinfo_l (_NL_LOCALE_NAME (category), locale). */ + name = locale->__names[category]; + return (struct string_with_storage) { name, STORAGE_OBJECT }; +-#elif defined __linux__ && HAVE_LANGINFO_H && defined NL_LOCALE_NAME ++#elif (defined __linux__ || defined __midipix__) && HAVE_LANGINFO_H && defined NL_LOCALE_NAME + /* musl libc */ + const char *name = nl_langinfo_l (NL_LOCALE_NAME (category), locale); + return (struct string_with_storage) { name, STORAGE_OBJECT };