Changeset b0530c8c for general

Timestamp:

03/28/2022 10:10:10 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

2edd9049

Parents:

0beb4e7

Message:

Update to shared-mime-info-2.2.

File:

• general/genutils/shared-mime-info.xml (modified) (4 diffs)

general/genutils/shared-mime-info.xml

@@ -8 +8 @@
            "https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/&shared-mime-info-version;/shared-mime-info-&shared-mime-info-version;.tar.gz">
   <!ENTITY shared-mime-info-download-ftp  " ">
-  <!ENTITY shared-mime-info-md5sum        "8d059fb2d34062a67fd9ca63fab1fb91">
-  <!ENTITY shared-mime-info-size          "5.0 MB">
-  <!ENTITY shared-mime-info-buildsize     "23 MB (with tests)">
-  <!ENTITY shared-mime-info-time          "less than 0.1 SBU">
+  <!ENTITY shared-mime-info-md5sum        "06cb9e92e4211dc53fd52b7bfd586c78">
+  <!ENTITY shared-mime-info-size          "6.7 MB">
+  <!ENTITY shared-mime-info-buildsize     "24 MB (with tests)">
+  <!ENTITY shared-mime-info-time          "less than 0.1 SBU (with tests)">
 
   <!ENTITY xdgmime-download-http "&sources-anduin-http;/xdgmime/xdgmime.tar.xz">
@@ -81 +81 @@
       <listitem>
         <para>
-          Required patch to allow building with meson-0.60 and later:
-          <ulink url="&patch-root;/shared-mime-info-&shared-mime-info-version;-meson_0.60_fix-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           Optional download, required to run the testsuite:
           <ulink url="&xdgmime-download-http;"/>
@@ -101 +95 @@
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libxml2"/>, and
+      <xref linkend="itstool"/>, and
+      <xref linkend="libxml2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
       <xref linkend="xmlto"/>
     </para>
@@ -127 +125 @@
 <screen remap="test"><userinput>tar -xf ../xdgmime.tar.xz &amp;&amp;
 make -C xdgmime</userinput></screen>
-
-    <para>
-      One of the changes in meson-0.60 broke this package. To fix that
-      apply a patch:
-    </para>
-
-<screen><userinput>patch -p1 -i ../shared-mime-info-&shared-mime-info-version;-meson_0.60_fix-1.patch</userinput></screen>
 
     <para>