From 1c96292392694fd2dfb59253c1bc69b37aa8e8af Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Sat, 31 Oct 2009 09:55:29 +0000
Subject: [PATCH] Updated to Xorg-7.5

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8110 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        | 17 +++++++++--------
 introduction/welcome/changelog.xml |  3 +++
 x/installing/libXau.xml            |  6 +++---
 x/installing/libXdmcp.xml          |  4 ++--
 x/installing/luit.xml              |  6 +++---
 x/installing/x7app.xml             |  8 ++++----
 x/installing/x7driver.xml          |  8 ++++----
 x/installing/x7font.xml            |  8 ++++----
 x/installing/x7lib.xml             |  8 ++++----
 x/installing/x7proto.xml           |  8 ++++----
 x/installing/x7server.xml          |  8 ++++----
 x/installing/x7util.xml            |  8 ++++----
 x/installing/xbitmaps.xml          |  6 +++---
 x/installing/xcursorthemes.xml     |  6 +++---
 x/installing/xkeyboard-config.xml  |  6 +++---
 x/installing/xorg7.xml             | 10 +++++-----
 x/lib/xulrunner.xml                |  3 ++-
 17 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/general.ent b/general.ent
index 5d75fbe6dd..abd66f6fc3 100644
--- a/general.ent
+++ b/general.ent
@@ -459,14 +459,15 @@ $Date$
 <!-- Part VII -->
 <!-- Chapter 25 -->
 <!ENTITY xfree86-version              "4.6.0">
-<!ENTITY xorg7-version                "7.4">
-<!ENTITY libXau-version               "1.0.4">
-<!ENTITY libXdmcp-version             "1.0.2">
-<!ENTITY luit-version                 "1.0.3">
-<!ENTITY xcursor-themes-version       "1.0.1">
-<!ENTITY xkeyboard-config-version     "1.4">
-<!ENTITY xbitmaps-version             "1.0.1">
-<!ENTITY xorg-server-version          "1.6.3">
+<!ENTITY xorg7-version                "7.5">
+<!ENTITY xorg7-release                "7.5-1">
+<!ENTITY libXau-version               "1.0.5">
+<!ENTITY libXdmcp-version             "1.0.3">
+<!ENTITY luit-version                 "1.0.4">
+<!ENTITY xcursor-themes-version       "1.0.2">
+<!ENTITY xkeyboard-config-version     "1.7"> 
+<!ENTITY xbitmaps-version             "1.1.0">
+<!ENTITY xorg-server-version          "1.7.1">
 
 <!-- Obsolete
 <!ENTITY xorg-version                 "6.9.0">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 585b62dbc4..6a770901b0 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,9 @@
     <listitem>
       <para>October 31st, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to Xorg-7.5.</para>
+        </listitem>
         <listitem>
           <para>[wblaszcz] - Added new package. polkit-gnome-0.94.</para>
         </listitem>
diff --git a/x/installing/libXau.xml b/x/installing/libXau.xml
index d8a7dc257d..cd914a3a96 100644
--- a/x/installing/libXau.xml
+++ b/x/installing/libXau.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libXau-download-http "http://xorg.freedesktop.org/releases/individual/lib/libXau-&libXau-version;.tar.bz2">
   <!ENTITY libXau-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libXau-&libXau-version;.tar.bz2">
-  <!ENTITY libXau-md5sum        "0f2b88d857e0a3f5898e4759c541af46">
-  <!ENTITY libXau-size          "228 KB">
-  <!ENTITY libXau-buildsize     "2.2 MB">
+  <!ENTITY libXau-md5sum        "993b3185c629e4b89401fca072dcb663">
+  <!ENTITY libXau-size          "252 KB">
+  <!ENTITY libXau-buildsize     "1.9 MB">
   <!ENTITY libXau-time          "less than 0.1 SBU">
 ]>
 
diff --git a/x/installing/libXdmcp.xml b/x/installing/libXdmcp.xml
index 6b8a8f21c2..b4be348bcc 100644
--- a/x/installing/libXdmcp.xml
+++ b/x/installing/libXdmcp.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY libXdmcp-download-http "http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-&libXdmcp-version;.tar.bz2">
   <!ENTITY libXdmcp-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libXdmcp-&libXdmcp-version;.tar.bz2">
-  <!ENTITY libXdmcp-md5sum        "10facf2bc7cbd5e5c1a698b8a210a582">
-  <!ENTITY libXdmcp-size          "216 KB">
+  <!ENTITY libXdmcp-md5sum        "d60941d471800f41a3f19b24bea855a7">
+  <!ENTITY libXdmcp-size          "256 KB">
   <!ENTITY libXdmcp-buildsize     "2.5 MB">
   <!ENTITY libXdmcp-time          "0.1 SBU">
 ]>
diff --git a/x/installing/luit.xml b/x/installing/luit.xml
index 0aafda635b..a49c8706ab 100644
--- a/x/installing/luit.xml
+++ b/x/installing/luit.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY luit-download-http "http://xorg.freedesktop.org/releases/individual/app/luit-&luit-version;.tar.bz2">
   <!ENTITY luit-download-ftp  "ftp://ftp.x.org/pub/individual/app/luit-&luit-version;.tar.bz2">
-  <!ENTITY luit-md5sum        "b01e4f71c20fc1c79ed727759c1df40c">
-  <!ENTITY luit-size          "108 KB">
-  <!ENTITY luit-buildsize     "1 MB">
+  <!ENTITY luit-md5sum        "4e45233e310d72dce307709761cf241b">
+  <!ENTITY luit-size          "120 KB">
+  <!ENTITY luit-buildsize     "958 KB">
   <!ENTITY luit-time          "0.1 SBU">
 
 ]>
diff --git a/x/installing/x7app.xml b/x/installing/x7app.xml
index 83d0a3ec46..92ea2b24bb 100644
--- a/x/installing/x7app.xml
+++ b/x/installing/x7app.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
   <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
-  <!ENTITY x7apps-wget          "&files-anduin;/xorg/app-&xorg7-version;.wget">
-  <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/app-&xorg7-version;.md5">
+  <!ENTITY x7apps-wget          "&files-anduin;/xorg/app-&xorg7-release;.wget">
+  <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/app-&xorg7-release;.md5">
   <!ENTITY x7apps-size          "9.0 MB">
   <!ENTITY x7apps-buildsize     "30.7 MB">
   <!ENTITY x7apps-time          "2.9 SBU">
@@ -90,9 +90,9 @@
 
 <screen><userinput>mkdir app &amp;&amp;
 cd app &amp;&amp;
-grep -v '^#' ../app-&xorg7-version;.wget | wget -i- -c \
+grep -v '^#' ../app-&xorg7-release;.wget | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/app/ &amp;&amp;
-md5sum -c ../app-&xorg7-version;.md5</userinput></screen>
+md5sum -c ../app-&xorg7-release;.md5</userinput></screen>
 
   </sect2>
 
diff --git a/x/installing/x7driver.xml b/x/installing/x7driver.xml
index 507d94b641..3e77011aa1 100644
--- a/x/installing/x7driver.xml
+++ b/x/installing/x7driver.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY x7drivers-download-http "http://xorg.freedesktop.org/releases/individual/driver/">
   <!ENTITY x7drivers-download-ftp  "ftp://ftp.x.org/pub/individual/driver/">
-  <!ENTITY x7drivers-wget          "&files-anduin;/xorg/driver-&xorg7-version;.wget">
-  <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/driver-&xorg7-version;.md5">
+  <!ENTITY x7drivers-wget          "&files-anduin;/xorg/driver-&xorg7-release;.wget">
+  <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/driver-&xorg7-release;.md5">
   <!ENTITY x7drivers-size          "16.7 MB">
   <!ENTITY x7drivers-buildsize     "60.3 MB">
   <!ENTITY x7drivers-time          "6.9 SBU">
