linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 06:27:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge Wayne's GConf and trial new wording for getting rid of static libs.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9201 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2012-01-25 01:50:49 +00:00
parent a006f981e7
commit 414007cdb1
5 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.ent
View File

@ -644,7 +644,7 @@ $Date$
<!-- Chapter 32 -->
<!-- Platform -->
<!ENTITY GConf-version "2.28.1">
<!ENTITY GConf-version "3.2.3">
<!ENTITY gnome-icon-theme-version "2.30.3">
<!ENTITY gnome-mime-data-version "2.18.0">

114
gnome/core/gconf.xml
View File

@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY GConf-download-http "&gnome-download-http;/GConf/2.28/GConf-&GConf-version;.tar.bz2">
<!ENTITY GConf-download-ftp "&gnome-download-ftp;/GConf/2.28/GConf-&GConf-version;.tar.bz2">
<!ENTITY GConf-md5sum "27663faf0af4f6a6d534de9270f6d24a">
<!ENTITY GConf-size "1.4 MB">
<!ENTITY GConf-buildsize "41 MB">
<!ENTITY GConf-time "0.5 SBU">
<!ENTITY GConf-download-http "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
<!ENTITY GConf-download-ftp "&gnome-download-ftp;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
<!ENTITY GConf-md5sum "de9047c08d3f642c5b1990b0bef44577">
<!ENTITY GConf-size "1.5 MB">
<!ENTITY GConf-buildsize "47 MB">
<!ENTITY GConf-time "0.3 SBU">
]>
<sect1 id="GConf" xreflabel="GConf-&GConf-version;">
@ -32,7 +32,7 @@
<para>The <application>GConf</application> package contains a
configuration database system.</para>
&lfs65_checked;
&lfs70_built;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@ -56,24 +56,19 @@
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>Required patch: <ulink
url="&patch-root;/GConf-&GConf-version;-sysconfdir-1.patch"/></para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">GConf Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required"><xref linkend="ORBit2"/> and
<xref linkend="polkit"/></para>
<para role="required"><xref linkend="dbus-glib"/>,
<xref linkend="intltool"/>, and
<xref linkend="libxml2"/><!--, and
<xref linkend="ORBit2"/>--></para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended"><xref linkend="gtk2"/> (Required if building a
<para role="recommended"><xref linkend="gtk3"/> (Required if building a
<application>GNOME</application> desktop.
<command>gconf-sanity-check-2</command> will not build otherwise.)</para>
<command>gconf-sanity-check-2</command> will not build otherwise.) and
<xref linkend="polkit"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="openldap"/> and
@ -90,13 +85,12 @@
<para>Install <application>GConf</application> by running the following
commands:</para>
<screen><userinput>patch -Np1 -i ../GConf-&GConf-version;-sysconfdir-1.patch &amp;&amp;
./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
--sysconfdir=&gnome-etc-dir; \
--libexecdir=$(pkg-config \
--variable=prefix ORBit-2.0)/lib/GConf \
--mandir=$(pkg-config \
--variable=prefix ORBit-2.0)/share/man &amp;&amp;
<!-- with-gtk=3.0 is the default, and mandir goes to prefix/share/man -->
<screen><userinput>./configure --prefix=$GNOME_PREFIX \
--sysconfdir=$GNOME_SYSCONFDIR \
--libexecdir=$GNOME_PREFIX/lib/GConf \
--disable-orbit &amp;&amp;
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@ -105,7 +99,7 @@ make</userinput></screen>
user:</para>
<screen role="root"><userinput>make install &amp;&amp;
install -v -m755 -d &gnome-etc-dir;/gconf/gconf.xml.system</userinput></screen>
install -v -m755 -d $GNOME_SYSCONFDIR/gconf/gconf.xml.system</userinput></screen>
<para>Still as the <systemitem class="username">root</systemitem> user,
configure <application>D-Bus</application> so that it can search for
@ -123,8 +117,8 @@ install -v -m755 -d &gnome-etc-dir;/gconf/gconf.xml.system</userinput></screen>
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
&lt;busconfig&gt;
&lt;!-- Search for .conf files in &gnome-etc-dir;/dbus-1/system.d --&gt;
&lt;includedir&gt;&gnome-etc-dir;/dbus-1/system.d&lt;/includedir&gt;
&lt;!-- Search for .conf files in $GNOME_SYSCONFDIR/dbus-1/system.d --&gt;
&lt;includedir&gt;$GNOME_SYSCONFDIR/dbus-1/system.d&lt;/includedir&gt;
&lt;!-- Search for .service files in $GNOME_PREFIX/share/dbus-1/system-services --&gt;
&lt;!-- &lt;servicedir&gt;$GNOME_PREFIX/share/dbus-1/system-services&lt;/servicedir&gt; --&gt;
@ -170,30 +164,30 @@ ln -s -v <envar>$GNOME_PREFIX</envar>/share/polkit-1/actions/org.gnome.gconf.def
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gnome-prefix.xml"/>
<para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
causes the <application>GConf-2</application> configuration database to be
built in <filename class="directory">&gnome-etc-dir;</filename> instead of
<filename class="directory">$GNOME_PREFIX/etc</filename>. This installation
controls all future installations of <application>GConf-2</application>
schemas. If you change the location (which includes eliminating this
parameter), it <emphasis role='strong'>must</emphasis> be consistent for
every subsequent package installation that updates the
<application>GConf-2</application> configuration database.</para>
<para><parameter>--libexecdir=$(pkg-config --variable=prefix
ORBit-2.0)/lib/GConf</parameter>: This parameter causes the libexec files
to be installed in the preferred location of
<filename class="directory">$GNOME_PREFIX/lib/GConf</filename> instead of
<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gnome-mandir.xml"/>
href="../../xincludes/gnome-sysconfdir.xml"/>
<para><parameter>--libexecdir=<envar>$GNOME_PREFIX</envar>/lib/GConf</parameter>:
This parameter causes the libexec files to be installed in the preferred
location of <filename class="directory">$GNOME_PREFIX/lib/GConf</filename>
instead of <filename
class="directory">$GNOME_PREFIX/libexec</filename>.</para>
<para><parameter>--disable-orbit</parameter>: This parameter is required if
<application>ORBit2</application> is not installed.
<application>ORBit2</application> is a deprecated package.</para>
<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gnome-mandir.xml"/>-->
<para><option>--enable-static=no</option>: This switch prevents the static
libraries being installed.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gtk-doc-rebuild.xml"/>
<para><command>install -v -m755 -d
&gnome-etc-dir;/gconf/gconf.xml.system</command>: Creates a missing
$GNOME_SYSCONFDIR/gconf/gconf.xml.system</command>: Creates a missing
directory. Without this directory, <command>gconf-sanity-check-2</command>
will fail during <application>GDM</application> startup and login.</para>
@ -208,13 +202,14 @@ ln -s -v <envar>$GNOME_PREFIX</envar>/share/polkit-1/actions/org.gnome.gconf.def
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>gconf-merge-tree, gconftool-2, gconf-defaults-mechanism,
gconf-sanity-check-2, and gconfd-2</seg>
<seg>libgconf-2.{so,a}, libgconfbackend-xml.{so,a}, and
libgconfbackend-oldxml.{so,a}</seg>
<seg>&gnome-etc-dir;/gconf/{2,gconf.xml.defaults,gconf.xml.mandatory,
gconf.xml.system}, <envar>$GNOME_PREFIX</envar>/{include/gconf/2/gconf,
lib/GConf/2,share/{gtk-doc/html/gconf,sgml/gconf}}</seg>
<seg>gconf-defaults-mechanism, gconf-merge-tree, gconf-sanity-check-2,
gconfd-2, gconftool-2, and gsettings-data-convert</seg>
<seg>libgconf-2.{so,a}, libgconfbackend-oldxml.{so,a},
libgconfbackend-xml.{so,a}, and libgsettingsgconfbackend.{so,a}</seg>
<seg><envar>$GNOME_SYSCONFDIR</envar>/{gconf/{2,gconf.xml.defaults,
gconf.xml.mandatory,gconf.xml.system},xdg/autostart}
<envar>$GNOME_PREFIX</envar>/{include/gconf/2/gconf,lib/GConf/2,
share/{gtk-doc/html/gconf,sgml/gconf}}</seg>
</seglistitem>
</segmentedlist>
@ -244,6 +239,17 @@ ln -s -v <envar>$GNOME_PREFIX</envar>/share/polkit-1/actions/org.gnome.gconf.def
</listitem>
</varlistentry>
<varlistentry id="gsettings-data-convert">
<term><command>gsettings-data-convert</command></term>
<listitem>
<para>reads values out of the users GConf database and stores them in
GSettings.</para>
<indexterm zone="GConf gsettings-data-convert">
<primary sortas="b-gsettings-data-convert">gsettings-data-convert</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libgconf-2">
<term><filename class='libraryfile'>libgconf-2.{so,a}</filename></term>
<listitem>

2
gnome/deprecated/libbonobo.xml
View File

@ -121,7 +121,7 @@ make</userinput></screen>
href="../../xincludes/gnome-mandir.xml"/>
<para><option>--disable-static</option>: This switch prevents the static
libraries from being built.</para>
libraries being installed.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gtk-doc-rebuild.xml"/>

2
gnome/deprecated/libgnome.xml
View File

@ -124,7 +124,7 @@ make</userinput></screen>
<xref linkend="esound"/> is not installed.</para> -->
<para><option>--disable-static</option>: This switch prevents the static
libraries from being built.</para>
libraries being installed.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gtk-doc-rebuild.xml"/>

4
introduction/welcome/changelog.xml
View File

@ -51,8 +51,8 @@
links may be broken in the gnome chapters for the moment.</para>
</listitem>
<listitem>
<para>[ken] - Update to libbonobo-2.32.1, libcanberra-0.28 (from
Wayne), libgnome-2.32.1.</para>
<para>[ken] - Update to libbonobo-2.32.1, libgnome-2.32.1.
Merge libcanberra and GConf-3.2.3 from Wayne.</para>
</listitem>
</itemizedlist>
</listitem>