r5260 - in trunk: BOOK BOOK/general/genlib BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Nov 4 11:19:43 PST 2005


Author: randy
Date: 2005-11-04 12:19:42 -0700 (Fri, 04 Nov 2005)
New Revision: 5260

Added:
   trunk/patches/libgsf-1.12.3-gconf_discovery_fix-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/libgsf.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added a patch to the libgsf instructions so that the configure script properly discovers GConf

Modified: trunk/BOOK/general/genlib/libgsf.xml
===================================================================
--- trunk/BOOK/general/genlib/libgsf.xml	2005-11-04 05:03:03 UTC (rev 5259)
+++ trunk/BOOK/general/genlib/libgsf.xml	2005-11-04 19:19:42 UTC (rev 5260)
@@ -56,6 +56,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem> 
+        <para>Required patch: <ulink
+        url="&patch-root;/libgsf-&libgsf-version;-gconf_discovery_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Libgsf Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -75,7 +83,8 @@
     <para>Install <application>libgsf</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>patch -Np1 -i ../libgsf-&libgsf-version;-gconf_discovery_fix-1.patch &&
+./configure --prefix=/usr &&
 make</userinput></screen>
 
     <para>Running <command>make check</command> will build a battery of test

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-11-04 05:03:03 UTC (rev 5259)
+++ trunk/BOOK/general.ent	2005-11-04 19:19:42 UTC (rev 5260)
@@ -1,8 +1,8 @@
-<!ENTITY day          "03">
+<!ENTITY day          "04">
 <!ENTITY month        "11">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "November &day;rd, &year;">
+<!ENTITY releasedate  "November &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|stable|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-11-04 05:03:03 UTC (rev 5259)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-11-04 19:19:42 UTC (rev 5260)
@@ -42,6 +42,16 @@
 -->
 
     <listitem>
+      <para>November 4th, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Added a patch to the libgsf instructions so that the
+          configure script properly discovers GConf.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 3rd, 2005</para>
       <itemizedlist>
         <listitem>

Added: trunk/patches/libgsf-1.12.3-gconf_discovery_fix-1.patch
===================================================================
--- trunk/patches/libgsf-1.12.3-gconf_discovery_fix-1.patch	2005-11-04 05:03:03 UTC (rev 5259)
+++ trunk/patches/libgsf-1.12.3-gconf_discovery_fix-1.patch	2005-11-04 19:19:42 UTC (rev 5260)
@@ -0,0 +1,31 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-11-04
+Initial Package Version: 1.12.3
+Upstream Status:         Already fixed
+Origin:                  Randy McMurchy
+Description:             Fixes the configure script so that GConf is correctly
+                         identified as an optional dependency *only* if it exists
+
+$LastChangedBy$
+$Date$
+
+
+--- libgsf-1.12.3-orig/configure	2005-09-06 01:56:18.000000000 +0000
++++ libgsf-1.12.3/configure	2005-11-04 17:59:53.000000000 +0000
+@@ -24130,7 +24130,7 @@
+ if test "x$GCONFTOOL" = "xno"; then
+     { echo "$as_me:$LINENO: WARNING: thumbnailer will not be built, unable to find gconftool-2" >&5
+ echo "$as_me: WARNING: thumbnailer will not be built, unable to find gconftool-2" >&2;}
+-else
++fi
+ 
+   if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+     GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+@@ -24188,7 +24188,6 @@
+ fi
+ 
+ 
+-fi
+ 
+ 
+ if test "x$GCONFTOOL" != "xno"; then


Property changes on: trunk/patches/libgsf-1.12.3-gconf_discovery_fix-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list