@@ -84,9 +84,9 @@
 
 <screen><userinput>mkdir driver &amp;&amp;
 cd driver &amp;&amp;
-grep -v '^#' ../driver-&xorg7-version;.wget | wget -i- -c \
+grep -v '^#' ../driver-&xorg7-release;.wget | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/driver/ &amp;&amp;
-md5sum -c ../driver-&xorg7-version;.md5</userinput></screen>
+md5sum -c ../driver-&xorg7-release;.md5</userinput></screen>
 
   </sect2>
 
diff --git a/x/installing/x7font.xml b/x/installing/x7font.xml
index 8e5aa3ab38..94a9836121 100644
--- a/x/installing/x7font.xml
+++ b/x/installing/x7font.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY x7fonts-download-http "http://xorg.freedesktop.org/releases/individual/font/">
   <!ENTITY x7fonts-download-ftp  "ftp://ftp.x.org/pub/individual/font/">
-  <!ENTITY x7fonts-wget          "&files-anduin;/xorg/font-&xorg7-version;.wget">
-  <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/font-&xorg7-version;.md5">
+  <!ENTITY x7fonts-wget          "&files-anduin;/xorg/font-&xorg7-release;.wget">
+  <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/font-&xorg7-release;.md5">
   <!ENTITY x7fonts-size          "13.0 MB">
   <!ENTITY x7fonts-buildsize     "100 MB">
   <!ENTITY x7fonts-time          "2.0 SBU">
@@ -79,9 +79,9 @@
 
 <screen><userinput>mkdir font &amp;&amp;
 cd font &amp;&amp;
-grep -v '^#' ../font-&xorg7-version;.wget | wget -i- -c \
+grep -v '^#' ../font-&xorg7-release;.wget | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/font/ &amp;&amp;
-md5sum -c ../font-&xorg7-version;.md5</userinput></screen>
+md5sum -c ../font-&xorg7-release;.md5</userinput></screen>
 
   </sect2>
 
diff --git a/x/installing/x7lib.xml b/x/installing/x7lib.xml
index aba537ec30..17495c56ad 100644
--- a/x/installing/x7lib.xml
+++ b/x/installing/x7lib.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY x7libs-download-http "http://xorg.freedesktop.org/releases/individual/lib/">
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
-  <!ENTITY x7libs-wget          "&files-anduin;/xorg/lib-&xorg7-version;.wget">
-  <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/lib-&xorg7-version;.md5">
+  <!ENTITY x7libs-wget          "&files-anduin;/xorg/lib-&xorg7-release;.wget">
+  <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/lib-&xorg7-release;.md5">
   <!ENTITY x7libs-size          "11.4 MB">
   <!ENTITY x7libs-buildsize     "186 MB">
   <!ENTITY x7libs-time          "6.6 SBU">
@@ -93,9 +93,9 @@
 
 <screen><userinput>mkdir lib &amp;&amp;
 cd lib &amp;&amp;
-grep -v '^#' ../lib-&xorg7-version;.wget | wget -i- -c \
+grep -v '^#' ../lib-&xorg7-release;.wget | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/lib/ &amp;&amp;
-md5sum -c ../lib-&xorg7-version;.md5</userinput></screen>
+md5sum -c ../lib-&xorg7-release;.md5</userinput></screen>
 
   </sect2>
 
diff --git a/x/installing/x7proto.xml b/x/installing/x7proto.xml
index 889c318e31..592536642f 100644
--- a/x/installing/x7proto.xml
+++ b/x/installing/x7proto.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY x7proto-download-http "http://xorg.freedesktop.org/releases/individual/proto/">
   <!ENTITY x7proto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/">
-  <!ENTITY x7proto-wget          "&files-anduin;/xorg/proto-&xorg7-version;.wget">
-  <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/proto-&xorg7-version;.md5">
+  <!ENTITY x7proto-wget          "&files-anduin;/xorg/proto-&xorg7-release;.wget">
+  <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/proto-&xorg7-release;.md5">
   <!ENTITY x7proto-size          "1.4 MB">
 <!-- Editors note:  Because we recommend a scripted build that removes
      the source directories after installation, the xorg buildsizes are
