.gitignore

@@ -1,2 +1,2 @@
-SOURCES/shared-mime-info-2.3.tar.bz2
+SOURCES/shared-mime-info-2.1.tar.xz
-SOURCES/xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2
+SOURCES/xdgmime-de283fc430460b9b3a7e61432a6d273cd64cb102.tar.bz2

.shared-mime-info.metadata

@@ -1,2 +1,2 @@
-1d05e143fd52ac0885a5dc0f1c4fdcca03f3dbc6 SOURCES/shared-mime-info-2.3.tar.bz2
+a251ffcc61de487d123407d414e5f83ae19d055d SOURCES/shared-mime-info-2.1.tar.xz
-f8053fc5b15fc375ebe686e395814bff49aab06b SOURCES/xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2
+60fd4be706163c4f9f17425b089d2b6a0d3434e5 SOURCES/xdgmime-de283fc430460b9b3a7e61432a6d273cd64cb102.tar.bz2

SOURCES/0001-Remove-sub-classing-from-OO.o-mime-types.patch

@@ -1,4 +1,4 @@
-From da0e63ccd86ead63e6b29828286897fb1236eb81 Mon Sep 17 00:00:00 2001
+From dc15dd50b198b0b2a135abd16151206dd9acca75 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 1c17b8d..ad464e1 100644
 --- a/data/freedesktop.org.xml.in
 +++ b/data/freedesktop.org.xml.in
-@@ -941,7 +941,6 @@ command to generate the output files.
+@@ -877,7 +877,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.calc">
-     <comment>LibreOffice Calc spreadsheet</comment>
+     <comment>OpenOffice 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.
+@@ -890,7 +889,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 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.
+@@ -903,7 +901,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.draw">
-     <comment>LibreOffice Draw drawing</comment>
+     <comment>OpenOffice 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.
+@@ -916,7 +913,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 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.
+@@ -929,7 +925,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.impress">
-     <comment>LibreOffice Impress presentation</comment>
+     <comment>OpenOffice 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.
+@@ -942,7 +937,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 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.
+@@ -955,7 +949,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.math">
-     <comment>LibreOffice Math formula</comment>
+     <comment>OpenOffice 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.
+@@ -968,7 +961,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.sun.xml.writer">
-     <comment>LibreOffice Writer document</comment>
+     <comment>OpenOffice 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.
+@@ -981,7 +973,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 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.
+@@ -994,7 +985,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 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.
+@@ -1009,7 +999,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.
+@@ -1024,7 +1013,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.
+@@ -1032,7 +1020,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.
+@@ -1047,7 +1034,6 @@ command to generate the output files.
      <comment>OTH template</comment>
      <acronym>OTH</acronym>
      <expanded-acronym>OpenDocument HTML</expanded-acronym>
@@ -124,7 +124,7 @@ 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.
+@@ -1062,7 +1048,6 @@ command to generate the output files.
      <comment>ODM document</comment>
      <acronym>ODM</acronym>
      <expanded-acronym>OpenDocument Master</expanded-acronym>
@@ -132,7 +132,7 @@ index 8020b13..00e8d90 100644
      <generic-icon name="x-office-document"/>
      <magic priority="70">
        <match type="string" value="PK\003\004" offset="0">
-@@ -1141,7 +1126,6 @@ command to generate the output files.
+@@ -1077,7 +1062,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.
+@@ -1092,7 +1076,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.
+@@ -1100,7 +1083,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.
+@@ -1115,7 +1097,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.
+@@ -1130,7 +1111,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.
+@@ -1138,7 +1118,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.
+@@ -1153,7 +1132,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.
+@@ -1168,7 +1146,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.
+@@ -1176,7 +1153,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.
+@@ -1191,7 +1167,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.
+@@ -1206,7 +1181,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.
+@@ -1221,7 +1195,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.
+@@ -1236,7 +1209,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.
+@@ -1251,7 +1223,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.
+@@ -1267,7 +1238,6 @@ command to generate the output files.
      <comment>ODI image</comment>
      <acronym>ODI</acronym>
      <expanded-acronym>OpenDocument Image</expanded-acronym>
@@ -252,7 +252,7 @@ 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.
+@@ -1280,7 +1250,6 @@ command to generate the output files.
    </mime-type>
    <mime-type type="application/vnd.openofficeorg.extension">
      <comment>OpenOffice.org extension</comment>
