public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/shared-mime-info] rawhide: Update to 2.5
@ 2026-06-29 16:30 Milan Crha
0 siblings, 0 replies; only message in thread
From: Milan Crha @ 2026-06-29 16:30 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/shared-mime-info
Branch : rawhide
Commit : c97443597bcdd7be80dfb4bff9a193de2000fbb9
Author : Milan Crha <mcrha@redhat.com>
Date : 2026-06-29T18:28:37+02:00
Stats : +55/-100 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/shared-mime-info/c/c97443597bcdd7be80dfb4bff9a193de2000fbb9?branch=rawhide
Log:
Update to 2.5
---
diff --git a/0001-Remove-sub-classing-from-OO.o-mime-types.patch b/0001-Remove-sub-classing-from-OO.o-mime-types.patch
index b46b0cd..5ab455e 100644
--- a/0001-Remove-sub-classing-from-OO.o-mime-types.patch
+++ b/0001-Remove-sub-classing-from-OO.o-mime-types.patch
@@ -1,4 +1,4 @@
-From da0e63ccd86ead63e6b29828286897fb1236eb81 Mon Sep 17 00:00:00 2001
+From 603f0ff8248969a99c55a539af2060a9951c35b7 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 25 Aug 2011 10:54:47 +0100
Subject: [PATCH] Remove sub-classing from OO.o mime-types
@@ -9,90 +9,90 @@ https://bugs.freedesktop.org/show_bug.cgi?id=40354
1 file changed, 31 deletions(-)
diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
-index 8020b13..00e8d90 100644
+index 1b07210..0473bfd 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
-@@ -941,7 +941,6 @@ command to generate the output files.
+@@ -1208,7 +1208,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc">
- <comment>LibreOffice Calc spreadsheet</comment>
+ <comment>OpenOffice.org 1.0 Calc spreadsheet</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -954,7 +953,6 @@ command to generate the output files.
+@@ -1221,7 +1220,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc.template">
- <comment>LibreOffice Calc template</comment>
+ <comment>OpenOffice.org 1.0 Calc template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -967,7 +965,6 @@ command to generate the output files.
+@@ -1234,7 +1232,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw">
- <comment>LibreOffice Draw drawing</comment>
+ <comment>OpenOffice.org 1.0 Draw drawing</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -980,7 +977,6 @@ command to generate the output files.
+@@ -1247,7 +1244,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw.template">
- <comment>LibreOffice Draw template</comment>
+ <comment>OpenOffice.org 1.0 Draw template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -993,7 +989,6 @@ command to generate the output files.
+@@ -1260,7 +1256,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress">
- <comment>LibreOffice Impress presentation</comment>
+ <comment>OpenOffice.org 1.0 Impress presentation</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1006,7 +1001,6 @@ command to generate the output files.
+@@ -1273,7 +1268,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress.template">
- <comment>LibreOffice Impress template</comment>
+ <comment>OpenOffice.org 1.0 Impress template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1019,7 +1013,6 @@ command to generate the output files.
+@@ -1286,7 +1280,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.math">
- <comment>LibreOffice Math formula</comment>
+ <comment>OpenOffice.org 1.0 Math formula</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1032,7 +1025,6 @@ command to generate the output files.
+@@ -1299,7 +1292,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer">
- <comment>LibreOffice Writer document</comment>
+ <comment>OpenOffice.org 1.0 Writer document</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1045,7 +1037,6 @@ command to generate the output files.
+@@ -1312,7 +1304,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.global">
- <comment>LibreOffice Writer global document</comment>
+ <comment>OpenOffice.org 1.0 Writer global document</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1058,7 +1049,6 @@ command to generate the output files.
+@@ -1325,7 +1316,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.template">
- <comment>LibreOffice Writer template</comment>
+ <comment>OpenOffice.org 1.0 Writer template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1073,7 +1063,6 @@ command to generate the output files.
+@@ -1340,7 +1330,6 @@ command to generate the output files.
<comment>ODT document</comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@@ -100,7 +100,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1088,7 +1077,6 @@ command to generate the output files.
+@@ -1355,7 +1344,6 @@ command to generate the output files.
<comment>ODT document (Flat XML)</comment>
<acronym>FODT</acronym>
<expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
@@ -108,7 +108,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-document"/>
<glob pattern="*.fodt"/>
</mime-type>
-@@ -1096,7 +1084,6 @@ command to generate the output files.
+@@ -1363,7 +1351,6 @@ command to generate the output files.
<comment>ODT template</comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@@ -116,7 +116,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1111,7 +1098,6 @@ command to generate the output files.
+@@ -1378,7 +1365,6 @@ command to generate the output files.
<comment>OTH template</comment>
<acronym>OTH</acronym>
<expanded-acronym>OpenDocument HTML</expanded-acronym>
@@ -124,15 +124,15 @@ index 8020b13..00e8d90 100644
<generic-icon name="text-html"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1126,7 +1112,6 @@ command to generate the output files.
+@@ -1393,7 +1379,6 @@ command to generate the output files.
<comment>ODM document</comment>
<acronym>ODM</acronym>
<expanded-acronym>OpenDocument Master</expanded-acronym>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
- <magic priority="70">
+ <magic priority="75">
<match type="string" value="PK\003\004" offset="0">
-@@ -1141,7 +1126,6 @@ command to generate the output files.
+@@ -1423,7 +1408,6 @@ command to generate the output files.
<comment>ODG drawing</comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@@ -140,7 +140,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1156,7 +1140,6 @@ command to generate the output files.
+@@ -1438,7 +1422,6 @@ command to generate the output files.
<comment>ODG drawing (Flat XML)</comment>
<acronym>FODG</acronym>
<expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
@@ -148,7 +148,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="image-x-generic"/>
<glob pattern="*.fodg"/>
</mime-type>
-@@ -1164,7 +1147,6 @@ command to generate the output files.
+@@ -1446,7 +1429,6 @@ command to generate the output files.
<comment>ODG template</comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@@ -156,7 +156,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1179,7 +1161,6 @@ command to generate the output files.
+@@ -1461,7 +1443,6 @@ command to generate the output files.
<comment>ODP presentation</comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@@ -164,7 +164,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1194,7 +1175,6 @@ command to generate the output files.
+@@ -1476,7 +1457,6 @@ command to generate the output files.
<comment>ODP presentation (Flat XML)</comment>
<acronym>FODP</acronym>
<expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
@@ -172,7 +172,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-presentation"/>
<glob pattern="*.fodp"/>
</mime-type>
-@@ -1202,7 +1182,6 @@ command to generate the output files.
+@@ -1484,7 +1464,6 @@ command to generate the output files.
<comment>ODP template</comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@@ -180,7 +180,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1217,7 +1196,6 @@ command to generate the output files.
+@@ -1499,7 +1478,6 @@ command to generate the output files.
<comment>ODS spreadsheet</comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@@ -188,7 +188,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1232,7 +1210,6 @@ command to generate the output files.
+@@ -1514,7 +1492,6 @@ command to generate the output files.
<comment>ODS spreadsheet (Flat XML)</comment>
<acronym>FODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
@@ -196,7 +196,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.fods"/>
</mime-type>
-@@ -1240,7 +1217,6 @@ command to generate the output files.
+@@ -1522,7 +1499,6 @@ command to generate the output files.
<comment>ODS template</comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@@ -204,7 +204,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1255,7 +1231,6 @@ command to generate the output files.
+@@ -1537,7 +1513,6 @@ command to generate the output files.
<comment>ODC chart</comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@@ -212,7 +212,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1270,7 +1245,6 @@ command to generate the output files.
+@@ -1552,7 +1527,6 @@ command to generate the output files.
<comment>ODC template</comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@@ -220,7 +220,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1285,7 +1259,6 @@ command to generate the output files.
+@@ -1567,7 +1541,6 @@ command to generate the output files.
<comment>ODF formula</comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@@ -228,7 +228,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1300,7 +1273,6 @@ command to generate the output files.
+@@ -1582,7 +1555,6 @@ command to generate the output files.
<comment>ODF template</comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@@ -236,7 +236,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1315,7 +1287,6 @@ command to generate the output files.
+@@ -1597,7 +1569,6 @@ command to generate the output files.
<comment>ODB database</comment>
<acronym>ODB</acronym>
<expanded-acronym>OpenDocument Database</expanded-acronym>
@@ -244,7 +244,7 @@ index 8020b13..00e8d90 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1331,7 +1302,6 @@ command to generate the output files.
+@@ -1614,7 +1585,6 @@ command to generate the output files.
<comment>ODI image</comment>
<acronym>ODI</acronym>
<expanded-acronym>OpenDocument Image</expanded-acronym>
@@ -252,14 +252,14 @@ index 8020b13..00e8d90 100644
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
-@@ -1344,7 +1314,6 @@ command to generate the output files.
+@@ -1627,7 +1597,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.openofficeorg.extension">
- <comment>OpenOffice.org extension</comment>
+ <comment>LibreOffice extension</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.oxt" />
</mime-type>
--
-2.41.0
+2.54.0
diff --git a/0002-Fix-build-with-libxml2-2.12.0.patch b/0002-Fix-build-with-libxml2-2.12.0.patch
deleted file mode 100644
index 530805e..0000000
--- a/0002-Fix-build-with-libxml2-2.12.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c918fe77e255150938e83a6aec259f153d303573 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
----
- src/test-subclassing.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/test-subclassing.c b/src/test-subclassing.c
-index dd099e44..0758164f 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>
-
---
-GitLab
-
diff --git a/0003-xdgmime-openat-fourth-arg.patch b/0003-xdgmime-openat-fourth-arg.patch
deleted file mode 100644
index 18dfd0f..0000000
--- a/0003-xdgmime-openat-fourth-arg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up shared-mime-info-2.4/xdgmime/fuzzing/setup.c.openat shared-mime-info-2.4/xdgmime/fuzzing/setup.c
---- shared-mime-info-2.4/xdgmime/fuzzing/setup.c.openat 2025-06-25 15:44:08.769573400 +0200
-+++ shared-mime-info-2.4/xdgmime/fuzzing/setup.c 2025-06-25 15:44:13.357891192 +0200
-@@ -97,7 +97,7 @@ fuzz_setup (const unsigned char *data,
- data_len -= file_data_len + blob_separator_len;
- }
-
-- fd = TEMP_FAILURE_RETRY (openat (dirfd, mime_dir_filenames[i], O_CREAT | O_WRONLY | O_CLOEXEC));
-+ fd = TEMP_FAILURE_RETRY (openat (dirfd, mime_dir_filenames[i], O_CREAT | O_WRONLY | O_CLOEXEC, S_IRUSR | S_IWUSR));
- if (fd < 0)
- {
- fuzz_teardown (dirfd);
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index cf12182..272f4ee 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,24 +1,19 @@
Summary: Shared MIME information database
Name: shared-mime-info
-Version: 2.4
+Version: 2.5
Release: %autorelease
License: GPL-2.0-or-later
URL: http://freedesktop.org/Software/shared-mime-info
Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/shared-mime-info-%{version}.tar.bz2
Source1: mimeapps.list
-# openat() with O_CREAT needs also mode
-Source2: 0003-xdgmime-openat-fourth-arg.patch
-%global xdgmime_commit 4cc93f9381e0eddd2cac1e92c0f36b29dcd8c1ce
+%global xdgmime_commit 04ce4cd90cb3fa77d5348662de221a6f33b21b17
# Tarball for https://gitlab.freedesktop.org/xdg/xdgmime/-/tree/%%{xdgmime_commit}
Source6: https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/%{xdgmime_commit}/xdgmime-%{xdgmime_commit}.tar.bz2
# Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354
Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
-# Fix build with libxml2 2.12.0
-# https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219
-Patch1: 0002-Fix-build-with-libxml2-2.12.0.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -43,18 +38,13 @@ and looking up the correct MIME type in a database.
%prep
%autosetup -S git_am
-rmdir xdgmime
+
+# xdgmime is expected under the subprojects directory
tar xjf %SOURCE6
-mv xdgmime-%{xdgmime_commit}/ xdgmime/
-patch -p1 < %SOURCE2
+mv xdgmime-%{xdgmime_commit}/ subprojects/xdgmime/
%build
-pushd xdgmime
-%meson
-%meson_build
-popd
-
# the updated mimedb is later owned as %%ghost to ensure proper file-ownership
# it also asserts it is possible to build it
%meson -Dupdate-mimedb=true
@@ -80,7 +70,7 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/mimeapps.list
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
%check
-%meson_test
+%meson_test --suite shared-mime-info
%post
/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null ||:
@@ -93,7 +83,7 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
%files -f %{name}.files
%license COPYING
-%doc README.md NEWS HACKING.md data/shared-mime-info-spec.xml
+%doc README.md NEWS CONTRIBUTING.md data/shared-mime-info-spec.xml
%{_bindir}/update-mime-database
%{_datadir}/mime/packages/*
%{_datadir}/applications/mimeapps.list
diff --git a/sources b/sources
index c1e4e33..9203f14 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (shared-mime-info-2.4.tar.bz2) = 712f414e80919bf2a0f5083ced44c54a350948a526850466a6e9f35365dcfd97fad8bcdbb29945de2715a8f9b70a108e931c8500209a4d6e3dddf97af02771cb
-SHA512 (xdgmime-4cc93f9381e0eddd2cac1e92c0f36b29dcd8c1ce.tar.bz2) = f403c55de1764ff5589086596e98bbcdd25dd31f5ff4278bf611f708d0b9c805cc381d4183198271f709d7f5dd36750f03af0235f8bd1b63e66d0fa073786708
+SHA512 (shared-mime-info-2.5.tar.bz2) = 2690680b8b91cbbcdebfc14e21e609f5b8a9850d12b58a52a2da11254f9cc4bf8b5c90a5e0bc91fa68d1bef08c0b27c4ae501c4b322eecd612ee8e5f457612c7
+SHA512 (xdgmime-04ce4cd90cb3fa77d5348662de221a6f33b21b17.tar.bz2) = cca60322fe1e8086e41d75ac58a8abe21d692175a45ed184d24547ae3d29ad35f9f1e2937d93783c82c0f14eb030bc043272e65a272a8f69a676224909bbc5d4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-29 16:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-29 16:30 [rpms/shared-mime-info] rawhide: Update to 2.5 Milan Crha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox