r3014 - in trunk: BOOK/gnome/core BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Nov 22 23:21:05 PST 2004


Author: randy
Date: 2004-11-23 00:21:03 -0700 (Tue, 23 Nov 2004)
New Revision: 3014

Added:
   trunk/patches/nautilus-2.8.2-libexif_fix-1.patch
Modified:
   trunk/BOOK/gnome/core/config.xml
   trunk/BOOK/gnome/core/nautilus.xml
   trunk/BOOK/gnome/core/pre-install-config.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to Nautilus-2.8.2

Modified: trunk/BOOK/gnome/core/config.xml
===================================================================
--- trunk/BOOK/gnome/core/config.xml	2004-11-23 06:32:58 UTC (rev 3013)
+++ trunk/BOOK/gnome/core/config.xml	2004-11-23 07:21:03 UTC (rev 3014)
@@ -14,10 +14,13 @@
 <title>Configuring the core GNOME packages</title>
 
 
-<para>Create an <filename>.xinitrc</filename> file to start
+<para>Create (or append to) an <filename>.xinitrc</filename> file to start 
 <application><acronym>GNOME</acronym></application>:</para>
+
 <screen><userinput><command>echo "exec gnome-session" >> ~/.xinitrc</command></userinput></screen>
-<para>and ensure all libraries can be found with:</para>
+
+<para>Ensure all libraries can be found with:</para>
+
 <screen><userinput><command>ldconfig</command></userinput></screen>
 
 <para>At this point you can bring up

Modified: trunk/BOOK/gnome/core/nautilus.xml
===================================================================
--- trunk/BOOK/gnome/core/nautilus.xml	2004-11-23 06:32:58 UTC (rev 3013)
+++ trunk/BOOK/gnome/core/nautilus.xml	2004-11-23 07:21:03 UTC (rev 3014)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY nautilus-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-&nautilus-version;.tar.bz2">
-<!ENTITY nautilus-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-&nautilus-version;.tar.bz2">
-<!ENTITY nautilus-size "5.4 MB">
-<!ENTITY nautilus-buildsize "129.0 MB">
-<!ENTITY nautilus-time "1.33 SBU">
-
+<!ENTITY nautilus-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
+<!ENTITY nautilus-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
+<!ENTITY nautilus-md5sum "d5fdec9acc37181016e8424e96d663b8">
+<!ENTITY nautilus-size "5.8 MB">
+<!ENTITY nautilus-buildsize "87 MB">
+<!ENTITY nautilus-time "1.37 SBU">
 ]>
 
 <sect1 id="nautilus" xreflabel="Nautilus-&nautilus-version;">
@@ -33,32 +33,39 @@
 url="&nautilus-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&nautilus-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &nautilus-md5sum;</para></listitem>
 <listitem><para>Download size: &nautilus-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &nautilus-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &nautilus-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch (if 
+<application>libexif</application> >= 0.6.9 is installed): <ulink 
+url="&patch-root;/nautilus-&nautilus-version;-libexif_fix-1.patch"/></para>
+</listitem></itemizedlist>
+</sect3>
+
 <sect3><title><application>Nautilus</application> dependencies</title>
 <sect4><title>Required</title>
-<para>
-<xref linkend="eel"/>,
-<xref linkend="librsvg"/> and
-<xref linkend="gnome-desktop"/>
-</para></sect4>
+<para><xref linkend="eel"/>, 
+<xref linkend="librsvg"/> and 
+<xref linkend="gnome-desktop"/></para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para>
-<xref linkend="startup-notification"/>,
-<xref linkend="esound"/>,
-<xref linkend="libgsf"/>,
-<xref linkend="libcroco"/>,
-<xref linkend="CDParanoia"/>,
-<xref linkend="libjpeg"/>,
-<xref linkend="docbook-utils"/>,
-<ulink url="http://sourceforge.net/projects/libexif">libexif</ulink> and 
-<ulink url="http://ftp.gnome.org/pub/GNOME/sources/medusa/0.5/">medusa</ulink>
-</para></sect4>
+<para><xref linkend="startup-notification"/>, 
+<xref linkend="libgsf"/>, 
+<xref linkend="libcroco"/>, 
+<xref linkend="CDParanoia"/>, 
+<xref linkend="libjpeg"/>, 
+<xref linkend="docbook-utils"/>, 
+<ulink url="http://ftp.gnome.org/pub/GNOME/sources/medusa/0.5/">medusa</ulink> 
+and <ulink url="http://sourceforge.net/projects/libexif">libexif</ulink></para>
+</sect4>
 </sect3>
 
 </sect2>
@@ -69,7 +76,8 @@
 <para>Install <application>Nautilus</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput><command>patch -Np1 -i ../nautilus-&nautilus-version;-libexif_fix-1.patch &&
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
     --sysconfdir=/etc/gnome && 
 make &&
@@ -95,8 +103,13 @@
 <title>Contents</title>
 
 <para>The <application>Nautilus</application> package contains 
