Changeset 25b7f55 for gnome/platform

Timestamp:

07/03/2019 03:30:43 AM (5 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

e78637d

Parents:

06bb4fd1

Message:

Reapply revision 21737, which was overwritten in the elogind merge. This contains an update to libchamplain-0.12.19, libgdata-0.17.10, spacing correction in grilo, and cleanup in telepathy-mission-control.

libgdata was partially applied because of r21749 which was merged into elogind before it became live. This has been fully corrected.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@21791 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

gnome/platform

Files:

• grilo.xml (modified) (1 diff)
• libchamplain.xml (modified) (6 diffs)
• libgdata.xml (modified) (4 diffs)

gnome/platform/grilo.xml

@@ -95 +95 @@
 
 <screen><userinput>mkdir build &amp;&amp;
-cd build    &amp;&amp;
+cd    build    &amp;&amp;
+
 meson --prefix=/usr \
       --libexecdir=/usr/lib .. &amp;&amp;

gnome/platform/libchamplain.xml

@@ -9 +9 @@
   <!ENTITY libchamplain-download-ftp
            "&gnome-download-ftp;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-md5sum        "52a410767f4797657b505e439bf7ce83">
-  <!ENTITY libchamplain-size          "612 KB">
+  <!ENTITY libchamplain-md5sum        "a3015b1f32d80d65515f8042ce595b30">
+  <!ENTITY libchamplain-size          "228 KB">
   <!ENTITY libchamplain-buildsize     "10 MB">
   <!ENTITY libchamplain-time          "0.1 SBU">
@@ -79 +79 @@
       <xref linkend="clutter"/>,
       <xref linkend="clutter-gtk"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libsoup"/>
+      <xref linkend="gtk3"/>,
+      <xref linkend="libsoup"/>, and
+      <xref linkend="sqlite"/>
     </para>
 
@@ -107 +108 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
-            --enable-vala     \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
+<!-- Because there is still rudimentary autotools support, there is already a
+     build directory. Change into it and continue. -->
+<screen><userinput>cd build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -120 +123 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+  </sect2>
+ 
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -140 +144 @@
 
   </sect2>
+-->
 
   <sect2 role="content">
@@ -157 +162 @@
         </seg>
         <seg>
-          /usr/include/{libchamplain-0.12,libchamplain-gtk-0.12} and
-          /usr/share/gtk-doc/html/{libchamplain-0.12,libchamplain-gtk-0.12}
+          /usr/include/champlain-0.12 and
+          /usr/share/gtk-doc/html/champlain-0.12
         </seg>
       </seglistitem>

gnome/platform/libgdata.xml

@@ -7 +7 @@
   <!ENTITY libgdata-download-http "&gnome-download-http;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
   <!ENTITY libgdata-download-ftp  "&gnome-download-ftp;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-md5sum        "cd41fec52a0f0ba999eb60025e0ac806">
-  <!ENTITY libgdata-size          "1.4 MB">
-  <!ENTITY libgdata-buildsize     "64 MB (with tests)">
-  <!ENTITY libgdata-time          "0.7 SBU (with tests)">
+  <!ENTITY libgdata-md5sum        "d858d411ad394c275643b14993dfeed4">
+  <!ENTITY libgdata-size          "820 MB">
+  <!ENTITY libgdata-buildsize     "73 MB (with tests)">
+  <!ENTITY libgdata-time          "1.1 SBU (with tests)">
 ]>
 
@@ -118 +118 @@
 
     <para>
-      To test the results, issue: <command>make check</command>. Note that
+      To test the results, issue: <command>ninja test</command>. Note that
       the tests need network access.
     </para>
@@ -126 +126 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -154 +154 @@
         </seg>
         <seg>
-          /usr/include/libgdata and
-          /usr/share/gtk-doc/html/gdata
+          /usr/include/libgdata,
+          /usr/libexec/installed-tests/libgdata,
+          /usr/share/gtk-doc/html/gdata, and
+          /usr/share/installed-tests/libgdata
         </seg>
       </seglistitem>