Changeset 4005416 for x/lib/gtkmm3.xml

Timestamp:

01/02/2021 04:13:08 PM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

qt5new

Children:

a84fc21

Parents:

03c3caa4 (diff), 24d47269 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk up to r24051

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

File:

• x/lib/gtkmm3.xml (modified) (5 diffs)

x/lib/gtkmm3.xml

@@ -7 +7 @@
   <!ENTITY gtkmm3-download-http "&gnome-download-http;/gtkmm/&gnome-minor-24;/gtkmm-&gtkmm3-version;.tar.xz">
   <!ENTITY gtkmm3-download-ftp  "&gnome-download-ftp;/gtkmm/&gnome-minor-24;/gtkmm-&gtkmm3-version;.tar.xz">
-  <!ENTITY gtkmm3-md5sum        "e311db484ca9c53f1689d35f5f58a06b">
+  <!ENTITY gtkmm3-md5sum        "9a9a00bcd634e3eca0b101809f2eae02">
   <!ENTITY gtkmm3-size          "13 MB">
-  <!ENTITY gtkmm3-buildsize     "411 MB (with tests)">
-  <!ENTITY gtkmm3-time          "2.1 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gtkmm3-buildsize     "373 MB (with tests)">
+  <!ENTITY gtkmm3-time          "0.9 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -80 +80 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/gtkmm3"/>
@@ -89 +94 @@
 
     <para>
-      First, fix the documentation directory name:
-    </para>
-
-<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/gtkmm-&gtkmm3-version;/' \
-    -i docs/Makefile.in</userinput></screen>
-
-    <para>
       Install <application>Gtkmm</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that you
+<screen><userinput>mkdir gtkmm3-build &amp;&amp;
+cd    gtkmm3-build &amp;&amp;
+
+meson --prefix=/usr \
+      ..           &amp;&amp;
+
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>. Note that you
       must be in a graphical environment, as the tests try to open some
       windows.
@@ -113 +116 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+    <para>
+      If you have built the documentation (see Command Explanations below) it
+      was installed to <filename
+      class="directory">/usr/share/doc/gtkmm-3.0</filename>. For consistency,
+      move it to a versioned directory as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="nodump">mv -v /usr/share/doc/gtkmm-3.0 /usr/share/doc/gtkmm-&gtkmm3-version;</screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>-Dbuild-documentation=true</option>: If you have installed
+      <xref linkend="doxygen"/> this define will build and install the
+      documentation.
+    </para>
+
   </sect2>
 
@@ -135 +160 @@
           /usr/include/gtkmm-3.0,
           /usr/lib/gdkmm-3.0,
-          /usr/lib/gtkmm-3.0, and
+          /usr/lib/gtkmm-3.0, and optionally
           /usr/share/{devhelp/books/gtkmm-3.0,doc/gtkmm-&gtkmm3-version;}
         </seg>