@@ -261,5 +261,5 @@ index 8020b13..00e8d90 100644
      <glob pattern="*.oxt" />
    </mime-type>
 -- 
-2.41.0
+2.26.2
 

SOURCES/0001-freedesktop_generate.sh-Don-t-hardcode-ninja.patch

@@ -0,0 +1,28 @@
+From 136cb8f1d3bedc79343cad51ed744d69f5508adf Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 1 Oct 2021 14:57:47 -0700
+Subject: [PATCH] freedesktop_generate.sh: Don't hardcode ninja
+
+Another ninja implementation that works is samurai
+
+https://github.com/michaelforney/samurai
+---
+ data/freedesktop_generate.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
+index ff13e75..62ccffa 100755
+--- a/data/freedesktop_generate.sh
++++ b/data/freedesktop_generate.sh
+@@ -3,7 +3,7 @@
+ src_root="$1"
+ build_root="$2"
+ 
+-ninja -C "${build_root}" shared-mime-info-gmo
++${NINJA:-ninja} -C "${build_root}" shared-mime-info-gmo
+ 
+ itstool \
+     --its "${src_root}/data/its/shared-mime-info.its" \
+-- 
+2.37.3
+

SOURCES/0002-Fix-build-with-libxml2-2.12.0.patch

@@ -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
-

SOURCES/0002-meson-make-xmlto-optional-build-spec-only-if-found.patch

