Changeset 498c00c

Timestamp:

11/13/2023 07:06:27 AM (6 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

a0f16e7

Parents:

aa8180f

Message:

Update to appstream-1.0.0 (again)

Fix up libadwaita to build with it. Update the command explanation to
allow building it with Qt-5. Also fix the errors detected in
org.linuxfromscratch.lfs.xml reported by "appstreamcli validate".

Files:

• general/genlib/appstream.xml (modified) (5 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/lib/libadwaita.xml (modified) (2 diffs)

general/genlib/appstream.xml

@@ -7 +7 @@
   <!ENTITY appstream-download-http "https://www.freedesktop.org/software/appstream/releases/AppStream-&appstream-version;.tar.xz">
   <!ENTITY appstream-download-ftp  " ">
-  <!ENTITY appstream-md5sum        "5d3d3045711a91e3c3c29dcdeaa14074">
-  <!ENTITY appstream-size          "2.5 MB">
-  <!ENTITY appstream-buildsize     "31 MB">
+  <!ENTITY appstream-md5sum        "6465ef5b23d5b0724fe6dd0aec8b0bec">
+  <!ENTITY appstream-size          "2.6 MB">
+  <!ENTITY appstream-buildsize     "27 MB">
   <!ENTITY appstream-time          "0.6 SBU">
 ]>
@@ -84 +84 @@
     <para role="optional">
       <xref linkend="gtk-doc"/>,
-      &qt5-deps;, and
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
+      &qt5-deps;,
+      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>,
+      and <ulink url="https://download.qt.io/archive/qt/">Qt-6.2.4 or
+      later</ulink>
     </para>
 
@@ -146 +148 @@
     
     <para>
-      <option>-Dqt=true</option>: Use this option if you have &qt5-deps;
-      installed and you want to build support for Qt applications into this
+      <option>-Dqt5=true</option>: Use this option if you have &qt5-deps;
+      installed and you want to build support for Qt-5 applications into this
       package.
     </para>
     
+    <para>
+      <option>-Dqt=true</option>: Use this option if you have Qt-6.2.4 or
+      later installed and you want to build support for Qt-6 applications
+      into this package.  This option conflicts with
+      <option>-Dqt5=true</option>.
+    </para>
+
   </sect2>
   
@@ -185 +194 @@
   &lt;id&gt;org.linuxfromscratch.lfs&lt;/id&gt;
   &lt;name&gt;Linux From Scratch&lt;/name&gt;
-  &lt;summary&gt;A customized Linux system built entirely from source.&lt;/summary&gt;
+  &lt;summary&gt;A customized Linux system built entirely from source&lt;/summary&gt;
   &lt;description&gt;
     &lt;p&gt;
@@ -195 +204 @@
   &lt;url type="homepage"&gt;https://www.linuxfromscratch.org/lfs/&lt;/url&gt;
   &lt;metadata_license&gt;MIT&lt;/metadata_license&gt;
-  &lt;developer_name&gt;The Linux From Scratch Editors&lt;/developer_name&gt;
+  &lt;developer id='linuxfromscratch.org'&gt;
+    &lt;name&gt;The Linux From Scratch Editors&lt;/name&gt;
+  &lt;/developer&gt;
 
   &lt;releases&gt;
-    &lt;release version="12.1" type="development"&gt;
+    &lt;release version="12.1" type="development" date="2024-03-01"&gt;
       &lt;description&gt;
         &lt;p&gt;The next release of Linux From Scratch.&lt;/p&gt;

introduction/welcome/changelog.xml

@@ -43 +43 @@
       <itemizedlist>
         <listitem>
+          <para>[xry111] - Update to AppStream-1.0.0.  Fixes
+          <ulink url="&blfs-ticket-root;18843">#18843</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[rahul] - Update to dhcpcd-10.0.5. Fixes
           <ulink url="&blfs-ticket-root;18844">#18844</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[rahul] - Update to AppStream-0.16.4. Fixes
+          <para>[rahul] - Update to AppStream-0.16.4. Part of
           <ulink url="&blfs-ticket-root;18843">#18843</ulink>.</para>
         </listitem>

packages.ent

@@ -83 +83 @@
 <!-- Part III -->
 <!-- Chapter 9 -->
-<!ENTITY appstream-version            "0.16.4">
+<!ENTITY appstream-version            "1.0.0">
 <!ENTITY apr-version                  "1.7.4">
 <!ENTITY apr-util-version             "1.6.3">

x/lib/libadwaita.xml

@@ -92 +92 @@
 
     <para>
+      Adapt some AppStream API usage for AppStream-1.0.0 or later:
+    </para>
+
+<screen><userinput>sed -e "/releases =/s/=.*/ =                             \
+        as_release_list_get_entries                      \
+        (as_component_get_releases_plain (component));/" \
+    -e "/ developer_name =/s/=.*/ =                      \
+        as_developer_get_name                            \
+        (as_component_get_developer (component));/"      \
+    -i src/adw-about-window.c</userinput></screen>
+
+
+    <para>
       Install <application>libadwaita</application> by running the following
       commands:
@@ -113 +126 @@
     <para>
       To test the results, issue: <command>ninja test</command>.
-      The tests must be run from a graphical session.
+      The tests must be run from a graphical session.  One test named
+      <quote>Validate appstream file</quote> is known to fail because the
+      test input contains constructs deprecated by AppStream-1.0.0 or
+      later.
     </para>