Changeset b43f617

Timestamp:

11/15/2021 12:22:02 AM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.1, 11.2, 11.3, 12.0, 12.1, 12.2, gimp3, 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, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

12e22d5

Parents:

f72bfbe1

Message:

Fixes for shared-mime-info-2.1.

Files:

• general/genutils/shared-mime-info.xml (modified) (4 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/genutils/shared-mime-info.xml

@@ -10 +10 @@
   <!ENTITY shared-mime-info-md5sum        "8d059fb2d34062a67fd9ca63fab1fb91">
   <!ENTITY shared-mime-info-size          "5.0 MB">
-  <!ENTITY shared-mime-info-buildsize     "26 MB">
-  <!ENTITY shared-mime-info-time          "less than 0.1 SBU">
+  <!ENTITY shared-mime-info-buildsize     "30 MB (add 1MB if running the tests)">
+  <!ENTITY shared-mime-info-time          "less than 0.1 SBU using parallelism=4">
+
+  <!ENTITY xdgmime-download-http "&sources-anduin-http;/xdgmime/xdgmime.tar.xz">
+  <!ENTITY xdgmime-md5sum        "7dfb4446705d345d3acd672024049e86">
+
 ]>
 
@@ -69 +73 @@
         <para>
           Estimated build time: &shared-mime-info-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch to allow building with meson-0.60 and later:
+          <ulink url="&patch-root;/shared-mime-info-&shared-mime-info-version;-shared-mime-info_meson_0.60_fix-1.patch"/>
+        </para>
+        <para role="optional">
+        Optional download, required to run the testsuite:
+        <ulink url="&xdgmime-download-http;"/>
+        </para>
+        <para role="optional">
+          xdgmime md5sum: &xdgmime-md5sum;
         </para>
       </listitem>
@@ -96 +117 @@
     </para>
 
+    <para role="optional">
+      If you wish to run the test suite, you must first extract the
+      <filename>xdgmime</filename> tarball into the current directory,
+      and compile it so that <command>meson</command> can find it:
+    </para>
+
+<screen role="optional"><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;-shared-mime-info_meson_0.60_fix-1.patch</userinput></screen>
+
+    <para>
+      Now build the package:
+    </para>
+
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
@@ -102 +143 @@
 ninja</userinput></screen>
 
-    <para>
-      To test the result, issue <command>ninja test</command>.
+    <para role="optional">
+      If you have followed the instructions above to build
+      <application>xdgmime</application>, to test the result issue
+      <command>ninja test</command>.
     </para>
 

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Fixes for shared-mime-info-2.1. Fixes
+          <ulink url="&blfs-ticket-root;15748">#15748</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to libdrm-2.4.108. Fixes
           <ulink url="&blfs-ticket-root;15739">#15739</ulink>.</para>