From 47e2a9baa7b9f4f33cdbc5c11f1d5915ea8c050d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 3 Jan 2023 10:15:48 +1000 Subject: [PATCH] json_c: use setlocale instead uselocale * fix GIMP crash on start --- dev-libs/json_c/json_c-0.15.recipe | 2 +- dev-libs/json_c/patches/json_c-0.15.patchset | 27 ++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dev-libs/json_c/json_c-0.15.recipe b/dev-libs/json_c/json_c-0.15.recipe index b5249deb2..c9f2c70bc 100644 --- a/dev-libs/json_c/json_c-0.15.recipe +++ b/dev-libs/json_c/json_c-0.15.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2009-2012, 2016-2017 Eric Haszlakiewicz 2008-2009 Yahoo! Inc. 2016 Alexandru Ardelean" LICENSE="MIT" -REVISION="2" +REVISION="3" SOURCE_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-$portVersion.tar.gz" CHECKSUM_SHA256="b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6" SOURCE_DIR="json-c-$portVersion" diff --git a/dev-libs/json_c/patches/json_c-0.15.patchset b/dev-libs/json_c/patches/json_c-0.15.patchset index a7a4363a5..a7d4311ae 100644 --- a/dev-libs/json_c/patches/json_c-0.15.patchset +++ b/dev-libs/json_c/patches/json_c-0.15.patchset @@ -1,4 +1,4 @@ -From a617ad82183769147818333d3b3bd6f8ea9c7a84 Mon Sep 17 00:00:00 2001 +From edb2e5269bc67ed332ac12da5f0cb985a6d25ef3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 20 Oct 2020 18:10:27 +0200 Subject: rusage is incomplete @@ -27,7 +27,7 @@ index bba4622..706a6b3 100644 2.37.3 -From c9660b93bef99d169913343abd3e308621949ab7 Mon Sep 17 00:00:00 2001 +From d3066a66c1c2b7038ad44be8d835eb0066f09cd1 Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 25 Dec 2022 11:46:12 +0100 Subject: Fix install for $includeDir @@ -46,3 +46,26 @@ index 99ab904..04482af 100644 -- 2.37.3 + +From d0b066b5e84b0660ac5165daaa981f2e220b6565 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 3 Jan 2023 10:13:36 +1000 +Subject: Use setlocale instead uselocale + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04482af..3cc2d41 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -177,7 +177,7 @@ if (HAVE_STDLIB_H) + endif() + if (HAVE_LOCALE_H) + check_symbol_exists(setlocale "locale.h" HAVE_SETLOCALE) +- check_symbol_exists(uselocale "locale.h" HAVE_USELOCALE) ++# check_symbol_exists(uselocale "locale.h" HAVE_USELOCALE) + endif() + if (HAVE_STRINGS_H) + check_symbol_exists(strcasecmp "strings.h" HAVE_STRCASECMP) +-- +2.37.3 +