@@ -82,9 +82,9 @@
 
 <screen><userinput>mkdir proto &amp;&amp;
 cd proto &amp;&amp;
-grep -v '^#' ../proto-&xorg7-version;.wget | wget -i- -c \
+grep -v '^#' ../proto-&xorg7-release;.wget | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/proto/ &amp;&amp;
-md5sum -c ../proto-&xorg7-version;.md5</userinput></screen>
+md5sum -c ../proto-&xorg7-release;.md5</userinput></screen>
 
   </sect2>
 
diff --git a/x/installing/x7server.xml b/x/installing/x7server.xml
index e287f5fe59..b145e6fca3 100644
--- a/x/installing/x7server.xml
+++ b/x/installing/x7server.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "ftp://ftp.x.org/pub/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "0af168abeefa6579cab20387f75c0c7a">
-  <!ENTITY xorg-server-size          "4.5 MB">
-  <!ENTITY xorg-server-buildsize     "164 MB">
-  <!ENTITY xorg-server-time          "1.6 SBU">
+  <!ENTITY xorg-server-md5sum        "dda7842467cda6018fdc87e6002e4db1">
+  <!ENTITY xorg-server-size          "4.7 MB">
+  <!ENTITY xorg-server-buildsize     "199 MB">
+  <!ENTITY xorg-server-time          "2.0 SBU">
 
 ]>
 
diff --git a/x/installing/x7util.xml b/x/installing/x7util.xml
index 5b81b6a887..59de28dc84 100644
--- a/x/installing/x7util.xml
+++ b/x/installing/x7util.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY x7utils-download-http "http://xorg.freedesktop.org/releases/individual/util/">
   <!ENTITY x7utils-download-ftp  "ftp://ftp.x.org/pub/individual/util/">
-  <!ENTITY x7utils-wget          "&files-anduin;/xorg/util-&xorg7-version;.wget">
-  <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/util-&xorg7-version;.md5">
+  <!ENTITY x7utils-wget          "&files-anduin;/xorg/util-&xorg7-release;.wget">
+  <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/util-&xorg7-release;.md5">
   <!ENTITY x7utils-size          "664 KB">
   <!ENTITY x7utils-buildsize     "5.2 MB">
   <!ENTITY x7utils-time          "0.1 SBU">
@@ -84,9 +84,9 @@
 
 <screen><userinput>mkdir util &amp;&amp;
 cd util &amp;&amp;
-grep -v '^#' ../util-&xorg7-version;.wget | wget -i- -c \
+grep -v '^#' ../util-&xorg7-release;.wget | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/util/ &amp;&amp;
-md5sum -c ../util-&xorg7-version;.md5</userinput></screen>
+md5sum -c ../util-&xorg7-release;.md5</userinput></screen>
 
   </sect2>
 
diff --git a/x/installing/xbitmaps.xml b/x/installing/xbitmaps.xml
index 8782be4555..ac78485803 100644
--- a/x/installing/xbitmaps.xml
+++ b/x/installing/xbitmaps.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY xbitmaps-download-http "http://xorg.freedesktop.org/releases/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
   <!ENTITY xbitmaps-download-ftp  "ftp://ftp.x.org/pub/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
-  <!ENTITY xbitmaps-md5sum        "b28a9840cde3c38d7c09716372fea257">
-  <!ENTITY xbitmaps-size          "54 KB">
-  <!ENTITY xbitmaps-buildsize     "1.7 MB">
+  <!ENTITY xbitmaps-md5sum        "f9ddd4e70a5375508b3acaf17be0d0ab">
+  <!ENTITY xbitmaps-size          "104 KB">
+  <!ENTITY xbitmaps-buildsize     "792 KB">
   <!ENTITY xbitmaps-time          "less than 0.1 SBU">
 
 ]>
