Author: krejzi
Date: 2012-03-29 13:02:49 -0600 (Thu, 29 Mar 2012)
New Revision: 9801
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/glib2.xml
trunk/BOOK/general/genlib/libffi.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/xsoft/other/xchat.xml
Log:
glib 2.32.0, add fix for xchat to compile against glib 2.32, add patch that
moves libffi includes to /usr/include
Modified: trunk/BOOK/general/genlib/glib2.xml
===================================================================
--- trunk/BOOK/general/genlib/glib2.xml 2012-03-29 13:40:39 UTC (rev 9800)
+++ trunk/BOOK/general/genlib/glib2.xml 2012-03-29 19:02:49 UTC (rev 9801)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%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)">
]>
<sect1 id="glib2" xreflabel="GLib-&glib2-version;">
@@ -68,23 +68,24 @@
<!--<para role="required"><xref linkend="pkgconfig"/> -->
</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"/>
(built with unicode properties)</para>
<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>
<para role="optional">Quoted directly from the <filename>INSTALL</filename>
@@ -107,10 +108,11 @@
<!-- 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 &&
make</userinput></screen>
@@ -148,8 +150,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
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
<application>PCRE</application> library instead of an internal
@@ -157,6 +157,9 @@
</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">
<title>Configuring GLib</title>
@@ -181,6 +184,7 @@
</sect3>
</sect2>
+-->
<sect2 role="content">
<title>Contents</title>
@@ -191,13 +195,17 @@
<segtitle>Installed Directories</segtitle>
<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>
@@ -206,6 +214,63 @@
<?dbfo list-presentation="list"?>
<?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>
<listitem>
@@ -248,6 +313,26 @@
</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>
+ </varlistentry>
+
<varlistentry id="gtester">
<term><command>gtester</command></term>
<listitem>
Modified: trunk/BOOK/general/genlib/libffi.xml
===================================================================
--- trunk/BOOK/general/genlib/libffi.xml 2012-03-29 13:40:39 UTC (rev
9800)
+++ trunk/BOOK/general/genlib/libffi.xml 2012-03-29 19:02:49 UTC (rev
9801)
@@ -58,6 +58,16 @@
</listitem>
</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>
<sect2 role="installation">
@@ -66,7 +76,8 @@
<para>Install <application>libffi</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>patch -Np1 -i ../libffi-&libffi-version;-includedir-1.patch
&&
+./configure --prefix=/usr &&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -88,7 +99,7 @@
<seglistitem>
<seg>None</seg>
<seg>libffi.{so,a}</seg>
- <seg>/usr/lib/libffi-&libffi-version;/include</seg>
+ <seg>None</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-03-29 13:40:39 UTC (rev 9800)
+++ trunk/BOOK/general.ent 2012-03-29 19:02:49 UTC (rev 9801)
@@ -176,7 +176,7 @@
<!ENTITY libxml2-version "2.7.8">
<!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">
<!ENTITY libidl-version "0.8.14">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-03-29 13:40:39 UTC
(rev 9800)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-03-29 19:02:49 UTC
(rev 9801)
@@ -51,9 +51,12 @@
<para>
[abenton] - Added GeoClue 1.12.0, required by WebKitGTK+-1.8.0.
</para>
+ </listitem>
<listitem>
- <para>[abenton] -LibSoup 2.38.0.</para>
+ <para>[abenton] - LibSoup 2.38.0.</para>
</listitem>
+ <listitem>
+ <para>[krejzi] - glib 2.32.0.</para>
</listitem>
</itemizedlist>
</listitem>
@@ -136,7 +139,7 @@
<para>[krejzi] - pixman 0.24.4.</para>
</listitem>
<listitem>
- <para>[krejzi] - cairo 1.12.</para>
+ <para>[krejzi] - cairo 1.12.0.</para>
</listitem>
<listitem>
<para>[krejzi] - removed libmikmod 3.1.11.</para>
Modified: trunk/BOOK/xsoft/other/xchat.xml
===================================================================
--- trunk/BOOK/xsoft/other/xchat.xml 2012-03-29 13:40:39 UTC (rev 9800)
+++ trunk/BOOK/xsoft/other/xchat.xml 2012-03-29 19:02:49 UTC (rev 9801)
@@ -58,6 +58,16 @@
</listitem>
</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>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -91,7 +101,8 @@
<para>Install <application>XChat</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../xchat-&xchat-version;-glib-2.31-1.patch
&&
+./configure --prefix=/usr \
--sysconfdir=&gnome-etc-dir; \
--enable-shm &&
make</userinput></screen>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
