diff mbox series

[35/45] shared-mime-info: upgrade 2.4 -> 2.5.1

Message ID 20260706171701.70536-35-alex.kanavin@gmail.com
State New
Headers show
Series [01/45] selftest/locales: opt out of ptests in DISTRO_FEATURES | expand

Commit Message

Alexander Kanavin July 6, 2026, 5:16 p.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Explicitly disable tests, as they now have xdgmime dependency.

Drop backports.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ild-with-libxml2-2.12.0-and-clang-17.patch | 26 ---------
 ...dle-build-with-older-versions-of-GCC.patch | 54 -------------------
 ...-info_2.4.bb => shared-mime-info_2.5.1.bb} |  6 +--
 3 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
 delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch
 rename meta/recipes-support/shared-mime-info/{shared-mime-info_2.4.bb => shared-mime-info_2.5.1.bb} (85%)
diff mbox series

Patch

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
deleted file mode 100644
index 936f72ccf8..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From 665383306c725f299a1b373f947cda01949d49e4 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 19 Nov 2023 11:18:11 +0100
-Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
-
-Fixes #219
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/test-subclassing.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/test-subclassing.c b/src/test-subclassing.c
-index dd099e4..0758164 100644
---- a/src/test-subclassing.c
-+++ b/src/test-subclassing.c
-@@ -1,4 +1,5 @@
- #include <libxml/tree.h>
-+#include <libxml/parser.h>
- #include <stdio.h>
- #include <string.h>
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch
deleted file mode 100644
index 2af6b461b6..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch
+++ /dev/null
@@ -1,54 +0,0 @@ 
-From 461d00fcd5c5842b9a56f7462d55d46bf21163cc Mon Sep 17 00:00:00 2001
-From: Patrick Williams <patrick@stwcx.xyz>
-Date: Fri, 1 Dec 2023 11:19:02 -0600
-Subject: [PATCH] Handle build with older versions of GCC
-
-Older versions of GCC (prior to 9.1) did not put the `std::filesystem`
-support directly into libstdcpp, but in a separate `libstdc++fs`.  Add
-meson logic to detect if an extra linker flag is necessary.
-
-Fixes #223.
-
-Tested on AlmaLinux 8 which uses GCC-8.
-
-Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/278]
----
- meson.build | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index ecc012f..93acd40 100644
---- a/meson.build
-+++ b/meson.build
-@@ -11,6 +11,7 @@ config = configuration_data()
- i18n = import('i18n')
- 
- cc = meson.get_compiler('c')
-+cxx = meson.get_compiler('cpp')
- 
- ###############################################################################
- # Project configuration
-@@ -46,6 +47,19 @@ if not xdgmime_found
-     ''')
- endif
- 
-+###############################################################################
-+# Check if GCC needs -lstdc++fs (before 9.1)
-+
-+if not cxx.links('''
-+        #include <filesystem>
-+        int main() {
-+            return std::filesystem::is_directory(
-+                std::filesystem::status("/tmp")) ? 0 : 1;
-+        }
-+        ''', name: 'std++fs-check')
-+    add_project_link_arguments('-lstdc++fs', language : 'cpp')
-+endif
-+
- ###############################################################################
- # Dependencies
- 
--- 
-2.41.0
-
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.5.1.bb
similarity index 85%
rename from meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
rename to meta/recipes-support/shared-mime-info/shared-mime-info_2.5.1.bb
index f27061d5d1..f4551c8f59 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.5.1.bb
@@ -9,15 +9,15 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "libxml2 glib-2.0 shared-mime-info-native xmlto-native"
 
 SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master \
-           file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \
-           file://0002-Handle-build-with-older-versions-of-GCC.patch"
-SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada"
+           "
+SRCREV = "fd8ab89c20093f1bfba8fa9e302ba584fffd0fd7"
 
 inherit meson pkgconfig gettext mime
 
 EXTRA_OEMESON = " \
                  -Dupdate-mimedb=true \
                  -Dbuild-translations=${@'false' if d.getVar('USE_NLS') == 'no' else 'true'} \
+                 -Dbuild-tests=false \
                 "
 
 FILES:${PN} += "${datadir}/mime"