From 1b46c87851a4beb944b07680d0cb9930a8daa228 Mon Sep 17 00:00:00 2001
From: Wayne Blaszczyk <wblaszcz@linuxfromscratch.org>
Date: Sun, 6 Sep 2009 14:06:17 +0000
Subject: [PATCH] Patched GConf-2.26.2 and GDM-2.26.1 to fix a hardcoded
 sysconfdir problem.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8009 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 gnome/add/gdm.xml                  |  5 +++++
 gnome/core/gconf.xml               | 14 ++++++++++++--
 introduction/welcome/changelog.xml |  4 ++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/gnome/add/gdm.xml b/gnome/add/gdm.xml
index 84f702b9ff..6ed64e4b6f 100644
--- a/gnome/add/gdm.xml
+++ b/gnome/add/gdm.xml
@@ -63,6 +63,10 @@
         <para>Required patch: <ulink
         url="&patch-root;/gdm-&gdm-version;-libxklavier-&libxklavier-version;-1.patch"/></para>
       </listitem>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/gdm-&gdm-version;-sysconfdir-1.patch"/></para>
+      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">GDM Dependencies</bridgehead>
@@ -100,6 +104,7 @@ useradd -c "GDM Daemon Owner" -d /var/lib/gdm \
     the following commands as an unprivileged user:</para>
 
 <screen><userinput>patch -Np1 -i ../gdm-&gdm-version;-libxklavier-&libxklavier-version;-1.patch &amp;&amp;
+patch -Np1 -i ../gdm-&gdm-version;-sysconfdir-1.patch &amp;&amp;
 ./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var \
diff --git a/gnome/core/gconf.xml b/gnome/core/gconf.xml
index 622baff2ab..cf05a5146d 100644
--- a/gnome/core/gconf.xml
+++ b/gnome/core/gconf.xml
@@ -54,6 +54,14 @@
       </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>
@@ -84,7 +92,8 @@
     <para>Install <application>GConf</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+<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 \
@@ -97,7 +106,8 @@ make</userinput></screen>
     <para>Now, as the <systemitem class="username">root</systemitem>
     user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d &gnome-etc-dir;/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
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e11285debd..755761b095 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,10 @@
         <listitem>
           <para>[dj] - Updated to Xulrunner-1.9.1.2 and Firefox-3.5.2.</para>
         </listitem>
+        <listitem>
+          <para>[wblaszcz] - Patched GConf-2.26.2 and GDM-2.26.1 to fix a
+          hardcoded sysconfdir problem.</para>
+        </listitem>
       </itemizedlist>
     </listitem>