diff --git a/desktop/misc/shared-mime-info/files/157c16b09f54741aefbc4be6a3507455f0378389.patch b/desktop/misc/shared-mime-info/files/157c16b09f54741aefbc4be6a3507455f0378389.patch new file mode 100644 index 0000000000..0e3ddb2476 --- /dev/null +++ b/desktop/misc/shared-mime-info/files/157c16b09f54741aefbc4be6a3507455f0378389.patch @@ -0,0 +1,281 @@ +From 157c16b09f54741aefbc4be6a3507455f0378389 Mon Sep 17 00:00:00 2001 +From: Biswapriyo Nath +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 element: "), old, NULL); ++ _("Error in 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 element: "), old, NULL); ++ _("Error in 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(key), " ", l->data, "\n", NULL); ++ line = g_strconcat (static_cast(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 + diff --git a/desktop/misc/shared-mime-info/files/7499ac1a85b2487b94e315e6b55c34bcf220295f.patch b/desktop/misc/shared-mime-info/files/7499ac1a85b2487b94e315e6b55c34bcf220295f.patch new file mode 100644 index 0000000000..80f7cae4d4 --- /dev/null +++ b/desktop/misc/shared-mime-info/files/7499ac1a85b2487b94e315e6b55c34bcf220295f.patch @@ -0,0 +1,54 @@ +From 7499ac1a85b2487b94e315e6b55c34bcf220295f Mon Sep 17 00:00:00 2001 +From: Tobias Mayer +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 ')) + + + if get_option('build-translations') +-- +GitLab + diff --git a/desktop/misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch b/desktop/misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch deleted file mode 100644 index dedeb61e29..0000000000 --- a/desktop/misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Mon, 8 Nov 2021 18:22:47 -0500 -Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating - translated XML - -gettext upstream has supported this for a very long time (since 0.19.7 -via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015), -and itstool is (mostly) a legacy of the time before gettext had proper -support for these sorts of use cases. - -This is similar to the state of intltool, which is described at -https://wiki.gnome.org/MigratingFromIntltoolToGettext - -During the port from autotools to meson, the legacy use of itstool was -faithfully translated to meson in the only way possible: by jumping -through hoops to run ninja inside ninja in order to generate the .mo -files for itstool, because meson's i18n module used a flawed design and -there was no "real" target to create those files, only a .PHONY -run_target which other rules cannot depend on. - -Although meson 0.60.0 added support for real targets for the built .mo -files, this changed the rules for output filenames, breaking the script. - -But msgfmt does not care, and anyways comes with builtin meson functions -for convenient use with XML files. So let's take this opportunity to -drop legacy dependencies and use the modern, builtin tooling, which -fixes this bug as a side effect. - -Fixes #170 ---- - .gitlab-ci.yml | 2 -- - README.md | 2 +- - data/freedesktop_generate.sh | 12 ------------ - data/meson.build | 16 +++++----------- - meson.build | 1 - - 5 files changed, 6 insertions(+), 27 deletions(-) - delete mode 100755 data/freedesktop_generate.sh - -diff --git a/data/meson.build b/data/meson.build -index 24361c9..09ed7a9 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,18 +1,12 @@ - - install_man('update-mime-database.1') - --freedesktop_org_xml = custom_target('freedesktop.org.xml', -- input : files( -- 'freedesktop.org.xml.in', -- 'its/shared-mime-info.its', -- 'its/shared-mime-info.loc', -- ), -+freedesktop_org_xml = i18n.merge_file( -+ input: 'freedesktop.org.xml.in', - output: 'freedesktop.org.xml', -- command: [ -- find_program('freedesktop_generate.sh'), -- meson.source_root(), -- meson.build_root() -- ], -+ data_dirs: '.', -+ po_dir: '../po', -+ type: 'xml', - install: true, - install_dir: get_option('datadir') / 'mime' / 'packages', - ) -diff --git a/meson.build b/meson.build -index 0d08c8a..60f17ae 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,7 +20,6 @@ - ############################################################################### - # Find tools - --itstool = find_program('itstool') - xmllint = find_program('xmllint') - xmlto = find_program('xmlto') - --- -GitLab - diff --git a/desktop/misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch b/desktop/misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch new file mode 100644 index 0000000000..fe868ad709 --- /dev/null +++ b/desktop/misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch @@ -0,0 +1,38 @@ +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 +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 diff --git a/desktop/misc/shared-mime-info/files/shared-mime-info-xz.patch b/desktop/misc/shared-mime-info/files/shared-mime-info-xz.patch deleted file mode 100644 index 5c833f9c0f..0000000000 --- a/desktop/misc/shared-mime-info/files/shared-mime-info-xz.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- shared-mime-info-0.60/freedesktop.org.xml.in.orig 2009-04-17 11:46:23.000000000 -0300 -+++ shared-mime-info-0.60/freedesktop.org.xml.in 2009-04-17 11:49:36.000000000 -0300 -@@ -1990,6 +1990,19 @@ - - - -+ -+ <_comment>XZ archive -+ XZ -+ XZ Algorithm -+ -+ -+ -+ -+ <_comment>Tar archive (XZ-compressed) -+ -+ -+ -+ - - <_comment>LZO archive - ---- shared-mime-info-0.60/freedesktop.org.xml 2009-02-21 11:08:16.000000000 -0300 -+++ shared-mime-info-0.60/freedesktop.org.xml.orig 2009-04-17 11:51:46.000000000 -0300 -@@ -7314,6 +7314,55 @@ - - - -+ -+ xz archive -+ Archiŭ xz -+ arxiu xz -+ Archiv xz -+ archivador xz -+ xz-arkisto -+ archive xz -+ cartlann xz -+ xz-archívum -+ Arsip xz -+ Archivio xz -+ xz 압축파일 -+ xz archyvas -+ xz-arkiv -+ xz-archief -+ Pacote xz -+ архив xz -+ xz-arkiv -+ Kho nén xz -+ xz -+ XZ Algorithm -+ -+ -+ -+ -+ Tar archive (xz-compressed) -+ Archiŭ tar (xz-skampresavany) -+ arxiu tar (comprimit amb xz) -+ Archiv tar (komprimovaný pomocí xz) -+ archivador Tar (comprimido con xz) -+ Tar-arkisto (xz-pakattu) -+ archive tar (compression xz) -+ cartlann Tar (comhbhrúite le xz) -+ Tar archívum (xz-val tömörítve) -+ Arsip Tar (terkompresi xz) -+ Archivio tar (compresso con xz) -+ (xz로 압축한) tar 묶음파일 -+ Tar archyvas (suglaudintas su xz) -+ Tar-arkiv (xz-komprimert) -+ Tar-archief (ingepakt met xz) -+ Pacote tar (compactado com LZO) -+ архив tar (сжатый xz) -+ Tar-arkiv (xz-komprimerat) -+ Kho nén tar (đã nén xz) -+ -+ -+ -+ - - LZO archive - Archiŭ LZO -@@ -20437,4 +20486,4 @@ - - - -- -\ Falta o caracter nova linha no final do arquivo -+ diff --git a/desktop/misc/shared-mime-info/pspec.xml b/desktop/misc/shared-mime-info/pspec.xml index 1a9c9f4374..67829558cf 100644 --- a/desktop/misc/shared-mime-info/pspec.xml +++ b/desktop/misc/shared-mime-info/pspec.xml @@ -24,7 +24,9 @@ meson - + shared-mime-info-2.3-clang-string-literal.patch + 157c16b09f54741aefbc4be6a3507455f0378389.patch + 7499ac1a85b2487b94e315e6b55c34bcf220295f.patch @@ -61,6 +63,13 @@ + + 2023-10-23 + 2.3 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-08 2.3