diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-11-22 19:10:21 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-30 08:43:04 +0000 |
commit | 3a9d725fb32f881022191c33cdbb754b957da0b9 (patch) | |
tree | 8c15e965a1af3176d5d7d3b42e85d28f4dab5f4f | |
parent | 6a52222c11bcc87a3730c3801e5e28c6a4ae0f5f (diff) | |
download | poky-3a9d725fb32f881022191c33cdbb754b957da0b9.tar.gz |
shared-mime-info: Fix build with clang-17+
This is needed with libxml2-2.12 and newer
(From OE-Core rev: 75c91f7e41b5840227590b1e6094cafe84a60163)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch | 26 | ||||
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch new file mode 100644 index 0000000000..936f72ccf8 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 665383306c725f299a1b373f947cda01949d49e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: David Faure <faure@kde.org> | ||
3 | Date: Sun, 19 Nov 2023 11:18:11 +0100 | ||
4 | Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 | ||
5 | |||
6 | Fixes #219 | ||
7 | |||
8 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | src/test-subclassing.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/src/test-subclassing.c b/src/test-subclassing.c | ||
15 | index dd099e4..0758164 100644 | ||
16 | --- a/src/test-subclassing.c | ||
17 | +++ b/src/test-subclassing.c | ||
18 | @@ -1,4 +1,5 @@ | ||
19 | #include <libxml/tree.h> | ||
20 | +#include <libxml/parser.h> | ||
21 | #include <stdio.h> | ||
22 | #include <string.h> | ||
23 | |||
24 | -- | ||
25 | 2.43.0 | ||
26 | |||
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb index 5ba4023609..c7da0ca2d2 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb | |||
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
8 | 8 | ||
9 | DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" | 9 | DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" |
10 | 10 | ||
11 | SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master" | 11 | SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master \ |
12 | file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch" | ||
12 | SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada" | 13 | SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada" |
13 | 14 | ||
14 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |