Changeset b31b493

Timestamp:

03/29/2012 07:02:49 PM (12 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

66b546a

Parents:

e0f97de

Message:

glib 2.32.0, add fix for xchat to compile against glib 2.32, add patch that moves libffi includes to /usr/include

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

Files:

• general.ent (modified) (1 diff)
• general/genlib/glib2.xml (modified) (10 diffs)
• general/genlib/libffi.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (2 diffs)
• xsoft/other/xchat.xml (modified) (2 diffs)

general.ent

@@ -177 +177 @@
 <!ENTITY libxslt-version              "1.1.26">
 <!ENTITY libgtkhtml-version           "2.11.1">
-<!ENTITY glib2-version                "2.30.2">
+<!ENTITY glib2-version                "2.32.0">
 <!ENTITY dbus-glib-version            "0.98">
 <!ENTITY glibmm-version               "2.30.0">

general/genlib/glib2.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.30/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/2.30/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-md5sum        "b7dd26aa83de0b59c867a0b9eb9f9462">
-  <!ENTITY glib2-size          "7.4 MB">
-  <!ENTITY glib2-buildsize     "179 MB">
-  <!ENTITY glib2-time          "1.5 SBU (additional 4.0 SBU to run the test suite)">
+  <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.32/glib-&glib2-version;.tar.xz">
+  <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/2.32/glib-&glib2-version;.tar.xz">
+  <!ENTITY glib2-md5sum        "c5fa76fbf9184d20dfb04af66b598190">
+  <!ENTITY glib2-size          "5.9 MB">
+  <!ENTITY glib2-buildsize     "160 MB">
+  <!ENTITY glib2-time          "1.0 SBU (additional 4.0 SBU to run the test suite)">
 ]>
 
@@ -69 +69 @@
     </para> 
 
-    <!-- This should be discussed as the instructions in the tarball give
-         many reasons why the internal PCRE should be used -->
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="pcre"/>
@@ -76 +74 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="attr"/>, <!-- <xref linkend="gamin"/>,
-    --> <xref linkend="dbus"/> (required to run the tests) and
+    <para role="optional"><xref linkend="attr"/>, <xref linkend="dbus"/> 
+    (required to run the tests), <xref linkend="gamin"/> and
     <xref linkend="gtk-doc"/></para>
 
     <!-- Couldn't find this 
+    Re: It's giofam module. It may be unnecesary since there is inotify support now.
+    -->
+
     <para><application>Gamin</application> requires
     <application>GLib</application> in order to compile; therefore, you must
     first install <application>GLib</application>, then compile
     <application>Gamin</application>, and recompile
-    <application>GLib</application> against it.</para> -->
+    <application>GLib</application> against it.</para>
 
     <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
@@ -108 +109 @@
     <!-- This should be discussed as the instructions in the tarball give
          many reasons why the internal PCRE should be used -->
-<screen><userinput>PCRE_LIBS=-lpcre                               \
-PCRE_CFLAGS=" "                                \
-LIBFFI_LIBS=-lffi                              \
-LIBFFI_CFLAGS=-I/usr/lib/libffi-3.0.10/include \
+
+    <!-- Re: PCRE 8.30 is bundled, and BLFS has same version -->
+
+<screen><userinput>PCRE_LIBS=-lpcre PCRE_CFLAGS=" " \
+LIBFFI_LIBS=-lffi LIBFFI_CFLAGS=" " \
 ./configure --prefix=/usr --sysconfdir=/etc --with-pcre=system &amp;&amp;
 make</userinput></screen>
@@ -149 +151 @@
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <!-- This should be discussed as the instructions in the tarball give
-         many reasons why the internal PCRE should be used -->
     <para><parameter>--with-pcre=system</parameter>: This parameter causes the
     build to use a system-provided version of the
@@ -157 +157 @@
 
   </sect2>
+
+<!-- This has never caused any problems for me. A doc hint could help me
+     understand why this was here in first place.
 
   <sect2 role="configuration">
@@ -182 +185 @@
 
   </sect2>
+-->
 
   <sect2 role="content">
@@ -192 +196 @@
 
       <seglistitem>
-        <seg>gio-querymodules, glib-genmarshal, glib-gettextize, glib-mkenums,
-        gobject-query, gtester and gtester-report</seg>
+        <seg>gdbus, gdbus-codegen, gio-querymodules,
+        glib-compile-resources, glib-compile-schemas,
+        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</seg>
+        libgobject-2.0.so, libgthread-2.0.so and libgiofam.so</seg>
         <seg>/usr/{include/{gio-unix-2.0/gio,glib-2.0/{gio,glib,gobject}},
-        lib/{gio/modules,glib-2.0/include},share/{gdb/auto-load,glib-2.0/{gdb,
-        gettext/po},gtk-doc/html/{gio,glib,gobject}}}</seg>
+        lib/{gdbus-2.0/codegen,gio/modules,glib-2.0/include},share/
+        {gdb/auto-load,glib-2.0/{gdb,gettext/po},gtk-doc/html/
+        {gio,glib,gobject}}}</seg>
       </seglistitem>
     </segmentedlist>
@@ -207 +215 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="gdbus">
+        <term><command>gdbus</command></term>
+        <listitem>
+          <para>is a simple tool for working with D-Bus objects.</para>
+          <indexterm zone="glib2 gdbus">
+            <primary sortas="b-gdbus">gdbus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gdbus-codegen">
+        <term><command>gdbus-codegen</command></term>
+        <listitem>
+          <para>is used to generate code and/or documentation for one or 
+          more D-Bus interfaces.</para>
+          <indexterm zone="glib2 gdbus-codegen">
+            <primary sortas="b-gdbus-codegen">gdbus-codegen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gio-querymodules">
+        <term><command>gio-querymodules</command></term>
+        <listitem>
+          <para>is used to create a giomodule.cache file in the listed directories. 
+          This file lists the implemented extension points for each module that has
+          been found.</para>
+          <indexterm zone="glib2 gio-querymodules">
+            <primary sortas="b-gio-querymodules">gio-querymodules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glib-compile-resources">
+        <term><command>glib-compile-resources</command></term>
+        <listitem>
+          <para>is used to read the resource description from file and 
+          the files that it references to create a binary resource 
+          bundle that is suitable for use with the GResource API.</para>
+          <indexterm zone="glib2 glib-compile-resources">
+            <primary sortas="b-glib-compile-resources">glib-compile-resources</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glib-compile-schemas">
+        <term><command>glib-compile-schemas</command></term>
+        <listitem>
+          <para>is used to compile all the GSettings XML schema files 
+          in directory into a binary file with the name gschemas.compiled 
+          that can be used by GSettings.</para>
+          <indexterm zone="glib2 glib-compile-schemas">
+            <primary sortas="b-glib-compile-resources">glib-compile-schemas</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="glib-genmarshal">
         <term><command>glib-genmarshal</command></term>
@@ -245 +310 @@
           <indexterm zone="glib2 gobject-query">
             <primary sortas="b-gobject-query">gobject-query</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gresource">
+        <term><command>gresource</command></term>
+        <listitem>
+          <para>offers a simple commandline interface to GResource.</para>
+          <indexterm zone="glib2 gresource">
+            <primary sortas="b-gresource">gresource</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gsettings">
+        <term><command>gsettings</command></term>
+        <listitem>
+          <para>offers a simple commandline interface to GSettings.</para>
+          <indexterm zone="glib2 gsettings">
+            <primary sortas="b-gsettings">gsettings</primary>
           </indexterm>
         </listitem>

general/genlib/libffi.xml

@@ -59 +59 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libffi-&libffi-version;-includedir-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
   </sect2>
 
@@ -67 +77 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libffi-&libffi-version;-includedir-1.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -89 +100 @@
         <seg>None</seg>
         <seg>libffi.{so,a}</seg>
-        <seg>/usr/lib/libffi-&libffi-version;/include</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>

introduction/welcome/changelog.xml

@@ -52 +52 @@
             [abenton] - Added GeoClue 1.12.0, required by WebKitGTK+-1.8.0.
           </para>
-        <listitem>
-          <para>[abenton] -LibSoup 2.38.0.</para>
-        </listitem>
+        </listitem>
+        <listitem>
+          <para>[abenton] - LibSoup 2.38.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - glib 2.32.0.</para> 
         </listitem>
       </itemizedlist>
@@ -137 +140 @@
         </listitem>
         <listitem>
-          <para>[krejzi] - cairo 1.12.</para>
+          <para>[krejzi] - cairo 1.12.0.</para>
         </listitem>
         <listitem>

xsoft/other/xchat.xml

@@ -59 +59 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/xchat-&xchat-version;-glib-2.31-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">XChat Dependencies</bridgehead>
 
@@ -92 +102 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../xchat-&xchat-version;-glib-2.31-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=&gnome-etc-dir; \
             --enable-shm &amp;&amp;