Changeset e7d893b for gnome/platform/gnome-desktop.xml

Timestamp:

05/19/2019 04:54:33 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

215c728b

Parents:

853ae3e5

Message:

Merge to HEAD 21602.

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

File:

• gnome/platform/gnome-desktop.xml (modified) (5 diffs)

gnome/platform/gnome-desktop.xml

@@ -6 +6 @@
 
 <!ENTITY gnome-desktop-download-http
-           "&gnome-download-http;/gnome-desktop/&gnome-minor-30;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+           "&gnome-download-http;/gnome-desktop/&gnome-minor-32;/gnome-desktop-&gnome-desktop-version;.tar.xz">
   <!ENTITY gnome-desktop-download-ftp
-           "&gnome-download-ftp;/gnome-desktop/&gnome-minor-30;/gnome-desktop-&gnome-desktop-version;.tar.xz">
-  <!ENTITY gnome-desktop-md5sum        "0ee2a0d7af1ffe39104fbb7ca4afa21e">
-  <!ENTITY gnome-desktop-size          "1.0 MB">
-  <!ENTITY gnome-desktop-buildsize     "23 MB">
-  <!ENTITY gnome-desktop-time          "0.3 SBU">
+           "&gnome-download-ftp;/gnome-desktop/&gnome-minor-32;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+  <!ENTITY gnome-desktop-md5sum        "e9a32b755c20f1462f7c4321e32b30cb">
+  <!ENTITY gnome-desktop-size          "696 KB">
+  <!ENTITY gnome-desktop-buildsize     "14 MB (with tests)">
+  <!ENTITY gnome-desktop-time          "0.1 SBU (using parallelism=4; with tests)">
 ]>
 
@@ -81 +81 @@
       <xref linkend="gtk3"/>,
       <xref linkend="iso-codes"/>,
-      <xref linkend="itstool"/>,
       <xref linkend="libseccomp"/>,
       <xref linkend="libxml2"/>, and
@@ -111 +110 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                 \
-            --with-gnome-distributor="BLFS" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-    <!-- With 3.30.x, test files do exist - the test suite just has not been implemented yet.
-    Upstream had a lot of problems with the new WallClock() API that was implemented with 3.28, which
-    is why a test suite is being implemented.-->
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+
+meson --prefix=/usr                 \
+      -Dgnome_distributor="BLFS" .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para revision="sysv">
+      This package does not come with a functioning test suite.
+      or similar.
+    </para>
+
+    <para revision="systemd">
+      To test the results, run <command>ninja test</command> from a X Terminal
+      or similar.
+    </para>
 
     <para>
@@ -129 +137 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -137 +145 @@
 
     <para>
-      <option>--with-gnome-distributor="Some Name"</option>: Use this
+      <option>-Dgnome_distributor="Some Name"</option>: Use this
       parameter to supply a custom name in the <quote>Distributor:</quote>
       field of the <quote>GNOME About</quote> display window.
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+       href="../../xincludes/gtk-doc-rebuild.xml"/> -->
 
   </sect2>