diff --git a/x/installing/xcursorthemes.xml b/x/installing/xcursorthemes.xml
index 8eee96ac0f..a873c348de 100644
--- a/x/installing/xcursorthemes.xml
+++ b/x/installing/xcursorthemes.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY xcursor-themes-download-http "http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-&xcursor-themes-version;.tar.bz2">
   <!ENTITY xcursor-themes-download-ftp  "ftp://ftp.x.org/pub/individual/lib/xcursor-themes-&xcursor-themes-version;.tar.bz2">
-  <!ENTITY xcursor-themes-md5sum        "014bad415e64c49994679cdb71a97e37">
-  <!ENTITY xcursor-themes-size          "2.1 MB">
-  <!ENTITY xcursor-themes-buildsize     "19.5 MB">
+  <!ENTITY xcursor-themes-md5sum        "e8929a1bb4d98d1a3991fd340d0b5f09">
+  <!ENTITY xcursor-themes-size          "2.2 MB">
+  <!ENTITY xcursor-themes-buildsize     "9.2 MB">
   <!ENTITY xcursor-themes-time          "0.1 SBU">
 ]>
 
diff --git a/x/installing/xkeyboard-config.xml b/x/installing/xkeyboard-config.xml
index 74aa6598b2..99535719bf 100644
--- a/x/installing/xkeyboard-config.xml
+++ b/x/installing/xkeyboard-config.xml
@@ -9,9 +9,9 @@
   <!ENTITY xkeyboard-config-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   -->
   <!ENTITY xkeyboard-config-download-ftp  " ">
-  <!ENTITY xkeyboard-config-md5sum        "a9fe7efbc67a6966c4d4501f0cf88073">
-  <!ENTITY xkeyboard-config-size          "552 KB">
-  <!ENTITY xkeyboard-config-buildsize     "10.2 MB">
+  <!ENTITY xkeyboard-config-md5sum        "d351c0109fac166edcedad32d1b0e38e">
+  <!ENTITY xkeyboard-config-size          "624 KB">
+  <!ENTITY xkeyboard-config-buildsize     "9.5 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>
 
diff --git a/x/installing/xorg7.xml b/x/installing/xorg7.xml
index fdca36b108..1b333d3588 100644
--- a/x/installing/xorg7.xml
+++ b/x/installing/xorg7.xml
@@ -74,14 +74,14 @@
 
   <para>Additionally, because of the large number of repetitive commands,
   you are encouraged to partially automate the build.  The commands below
-  (or similar) can be entered at the command line to compile each group of
-  packages (proto, utils, libs, apps, drivers).  The wiki links on each
-  group's page contain specific commands to compile the entire group of
+  (or similar) can be entered at the command line to compile each
+  section (proto, util, lib, app, driver).  The wiki links on each
+  section's page contain specific commands to compile the entire group of
   packages, based on the content of the wget files.</para>
 
 <screen>bash -e #exit on all errors
-section=proto
-version=&xorg7-version;
+section=<replaceable>&lt;proto&gt;</replaceable>
+version=&xorg7-release;
 mkdir $section
 cd $section
 
diff --git a/x/lib/xulrunner.xml b/x/lib/xulrunner.xml
index d4b574bd3b..3a36f7cde7 100644
--- a/x/lib/xulrunner.xml
+++ b/x/lib/xulrunner.xml
@@ -294,7 +294,8 @@ make -f client.mk build</userinput></screen>
 <screen role="root"><userinput>make -f client.mk install &amp;&amp;
 mkdir /usr/lib/mozilla &amp;&amp;
 ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \
-    /usr/lib/mozilla/plugins</userinput></screen>
+    /usr/lib/mozilla/plugins &amp;&amp;
+sudo chown -R root:root /usr/lib/xulrunner-* /usr/bin/xulrunner</userinput></screen>
 
     <para>If you've elected to use the included NSPR and NSS, while still the 
     <systemitem class="username">root</systemitem> user, complete the