Author: ken
Date: 2012-02-13 15:30:07 -0700 (Mon, 13 Feb 2012)
New Revision: 9398
Modified:
trunk/BOOK/general.ent
trunk/BOOK/gnome/core/gnome-keyring.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
gnome-keyring-3.2.2
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-02-13 19:17:36 UTC (rev 9397)
+++ trunk/BOOK/general.ent 2012-02-13 22:30:07 UTC (rev 9398)
@@ -701,7 +701,7 @@
<!ENTITY gnome-icon-theme-version "3.2.1.2">
<!ENTITY gnome-icon-theme-extras-version "3.0.0">
<!ENTITY gnome-icon-theme-symbolic-version "3.2.1">
-<!ENTITY gnome-keyring-version "2.30.3">
+<!ENTITY gnome-keyring-version "3.2.2">
<!ENTITY gnome-menus-version "2.30.2">
<!ENTITY gnome-session-version "2.30.2">
<!ENTITY gnome-settings-daemon-version "2.30.2">
Modified: trunk/BOOK/gnome/core/gnome-keyring.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-keyring.xml 2012-02-13 19:17:36 UTC (rev
9397)
+++ trunk/BOOK/gnome/core/gnome-keyring.xml 2012-02-13 22:30:07 UTC (rev
9398)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY gnome-keyring-download-http
"&gnome-download-http;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
- <!ENTITY gnome-keyring-download-ftp
"&gnome-download-ftp;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
- <!ENTITY gnome-keyring-md5sum "54cb1835c02a40f27fda73e58da17cc6">
- <!ENTITY gnome-keyring-size "1.5 MB">
- <!ENTITY gnome-keyring-buildsize "52 MB">
- <!ENTITY gnome-keyring-time "0.6 SBU">
+ <!ENTITY gnome-keyring-download-http
"&gnome-download-http;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+ <!ENTITY gnome-keyring-download-ftp
"&gnome-download-ftp;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+ <!ENTITY gnome-keyring-md5sum "0269f897bf6bc71df8b8cecd5f8e2f6c">
+ <!ENTITY gnome-keyring-size "1.6 MB">
+ <!ENTITY gnome-keyring-buildsize "165 MB">
+ <!ENTITY gnome-keyring-time "1.3 SBU">
]>
<sect1 id="gnome-keyring" xreflabel="gnome-keyring-&gnome-keyring-version;">
@@ -32,7 +32,7 @@
<para>The <application>gnome-keyring</application> package contains a
daemon that keeps passwords and other secrets for users.</para>
- &lfs65_built;
+ &lfs70_built;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -56,14 +56,23 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <itemizedlist spacing='compact'>
+ <listitem>
+ <para>Required Patch: <ulink
+
url="&patch-root;/gnome-keyring-&gnome-keyring-version;-work_without_daemon-1.patch"/></para>
+ </listitem>
+ </itemizedlist>
+
<bridgehead renderas="sect3">gnome-keyring Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required"><xref linkend="dbus"/>,
<xref linkend="gtk2"/>,
<xref linkend="intltool"/>,
- <xref linkend="libgcrypt"/>, and
- <xref linkend="libtasn1"/></para>
+ <xref linkend="libgcrypt"/>,
+ <xref linkend="libtasn1"/>, and
+ <xref linkend="p11-kit"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="gtk-doc"/>,
@@ -84,10 +93,10 @@
<para>Install <application>gnome-keyring</application> by running the
following commands:</para>
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix
ORBit-2.0) \
- --libexecdir=$(pkg-config \
- --variable=prefix ORBit-2.0)/lib/gnome-keyring \
- --sysconfdir=&gnome-etc-dir; \
+<screen><userinput>patch -Np1 -i
../gnome-keyring-&gnome-keyring-version;-work_without_daemon-1.patch &&
+./configure --prefix=$GNOME_PREFIX \
+ --libexecdir=$GNOME_PREFIX/lib/gnome-keyring \
+ --sysconfdir=$GNOME_SYSCONFDIR \
--with-pam-dir=/lib/security \
--with-dbus-services=/usr/share/dbus-1/services \
--with-root-certs=/etc/ssl/certs &&
@@ -104,29 +113,37 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <para><command>patch -Np1 -i ...</command>: The patch allows testsuites
from
+ other packages which invoke <application>gnome-keyring</application>, such
as
+ <application>NetworkManager,</application> to run even if this
package's
+ daemon is not running, for example when you are building a
+ <application>GNOME</application> desktop.</para>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/gnome-prefix.xml"/>
- <para><parameter>--libexecdir=$(pkg-config --variable=prefix
- ORBit-2.0)/lib/gnome-keyring</parameter>: This parameter causes the libexec
- files to be installed in the preferred location of
- <filename class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename>
- instead of
+ <para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-keyring</parameter>:
+ This parameter causes the libexec files to be installed in the preferred
+ location of <filename
+ class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename> instead of
<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+ <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter
+ ensures that the xdg autostart files are installed in a suitable location.
+ </para>
+
<para><parameter>--with-pam-dir=/lib/security</parameter>: This parameter
- specifies where the pam modules will be installed into.</para>
+ specifies where the pam modules will be installed: you can omit this if you
+ have not installed <application>Linux-PAM</application>.</para>
<para><parameter>--with-dbus-services=/usr/share/dbus-1/services</parameter>:
This parameter specifies where the <application>D-BUS</application> session
- services directory is located.</para>
+ services directory is located: you can omit this if your GNOME_PREFIX is
+ <filename class="directory">/usr</filename>.</para>
<para><parameter>--with-root-certs=/etc/ssl/certs</parameter>: This
parameter specifies where the trusted root certificates are located.</para>
- <para><option>--disable-scrollkeeper</option>: Use this parameter if you
- wish to disable the updates to the scrollkeeper database.</para>
-
</sect2>
<sect2 role="content">
@@ -142,7 +159,7 @@
<seg>gck-ssh-store-standalone.so, gck-user-store-standalone.so,
gnome-keyring-pkcs11.so, gck-roots-store-standalone.so,
gck-secret-store-standalone.so, libgcr.so, libgp11.so, and
- pam_gnome_keyring.so</seg>
+ pam_gnome_keyring.so (if Linux-PAM was installed)</seg>
<seg><envar>$GNOME_PREFIX</envar>/{include/{gcr,gp11},
lib/gnome-keyring/{devel,standalone},share/{gcr/ui,
gnome-keyring/{introspect,ui},gtk-doc/html/{gcr,gp11}}}</seg>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-02-13 19:17:36 UTC
(rev 9397)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-02-13 22:30:07 UTC
(rev 9398)
@@ -59,6 +59,9 @@
<listitem>
<para>[ken] - add gnome-js-common from Wayne, but updated to
0.1.2.</para>
</listitem>
+ <listitem>
+ <para>[ken] - merge gnome-keyring-3.2.2 from Wayne.</para>
+ </listitem>
</itemizedlist>
</listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