@@ -0,0 +1,58 @@
+From 6148b0ced86e37aa461eb4a399a6573e2bc687fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Sun, 24 Jan 2021 11:45:52 +0200
+Subject: [PATCH] meson: make xmlto optional, build spec only if found
+
+Refs https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/150
+---
+ data/meson.build | 22 ++++++++++++----------
+ meson.build      |  2 +-
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 263567d..24361c9 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -22,14 +22,16 @@ install_data(
+   install_dir : get_option('datadir') / 'gettext/its'
+ )
+ 
+-custom_target('shared-mime-info-spec-html',
+-    input : 'shared-mime-info-spec.xml',
+-    output: 'shared-mime-info-spec-html',
+-    command: [
+-        xmlto,
+-        '-o', '@OUTPUT@',
+-        'html-nochunks',
+-        '@INPUT@',
+-    ],
+-    build_by_default: true,
++if xmlto.found()
++    custom_target('shared-mime-info-spec-html',
++        input : 'shared-mime-info-spec.xml',
++        output: 'shared-mime-info-spec-html',
++        command: [
++            xmlto,
++            '-o', '@OUTPUT@',
++            'html-nochunks',
++            '@INPUT@',
++        ],
++        build_by_default: true,
+ )
++endif
+diff --git a/meson.build b/meson.build
+index 9a28573..0d08c8a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -22,7 +22,7 @@ config.set_quoted('VERSION', meson.project_version())
+ 
+ itstool = find_program('itstool')
+ xmllint = find_program('xmllint')
+-xmlto   = find_program('xmlto')
++xmlto   = find_program('xmlto', required: false)
+ 
+ ###############################################################################
+ # Find xdgmime
+-- 
+2.37.3
+

SOURCES/0003-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch

@@ -0,0 +1,112 @@
+From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+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
+---
+ 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/README.md b/README.md
+index c23d9d5..b2fb0ac 100644
+--- a/README.md
++++ b/README.md
+@@ -19,7 +19,7 @@ $ ninja -v -C _build install
+ ```
+ 
+ It requires the glib development package to be installed as well as
+-gettext and itstool.
++gettext.
+ This database is translated at Transifex.
+ 
+ 
+diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
+deleted file mode 100755
+index 62ccffa..0000000
+--- a/data/freedesktop_generate.sh
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#!/bin/sh -e
+-
+-src_root="$1"
+-build_root="$2"
+-
+-${NINJA:-ninja} -C "${build_root}" shared-mime-info-gmo
+-
+-itstool \
+-    --its "${src_root}/data/its/shared-mime-info.its" \
+-    --join "${src_root}/data/freedesktop.org.xml.in" \
+-    -o "${build_root}/data/freedesktop.org.xml" \
+-    "${build_root}/po/"*".gmo"
+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 @@ config.set_quoted('VERSION', meson.project_version())
+ ###############################################################################
+ # Find tools
+ 
+-itstool = find_program('itstool')
+ xmllint = find_program('xmllint')
+ xmlto   = find_program('xmlto', required: false)
+ 
+-- 
+2.37.3
+

SOURCES/mimeapps.list

@@ -59,8 +59,8 @@ application/x-catalog=gpk-install-catalog.desktop
 application/x-rpm=gpk-install-local-file.desktop
 text/csv=libreoffice-calc.desktop
 text/plain=org.gnome.gedit.desktop
-text/html=org.mozilla.firefox.desktop
+text/html=firefox.desktop
-application/xhtml+xml=org.mozilla.firefox.desktop
+application/xhtml+xml=firefox.desktop
 inode/directory=org.gnome.Nautilus.desktop
 x-content/blank-cd=brasero-nautilus.desktop
 x-content/blank-dvd=brasero-nautilus.desktop
@@ -73,8 +73,8 @@ x-content/image-dcf=shotwell.desktop
 x-content/image-picturecd=shotwell.desktop
 # URI scheme handlers
 x-scheme-handler/mailto=evolution.desktop
-x-scheme-handler/http=org.mozilla.firefox.desktop
+x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=org.mozilla.firefox.desktop
+x-scheme-handler/https=firefox.desktop
 application/mxf=org.gnome.Totem.desktop;
 application/ogg=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
 application/ram=org.gnome.Totem.desktop;

SOURCES/shared-mime-info-2.1-CFLAGS.patch

@@ -1,13 +0,0 @@
-diff -up shared-mime-info-2.1/xdgmime/Makefile.CFLAGS shared-mime-info-2.1/xdgmime/Makefile
-diff -up shared-mime-info-2.1/xdgmime/src/Makefile.CFLAGS shared-mime-info-2.1/xdgmime/src/Makefile
---- shared-mime-info-2.1/xdgmime/src/Makefile.CFLAGS	2020-12-30 03:24:55.000000000 -0600
-+++ shared-mime-info-2.1/xdgmime/src/Makefile	2022-02-02 09:37:38.529264264 -0600
-@@ -2,7 +2,7 @@
- .PHONY: all clean
- 
- C_STD = -std=c99 -D_POSIX_C_SOURCE=200809L
--ALL_CFLAGS = $(C_STD) -c -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP -Wall -Wmissing-prototypes -Wno-sign-compare $(CFLAGS)
-+ALL_CFLAGS = $(C_STD) -c -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP $(RPM_OPT_FLAGS) -Wall -Wmissing-prototypes -Wno-sign-compare $(CFLAGS)
- 
- .c.o:
-         $(CC) $(ALL_CFLAGS) -o $@ $<

SPECS/shared-mime-info.spec

@@ -1,37 +1,25 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 8;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 2.3
+Version: 2.1
-Release: %autorelease
+Release: 5%{?dist}
-License: GPL-2.0-or-later
+License: GPLv2+
 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
+Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz
 
 Source1: mimeapps.list
 
-%global xdgmime_commit 179296748e92bd91bf531656632a1056307fb7b7
+%global xdgmime_commit de283fc430460b9b3a7e61432a6d273cd64cb102
 # 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
-# HACK in use of RPM_OPT_FLAGS into xdgmime build
-Source7: shared-mime-info-2.1-CFLAGS.patch
 
 # 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
+# Fix build with meson 0.60+
-# https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219
+Patch1: 0001-freedesktop_generate.sh-Don-t-hardcode-ninja.patch
-Patch1: 0002-Fix-build-with-libxml2-2.12.0.patch
+Patch2: 0002-meson-make-xmlto-optional-build-spec-only-if-found.patch
+Patch3: 0003-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
 
 BuildRequires:  gcc
-BuildRequires:  gcc-c++
 BuildRequires:  libxml2-devel
 BuildRequires:  xmlto
 BuildRequires:  glib2-devel
@@ -54,16 +42,14 @@ and looking up the correct MIME type in a database.
 
 %prep
 %autosetup -S git_am
-rmdir xdgmime
 tar xjf %SOURCE6
 mv xdgmime-%{xdgmime_commit}/ xdgmime/
-patch -p1 < %SOURCE7
 
 %build
 %make_build -C xdgmime
 # 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
+%meson -Dupdate-mimedb=true -Dxdg-mime-path=./xdgmime/
 %meson_build
 
 %install
@@ -107,68 +93,20 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 %dir %{_datadir}/pkgconfig
 %{_datadir}/pkgconfig/shared-mime-info.pc
 %{_mandir}/man*/update-mime-database.*
-# also co-own the gettext dirs, we don't require it
-%dir %{_datadir}/gettext
-%dir %{_datadir}/gettext/its
 %{_datadir}/gettext/its/shared-mime-info.its
 %{_datadir}/gettext/its/shared-mime-info.loc
 
 %changelog
-## START: Generated by rpmautospec
+* Mon Nov 07 2022 Tomas Popela <tpopela@redhat.com> - 2.1-5
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.3-8
+- Fix build with a newer Meson (that we might rebase to)
-- Bump release for October 2024 mass rebuild:
+- Resolves: rhbz#2140541
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.3-7
-- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.3-7
-- Bump release for June 2024 mass rebuild
-
-* Tue May 28 2024 Milan Crha <mcrha@redhat.com> - 2.3-6
-- Co-own /usr/share/gettext and /usr/share/gettext/its
-- Related to rhbz#2280150
-- Resolves: RHEL-38682 (Backport Fedora 40 changes)
-
-* Tue Apr 02 2024 Tomas Pelka <tpelka@redhat.com> - 2.3-5
-- adding gating.yaml
-
-* Mon Mar 25 2024 Milan Crha <mcrha@redhat.com> - 2.3-4
-- Resolves: RHEL-30243 (Backport Fedora 40 changes)
-- Rename firefox desktop filename
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Dec 08 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.3-2
-- Fix build with libxml2-2.12.0
 
-* Sat Oct 07 2023 Miro Hrončok <miro@hroncok.cz> - 2.3-1
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1-4
-- Update to 2.3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Fixes: rhbz#2242609
+  Related: rhbz#1991688
 
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-4
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Apr 23 2022 Miro Hrončok <mhroncok@redhat.com> - 2.2-1
-- Update to 2.2
-- Fixes: rhbz#2068902
-- Fixes: rhbz#2047009
-
-* Wed Feb 02 2022 Rex Dieter <rdieter@fedoraproject.org> - 2.1-5
-- shared-mime-info FTBFS (#2047009)
-- make xdgmime build use rpm build flags
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -419,11 +357,11 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Tue May 22 2012 Rex Dieter <rdieter@fedoraproject.org>
+* Tue May 22 2012 Rex Dieter <rdieter@fedoraproject.org> 
 - 1.0-4
 - defaults.list: s/mozilla-firefox/firefox/ (see #736558)
 - defaults.list: s/gpk-install-file/gpk-install-local-file/
-- defaults.list: application/x-catalog=gpk-install-catalog.desktop (#770019)
+- defaults.list: application/x-catalog=gpk-install-catalog.desktop (#770019) 
 
 * Fri May 11 2012 Bastien Nocera <bnocera@redhat.com> 1.0-3
 - Use gnome-disk-image-mounter from gnome-disk-utility to handle
@@ -656,7 +594,7 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 30 2006 Caolan McNamara <caolanm@redhat.com> - 0.16.cvs20051219-2
-- rh#179138# add openoffice.org as preferred app for oasis formats
+- rh#179138# add openoffice.org as preferred app for oasis formats 
 
 * Mon Dec 19 2005 Matthias Clasen <mclasen@redhat.com> - 0.16.cvs20051219-1
 - Newer cvs snapshot
@@ -708,7 +646,7 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 - Handle XUL files. #134122
 
 * Wed Oct 13 2004 Colin Walters <walters@redhat.com> - 0.15-7
-- Make helix default for ogg and mp3, will switch wav/flac too
+- Make helix default for ogg and mp3, will switch wav/flac too 
   when support is added
 
 * Wed Oct  6 2004 Alexander Larsson <alexl@redhat.com> - 0.15-6
@@ -740,5 +678,3 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 
 * Fri Jan 16 2004 Alexander Larsson <alexl@redhat.com> mime-info
 - Initial build.
-
-## END: Generated by rpmautospec