Changeset 0a4eeb6 for general/genlib

Timestamp:

10/29/2017 06:24:03 PM (6 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, 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:

633a3ef

Parents:

28e582e

Message:

Update to glib-2.54.2. Change to meson build.

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

File:

• general/genlib/glib2.xml (modified) (10 diffs)

general/genlib/glib2.xml

@@ -7 +7 @@
   <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.54/glib-&glib2-version;.tar.xz">
   <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/2.54/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-md5sum        "6e4db71816ccbc8dabf0e58fa7228e76">
+  <!ENTITY glib2-md5sum        "50f83e08f080f99b1e2f0ad2b760fb81">
   <!ENTITY glib2-size          "7.5 MB">
-  <!ENTITY glib2-buildsize     "190 MB (additional 74 MB for tests)">
-  <!ENTITY glib2-time          "1.0 SBU (additional 4.6 SBU for tests)">
+  <!ENTITY glib2-buildsize     "166 MB (add 1 MB for tests)">
+  <!ENTITY glib2-time          "0.2 SBU (using parallelism=4; add 0.5 SBU for tests)">
 ]>
 
@@ -77 +77 @@
       <listitem>
         <para>
+          Required file:
+          <ulink url=
+"https://raw.githubusercontent.com/GNOME/glib/master/gio/tests/gengiotypefuncs.py"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Optional patch:
           <ulink url="&patch-root;/glib-&glib2-version;-skip_warnings-1.patch"/>
@@ -84 +91 @@
 
     <bridgehead renderas="sect3">GLib Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python2"/> or <xref linkend="python3"/>
-    </para>
--->
+
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -98 +100 @@
     <para role="optional">
       <xref linkend="dbus"/> (required for some tests),
-      <xref linkend="elfutils"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="python2"/>,
-      <ulink url="ftp://oss.sgi.com/projects/fam/download/stable/">FAM library</ulink>, and
-      <ulink url="https://www.gnu.org/software/indent/">GNU Indent</ulink>
+      <xref linkend="elfutils"/> and
+        <xref linkend="DocBook"/>,
+        <xref linkend="docbook-xsl"/>, and
+        <xref linkend="libxslt"/> (to build manual pages)
+
+      <!-- <xref linkend="gtk-doc"/> cound not find a reference to this 
+      in the meson build -->
     </para>
 
@@ -155 +159 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr      \
-            --with-pcre=system \
-            --with-python=/usr/bin/python3 &amp;&amp;
-make</userinput></screen>
+<screen><userinput>cp ../gengiotypefuncs.py gio/tests &amp;&amp;
+
+mkdir build-glib &amp;&amp;
+cd    build-glib &amp;&amp;
+
+meson --prefix=/usr -Dwith-pcre=system -Dwith-docs=no .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -173 +180 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+    <note><para>
+      If <xref linkend="libxslt"> is installed, the following command may
+      indicate several (about 33) errors that start with "Error: no ID for
+      constraint linkend:" when installing the man pages.  These are harmless.
+    </para></note>
+
+<screen role="root"><userinput>ninja install &amp;&amp;
+
+mkdir -p /usr/share/doc/glib-&glib2-version; &amp;&amp;
+cp -r ../docs/reference/{NEWS,README,gio,glib,gobject} /usr/share/doc/glib-&glib2-version;</userinput></screen>
 
     <para>
@@ -182 +198 @@
     <para>
       To test the results, after having installed the package, issue:
-      <command>make -k check</command>.
+      <command>ninja test</command>.  When run in a graphical environment, 
+      one test, appinfo, fails if <xref linkend='gnome-terminal'/> is not 
+      installed.
     </para>
 
@@ -191 +209 @@
 
     <para>
-      <parameter>--with-pcre=system</parameter>: This switch causes the
+      <parameter>-Dwith-pcre=system</parameter>: This switch causes the
       build to use a system-provided version of the
       <application>PCRE</application> library instead of an internal
@@ -197 +215 @@
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--with-python=/usr/bin/python3</option>: Add this switch if you
-      want GLib to use Python3 instead of Python2.
+    <para>
+      <parameter>-Dwith-docs=no</parameter>: This switch prevents
+      rebuilding the package documentation.
     </para>
 
@@ -217 +232 @@
       <seglistitem>
         <seg>
-          gapplication, gdbus, gdbus-codegen, gio, gio-querymodules,
+          gapplication,           gdbus, gdbus-codegen, 
+          gio,                    gio-querymodules,
           glib-compile-resources, glib-compile-schemas,
-          glib-genmarshal, glib-gettextize, glib-mkenums,
-          gobject-query, gresource, gsettings, gtester,
-          and gtester-report
+          glib-genmarshal,        glib-gettextize, 
+          glib-mkenums,           gobject-query, 
+          gresource,              gsettings, 
+          gtester, and            gtester-report
         </seg>
         <seg>
-          libgio-2.0.so, libglib-2.0.so, libgmodule-2.0.so,
-          libgobject-2.0.so, and libgthread-2.0.so
+          libgio-2.0.so, 
+          libglib-2.0.so, 
+          libgmodule-2.0.so,
+          libgobject-2.0.so, and 
+          libgthread-2.0.so
         </seg>
         <seg>
           /usr/include/gio-unix-2.0,
-          /usr/{include,lib,share}/glib-2.0,
-          /usr/lib/gio, and
-          /usr/share/gtk-doc/html/g{io,lib,object}
+          /usr/include/glib-2.0,
+          /usr/lib/gio, 
+          /usr/lib/glib-2.0, and 
+          /usr/share/glib-2.0
         </seg>
       </seglistitem>