-<command>nautilus</command> and
-<filename class="libraryfile">libnautilus</filename> libraries.</para>
+<command>nautilus</command>, 
+<command>nautilus-adapter</command>, 
+<command>nautilus-file-management-properties</command>, 
+<command>nautilus-text-view</command>, 
+<command>nautilus-throbber</command>, 
+<filename class="libraryfile">libnautilus</filename> libraries and 
+Bonobo modules.</para>
 
 </sect2>
 
@@ -104,7 +117,8 @@
 
 <sect3><title>nautilus</title>
 <para><application>nautilus</application> is the
-<application><acronym>GNOME</acronym></application> file manager.</para></sect3>
+<application><acronym>GNOME</acronym></application> file manager.</para>
+</sect3>
 
 <sect3><title>nautilus libraries</title>
 <para><filename class="libraryfile">libnautilus</filename> libraries supply 

Modified: trunk/BOOK/gnome/core/pre-install-config.xml
===================================================================
--- trunk/BOOK/gnome/core/pre-install-config.xml	2004-11-23 06:32:58 UTC (rev 3013)
+++ trunk/BOOK/gnome/core/pre-install-config.xml	2004-11-23 07:21:03 UTC (rev 3014)
@@ -13,10 +13,16 @@
 <?dbhtml filename="pre-install-config.html"?>
 <title>Pre-installation configuration</title>
 
-<para>Set an environment variable to resolve the prefix destination.</para>  
-<para>If <application><acronym>GNOME</acronym></application> is your desktop of choice:</para>
+<para>Set an environment variable to resolve the prefix destination.</para>
+
+<para>If <application><acronym>GNOME</acronym></application> is your desktop 
+of choice:</para>
+
 <screen><userinput><command>export GNOME_PREFIX=/usr</command></userinput></screen>
-<para>If you want to try-out <application><acronym>GNOME</acronym></application>:</para>
+
+<para>If you want to try-out 
+<application><acronym>GNOME</acronym></application>:</para>
+
 <screen><userinput><command>export GNOME_PREFIX=/opt/gnome-&gnome-version;</command></userinput></screen>
 
 <para>Remember to execute <command>ldconfig</command> after installation of libraries to
@@ -29,7 +35,7 @@
 
 <screen><userinput><command>export PATH=$PATH:/opt/gnome-&gnome-version;/bin
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;/lib/pkgconfig
-export GNOME_LIBCONFIG_PATH=/usr/lib</command></userinput></screen>
+export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;/lib</command></userinput></screen>
 
 <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-11-23 06:32:58 UTC (rev 3013)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-11-23 07:21:03 UTC (rev 3014)
@@ -32,7 +32,7 @@
 GNOME-Icon-Theme-2.8.0, gnome-keyring-0.4.0, libgnomeui-2.8.0, 
 GNOME-Themes-2.8.1, GNOME-Desktop-2.8.1, libwnck-2.8.1, GNOME-Panel-2.8.1, 
 GNOME-Session-2.8.1, GNOME-Terminal-2.8.0, libgtop-2.8.1, GAIL-1.8.0, 
-GNOME-Applets-2.8.1 and EEL-2.8.2.</para></listitem>
+GNOME-Applets-2.8.1, EEL-2.8.2 and Nautilus-2.8.2.</para></listitem>
 
 <listitem><para>November 21st, 2004 [igor]: Applied a bunch of fixes to
 XScreenSaver, contributed by Randy.</para></listitem>

Added: trunk/patches/nautilus-2.8.2-libexif_fix-1.patch
===================================================================
--- trunk/patches/nautilus-2.8.2-libexif_fix-1.patch	2004-11-23 06:32:58 UTC (rev 3013)
+++ trunk/patches/nautilus-2.8.2-libexif_fix-1.patch	2004-11-23 07:21:03 UTC (rev 3014)
@@ -0,0 +1,31 @@
+Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
+Date:                    2004-11-19
+Initial Package Version: 2.8.2
+Upstream Status:         Not submitted
+Origin:                  PLD site; sent to LFS-Dev by John Lawrence Young
+             See: http://archives.linuxfromscratch.org/mail-archives/blfs-dev/2004-August/007318.html
+Description:             Fixes build problem due to API change in libexif >= 0.6.9
+
+$LastChangedBy$
+$Date$
+
+diff -Naur nautilus-2.8.2-orig/components/image_properties/nautilus-image-properties-view.c 
+           nautilus-2.8.2/components/image_properties/nautilus-image-properties-view.c
+--- nautilus-2.8.2-orig/components/image_properties/nautilus-image-properties-view.c	2004-03-09 11:23:37.000000000 +0000
++++ nautilus-2.8.2/components/image_properties/nautilus-image-properties-view.c	2004-11-19 23:12:05.726408904 +0000
+@@ -125,12 +125,14 @@
+ {
+ 	struct ExifAttribute *attribute;
+ 
++	char buf[1024];
++
+ 	attribute = (struct ExifAttribute *)data;
+ 	if (attribute->found) {
+ 		return;
+ 	}
+ 
+-        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag));
++        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, buf, sizeof(buf)));
+ 	if (attribute->value != NULL) {
+ 		attribute->found = TRUE;
+ 	}


Property changes on: trunk/patches/nautilus-2.8.2-libexif_fix-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list