diff options
Diffstat (limited to 'meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-string-literal-concatenation.patch')
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-string-literal-concatenation.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-string-literal-concatenation.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-string-literal-concatenation.patch deleted file mode 100644 index 7825c39312..0000000000 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-string-literal-concatenation.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From ccf704a606625bc62e70dbe815b309c22a0bda05 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tobias Mayer <tobim@fastmail.fm> | ||
3 | Date: Sun, 8 Oct 2023 00:11:49 +0200 | ||
4 | Subject: [PATCH] Fix string literal concatenation | ||
5 | |||
6 | Clang is not able to disambiguate between multiple string literatals | ||
7 | and C++11 user defined literals. Spaces help. | ||
8 | |||
9 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/12a3a6b1141c704fc594379af1808bb9008d588c] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/update-mime-database.cpp | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp | ||
16 | index 733ba06..29d82a9 100644 | ||
17 | --- a/src/update-mime-database.cpp | ||
18 | +++ b/src/update-mime-database.cpp | ||
19 | @@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) | ||
20 | |||
21 | env = getenv("XDG_DATA_DIRS"); | ||
22 | if (!env) | ||
23 | - env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; | ||
24 | + env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; | ||
25 | dirs = g_strsplit(env, PATH_SEPARATOR, 0); | ||
26 | g_return_if_fail(dirs != NULL); | ||
27 | for (n = 0; dirs[n]; n++) | ||
28 | @@ -2170,7 +2170,7 @@ static void check_in_path_xdg_data(const char *mime_path) | ||
29 | dirs[n] = g_build_filename(g_get_home_dir(), ".local", | ||
30 | "share", NULL); | ||
31 | n++; | ||
32 | - | ||
33 | + | ||
34 | for (i = 0; i < n; i++) | ||
35 | { | ||
36 | if (stat(dirs[i], &dir_info) == 0 && | ||
37 | -- | ||
38 | 2.42.0 | ||
39 | |||