Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared-mime-info-2.4

Browse Source
This commit is contained in:
Rmys
2023-11-16 21:43:25 +03:00
parent a592a0c012
commit 48896790e5
4 changed files with 11 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/misc/shared-mime-info/files/157c16b09f54741aefbc4be6a3507455f0378389.patch
-281
View File
@@ -1,281 +0,0 @@
From 157c16b09f54741aefbc4be6a3507455f0378389 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sun, 8 Oct 2023 13:26:43 +0000
Subject: [PATCH] Fix missing sentinel warning with clang
This fixes the compiler warnings similar as following.
../src/update-mime-database.cpp:393:50: warning: missing sentinel in function call [-Wsentinel]
393 | g_strconcat(namespaceURI, " ", localName, NULL),
| ^
| , nullptr
---
src/update-mime-database.cpp | 58 ++++++++++++++++++------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp
index 29d82a9d..7838a0eb 100644
--- a/src/update-mime-database.cpp
+++ b/src/update-mime-database.cpp
@@ -390,7 +390,7 @@ static void add_namespace(Type *type, const char *namespaceURI,
}
g_hash_table_insert(namespace_hash,
- g_strconcat(namespaceURI, " ", localName, NULL),
+ g_strconcat(namespaceURI, " ", localName, nullptr),
type);
}
@@ -1023,7 +1023,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data)
char *lower;
lower = g_ascii_strdown(type->media, -1);
- media = g_strconcat(mime_dir, "/", lower, NULL);
+ media = g_strconcat(mime_dir, "/", lower, nullptr);
g_free(lower);
#ifdef _WIN32
fs::create_directory(media);
@@ -1032,7 +1032,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data)
#endif
lower = g_ascii_strdown(type->subtype, -1);
- filename = g_strconcat(media, "/", lower, ".xml.new", NULL);
+ filename = g_strconcat(media, "/", lower, ".xml.new", nullptr);
g_free(lower);
g_free(media);
media = NULL;
@@ -1622,7 +1622,7 @@ static Magic *magic_new(xmlNode *node, Type *type, GError **error)
magic_free(magic);
magic = NULL;
(*error)->message = g_strconcat(
- _("Error in <match> element: "), old, NULL);
+ _("Error in <match> element: "), old, nullptr);
g_free(old);
} else if (magic->matches == NULL) {
magic_free(magic);
@@ -1843,7 +1843,7 @@ static TreeMagic *tree_magic_new(xmlNode *node, Type *type, GError **error)
tree_magic_free(magic);
magic = NULL;
(*error)->message = g_strconcat(
- _("Error in <treematch> element: "), old, NULL);
+ _("Error in <treematch> element: "), old, nullptr);
g_free(old);
}
}
@@ -1960,7 +1960,7 @@ static void delete_old_types(const gchar *mime_dir)
for (i = 0; i < G_N_ELEMENTS(media_types); i++)
{
- const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], NULL);
+ const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], nullptr);
if (!fs::is_directory(fs::status(media_dir)))
continue;
@@ -1973,13 +1973,13 @@ static void delete_old_types(const gchar *mime_dir)
continue;
char *type_name = g_strconcat(media_types[i], "/",
- dir_entry.path().filename().string().c_str(), NULL);
+ dir_entry.path().filename().string().c_str(), nullptr);
type_name[strlen(type_name) - 4] = '\0';
if (!g_hash_table_lookup(types, type_name))
{
char *path;
path = g_strconcat(mime_dir, "/",
- type_name, ".xml", NULL);
+ type_name, ".xml", nullptr);
#if 0
g_warning("Removing old info for type %s",
path);
@@ -2002,7 +2002,7 @@ static void add_ns(gpointer key, gpointer value, gpointer data)
Type *type = (Type *) value;
g_ptr_array_add(lines, g_strconcat(ns, " ", type->media,
- "/", type->subtype, "\n", NULL));
+ "/", type->subtype, "\n", nullptr));
}
/* Write all the collected namespace rules to 'XMLnamespaces' */
@@ -2038,7 +2038,7 @@ static void write_subclass(gpointer key, gpointer value, gpointer data)
for (l = list; l; l = l->next)
{
- line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", NULL);
+ line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", nullptr);
fwrite(line, 1, strlen(line), stream);
g_free (line);
}
@@ -2061,7 +2061,7 @@ static void add_alias(gpointer key, gpointer value, gpointer data)
g_ptr_array_add(lines, g_strconcat(alias, " ", type->media,
"/", type->subtype, "\n",
- NULL));
+ nullptr));
}
/* Write all the collected aliases */
@@ -2092,7 +2092,7 @@ static void add_type(gpointer key, gpointer value, gpointer data)
{
GPtrArray *lines = (GPtrArray *) data;
- g_ptr_array_add(lines, g_strconcat((char *)key, "\n", NULL));
+ g_ptr_array_add(lines, g_strconcat((char *)key, "\n", nullptr));
}
/* Write all the collected types */
@@ -2127,7 +2127,7 @@ static void write_one_icon(gpointer key, gpointer value, gpointer data)
FILE *stream = (FILE *)data;
char *line;
- line = g_strconcat (mimetype, ":", iconname, "\n", NULL);
+ line = g_strconcat (mimetype, ":", iconname, "\n", nullptr);
fwrite(line, 1, strlen(line), stream);
g_free (line);
}
@@ -2168,7 +2168,7 @@ static void check_in_path_xdg_data(const char *mime_path)
dirs[n] = g_strdup(env);
else
dirs[n] = g_build_filename(g_get_home_dir(), ".local",
- "share", NULL);
+ "share", nullptr);
n++;
for (i = 0; i < n; i++)
@@ -3588,7 +3588,7 @@ newest_mtime(const char *packagedir)
while ((name = g_dir_read_name(dir))) {
char *path;
- path = g_build_filename(packagedir, name, NULL);
+ path = g_build_filename(packagedir, name, nullptr);
retval = g_stat(path, &statbuf);
g_free(path);
if (retval < 0)
@@ -3609,7 +3609,7 @@ is_cache_up_to_date (const char *mimedir, const char *packagedir)
char *mimeversion;
int retval;
- mimeversion = g_build_filename(mimedir, "/version", NULL);
+ mimeversion = g_build_filename(mimedir, "/version", nullptr);
retval = g_stat(mimeversion, &version_stat);
g_free(mimeversion);
if (retval < 0)
@@ -3694,7 +3694,7 @@ int main(int argc, char **argv)
}
}
- package_dir = g_strconcat(mime_dir, "/packages", NULL);
+ package_dir = g_strconcat(mime_dir, "/packages", nullptr);
if (!fs::exists(mime_dir) && !fs::is_directory(fs::status(mime_dir)))
{
@@ -3747,7 +3747,7 @@ int main(int argc, char **argv)
g_hash_table_foreach(globs_hash, collect_glob2, &glob_list);
glob_list = g_list_sort(glob_list, (GCompareFunc)compare_glob_by_weight);
- globs_path = g_strconcat(mime_dir, "/globs.new", NULL);
+ globs_path = g_strconcat(mime_dir, "/globs.new", nullptr);
globs = fopen_gerror(globs_path, error);
if (!globs)
goto out;
@@ -3761,7 +3761,7 @@ int main(int argc, char **argv)
goto out;
g_free(globs_path);
- globs_path = g_strconcat(mime_dir, "/globs2.new", NULL);
+ globs_path = g_strconcat(mime_dir, "/globs2.new", nullptr);
globs = fopen_gerror(globs_path, error);
if (!globs)
goto out;
@@ -3782,7 +3782,7 @@ int main(int argc, char **argv)
FILE *stream;
char *magic_path;
int i;
- magic_path = g_strconcat(mime_dir, "/magic.new", NULL);
+ magic_path = g_strconcat(mime_dir, "/magic.new", nullptr);
stream = fopen_gerror(magic_path, error);
if (!stream)
goto out;
@@ -3807,7 +3807,7 @@ int main(int argc, char **argv)
FILE *stream;
char *ns_path;
- ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", NULL);
+ ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", nullptr);
stream = fopen_gerror(ns_path, error);
if (!stream)
goto out;
@@ -3823,7 +3823,7 @@ int main(int argc, char **argv)
FILE *stream;
char *path;
- path = g_strconcat(mime_dir, "/subclasses.new", NULL);
+ path = g_strconcat(mime_dir, "/subclasses.new", nullptr);
stream = fopen_gerror(path, error);
if (!stream)
goto out;
@@ -3839,7 +3839,7 @@ int main(int argc, char **argv)
FILE *stream;
char *path;
- path = g_strconcat(mime_dir, "/aliases.new", NULL);
+ path = g_strconcat(mime_dir, "/aliases.new", nullptr);
stream = fopen_gerror(path, error);
if (!stream)
goto out;
@@ -3855,7 +3855,7 @@ int main(int argc, char **argv)
FILE *stream;
char *path;
- path = g_strconcat(mime_dir, "/types.new", NULL);
+ path = g_strconcat(mime_dir, "/types.new", nullptr);
stream = fopen_gerror(path, error);
if (!stream)
goto out;
@@ -3871,7 +3871,7 @@ int main(int argc, char **argv)
FILE *stream;
char *icon_path;
- icon_path = g_strconcat(mime_dir, "/generic-icons.new", NULL);
+ icon_path = g_strconcat(mime_dir, "/generic-icons.new", nullptr);
stream = fopen_gerror(icon_path, error);
if (!stream)
goto out;
@@ -3887,7 +3887,7 @@ int main(int argc, char **argv)
FILE *stream;
char *icon_path;
- icon_path = g_strconcat(mime_dir, "/icons.new", NULL);
+ icon_path = g_strconcat(mime_dir, "/icons.new", nullptr);
stream = fopen_gerror(icon_path, error);
if (!stream)
goto out;
@@ -3903,7 +3903,7 @@ int main(int argc, char **argv)
FILE *stream;
char *path;
int i;
- path = g_strconcat(mime_dir, "/treemagic.new", NULL);
+ path = g_strconcat(mime_dir, "/treemagic.new", nullptr);
stream = fopen_gerror(path, error);
if (!stream)
goto out;
@@ -3928,7 +3928,7 @@ int main(int argc, char **argv)
FILE *stream;
char *path;
- path = g_strconcat(mime_dir, "/mime.cache.new", NULL);
+ path = g_strconcat(mime_dir, "/mime.cache.new", nullptr);
stream = fopen_gerror(path, error);
if (!stream)
goto out;
@@ -3944,7 +3944,7 @@ int main(int argc, char **argv)
FILE *stream;
char *path;
- path = g_strconcat(mime_dir, "/version.new", NULL);
+ path = g_strconcat(mime_dir, "/version.new", nullptr);
stream = fopen_gerror(path, error);
if (!stream)
goto out;
--
GitLab
desktop/misc/shared-mime-info/files/7499ac1a85b2487b94e315e6b55c34bcf220295f.patch
-54
View File
@@ -1,54 +0,0 @@
From 7499ac1a85b2487b94e315e6b55c34bcf220295f Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 7 Oct 2023 23:45:47 +0200
Subject: [PATCH] Fix false positive fdatasync detection on darwin
The `has_function` feature in meson uses different detection methods
depending on the contents of the `prefix` kwarg [1]:
* if it contains `#include` directives it will copy the prefix into
the test code and check if it compiles
* if it doesn't contain an include or isn't specified, `has_function`
will forward declare the function and test for it's existence by
trying to link it to the default libraries
The latter approach wrongly succeeds for `fdatasync` on darwin because
the linker binds the function to a system call of the same name. Note
that this result really is wrong because that system call has not
the expected semantics of `fdatasync`.
By adding an include for `unistd.h` we can get meson to use the
first approach and the detection fails.
Note that this has gone unnoticed so far because only recent versions
of clang (the default compiler on darwin) started to treat implicit
function declarations as an error.
[1] https://github.com/mesonbuild/meson/blob/583d2815d1a130227f0f4db47e4ab2e80ebb6a61/mesonbuild/compilers/mixins/clike.py#L839-L846
Fixes #211
---
meson.build | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 1780c443..7998a51b 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')
--
GitLab
desktop/misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch
-38
View File
@@ -1,38 +0,0 @@
https://bugs.gentoo.org/915859
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/12a3a6b1141c704fc594379af1808bb9008d588c
From 12a3a6b1141c704fc594379af1808bb9008d588c Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 8 Oct 2023 00:11:49 +0200
Subject: [PATCH] Fix string literal concatenation
Clang is not able to disambiguate between multiple string literatals
and C++11 user defined literals. Spaces help.
---
src/update-mime-database.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp
index 733ba063..29d82a9d 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++)
@@ -2170,7 +2170,7 @@ static void check_in_path_xdg_data(const char *mime_path)
dirs[n] = g_build_filename(g_get_home_dir(), ".local",
"share", NULL);
n++;
-
+
for (i = 0; i < n; i++)
{
if (stat(dirs[i], &dir_info) == 0 &&
--
GitLab
desktop/misc/shared-mime-info/pspec.xml
+11 -4
View File
@@ -13,7 +13,7 @@
<IsA>data</IsA>
<Summary>The shared MIME info database</Summary>
<Description>shared-mime-info is a package containing a large number of common MIME types, created by converting the existing KDE and GNOME databases to the new format and merging them together, and software for updating the database based on the share-mime-info specification.</Description>
<Archive sha1sum="1d05e143fd52ac0885a5dc0f1c4fdcca03f3dbc6" type="tarbz2">https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.3/shared-mime-info-2.3.tar.bz2</Archive>
<Archive sha1sum="85199c1c88313b9611d171ca38effa1d4b7d3e80" type="tarbz2">https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.4/shared-mime-info-2.4.tar.bz2</Archive>
<Archive sha1sum="164e0fa76c1a3baadd7616015b71d7708e59dbb2" type="tarbz2">https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7/xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libxml2-devel</Dependency>
@@ -24,9 +24,9 @@
<Dependency>meson</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">shared-mime-info-2.3-clang-string-literal.patch</Patch>
<Patch level="1">157c16b09f54741aefbc4be6a3507455f0378389.patch</Patch>
<Patch level="1">7499ac1a85b2487b94e315e6b55c34bcf220295f.patch</Patch>
<!-- <Patch level="1">shared-mime-info-2.3-clang-string-literal.patch</Patch> -->
<!-- <Patch level="1">157c16b09f54741aefbc4be6a3507455f0378389.patch</Patch> -->
<!-- <Patch level="1">7499ac1a85b2487b94e315e6b55c34bcf220295f.patch</Patch> -->
</Patches>
</Source>
@@ -63,6 +63,13 @@
</Package>
<History>
<Update release="16">
<Date>2023-11-16</Date>
<Version>2.4</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="15">
<Date>2023-10-23</Date>
<Version>2.3</Version>