shared-mime-info: 2.3 -> 2.4

Changes: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/releases/2.4

Changed files
+2 -40
pkgs
data
misc
+2 -9
pkgs/data/misc/shared-mime-info/default.nix
···
{ stdenv
, lib
, fetchFromGitLab
-
, fetchpatch
, meson
, ninja
, pkg-config
···
stdenv.mkDerivation rec {
pname = "shared-mime-info";
-
version = "2.3";
+
version = "2.4";
outputs = [ "out" "dev" ];
···
owner = "xdg";
repo = pname;
rev = version;
-
sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE=";
+
hash = "sha256-5eyMkfSBUOD7p8woIYTgz5C/L8uQMXyr0fhL0l23VMA=";
};
-
-
patches = [
-
# Submitted upstream at
-
# https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211
-
./fix-clang-warnings.patch
-
];
nativeBuildInputs = [
meson
-31
pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch
···
-
diff --git a/meson.build b/meson.build
-
index 1780c44..7998a51 100644
-
--- a/meson.build
-
+++ b/meson.build
-
@@ -49,12 +49,7 @@ endif
-
###############################################################################
-
# Dependencies
-
-
-check_functions = [
-
- 'fdatasync',
-
-]
-
-foreach function : check_functions
-
- config.set('HAVE_'+function.to_upper(), cc.has_function(function))
-
-endforeach
-
+config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>'))
-
-
-
if get_option('build-translations')
-
diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp
-
index 733ba06..4ca6d06 100644
-
--- a/src/update-mime-database.cpp
-
+++ b/src/update-mime-database.cpp
-
@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path)
-
-
env = getenv("XDG_DATA_DIRS");
-
if (!env)
-
- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
-
+ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/";
-
dirs = g_strsplit(env, PATH_SEPARATOR, 0);
-
g_return_if_fail(dirs != NULL);
-
for (n = 0; dirs[n]; n++)