On Sun, Jul 08, 2007 at 05:12:02PM -0700, Dan Nicholson wrote: > > Next is XCB. I'll be adding the distro patch which supplies an > environment variable to workaround locking errors in applications. > Holler if you don't want this approach. Alexander describes it here: > > http://linuxfromscratch.org/pipermail/blfs-dev/2007-July/017331.html
OK, below is what I will push in tomorrow if no one complains. The libxcb patch is here: http://www.linuxfromscratch.org/patches/downloads/libxcb/libxcb-1.0-sloppy_lock-1.patch -- Dan --- BOOK/general.ent | 5 + BOOK/general/genlib/genlib.xml | 1 + BOOK/general/genlib/libpthread-stubs.xml | 99 +++++++++++++++++++ BOOK/introduction/welcome/changelog.xml | 5 + BOOK/x/installing/installing.xml | 4 + BOOK/x/installing/libXau.xml | 119 +++++++++++++++++++++++ BOOK/x/installing/libXdmcp.xml | 119 +++++++++++++++++++++++ BOOK/x/installing/libxcb.xml | 152 ++++++++++++++++++++++++++++++ BOOK/x/installing/x7lib.xml | 40 ++------ BOOK/x/installing/xcb-proto.xml | 105 ++++++++++++++++++++ BOOK/x/lib/cairo.xml | 3 +- auxfiles/xorg/lib-7.2.wget | 2 - auxfiles/xorg/md5sums-7.2 | 2 - 13 files changed, 621 insertions(+), 35 deletions(-) create mode 100644 BOOK/general/genlib/libpthread-stubs.xml create mode 100644 BOOK/x/installing/libXau.xml create mode 100644 BOOK/x/installing/libXdmcp.xml create mode 100644 BOOK/x/installing/libxcb.xml create mode 100644 BOOK/x/installing/xcb-proto.xml diff --git a/BOOK/general.ent b/BOOK/general.ent index ae9d279..ac70870 100644 --- a/BOOK/general.ent +++ b/BOOK/general.ent @@ -126,6 +126,7 @@ $Date$ <!ENTITY iso-codes-version "0.58-1"> <!ENTITY gmime-version "2.2.2"> <!ENTITY libidn-version "0.6.14"> +<!ENTITY libpthread-stubs-version "0.1"> <!-- <!ENTITY fam-version "2.7.0"> --> <!-- Chapter 9 --> @@ -384,7 +385,11 @@ $Date$ <!-- Chapter 25 --> <!ENTITY xfree86-version "4.6.0"> <!ENTITY xorg7-version "7.2"> +<!ENTITY libXau-version "1.0.3"> +<!ENTITY libXdmcp-version "1.0.2"> <!ENTITY luit-version "1.0.2"> +<!ENTITY xcb-proto-version "1.0"> +<!ENTITY libxcb-version "1.0"> <!ENTITY xkeyboard-config-version "0.9"> <!ENTITY xbitmaps-version "1.0.1"> <!ENTITY xorg-server-version "1.2.0"> diff --git a/BOOK/general/genlib/genlib.xml b/BOOK/general/genlib/genlib.xml index ba18709..6552b6f 100644 --- a/BOOK/general/genlib/genlib.xml +++ b/BOOK/general/genlib/genlib.xml @@ -71,6 +71,7 @@ $Date$ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="gmime.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libidn.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libdrm.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libpthread-stubs.xml"/> <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="fam.xml"/> --> </chapter> diff --git a/BOOK/general/genlib/libpthread-stubs.xml b/BOOK/general/genlib/libpthread-stubs.xml new file mode 100644 index 0000000..4c93a20 --- /dev/null +++ b/BOOK/general/genlib/libpthread-stubs.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!ENTITY libpthread-stubs-download-http "http://xcb.freedesktop.org/dist/libpthread-stubs-&libpthread-stubs-version;.tar.bz2";> + <!ENTITY libpthread-stubs-download-ftp "ftp://ftp.x.org/pub/individual/lib/libpthread-stubs-&libpthread-stubs-version;.tar.bz2";> + <!ENTITY libpthread-stubs-md5sum "774eabaf33440d534efe108ef9130a7d"> + <!ENTITY libpthread-stubs-size "190 KB"> + <!ENTITY libpthread-stubs-buildsize "1.6 MB"> + <!ENTITY libpthread-stubs-time "less than 0.1 SBU"> +]> + +<sect1 id="libpthread-stubs" xreflabel="libpthread-stubs-&libpthread-stubs-version;"> + <?dbhtml filename="libpthread-stubs.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>libpthread-stubs-&libpthread-stubs-version;</title> + + <indexterm zone="libpthread-stubs"> + <primary sortas="a-libpthread-stubs">libpthread-stubs</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to libpthread-stubs</title> + + <para>The <application>libpthread-stubs</application> package provides + weak aliases for pthread functions not provided in libc or otherwise + available by default. This is useful for libraries that rely on pthread + stubs to use pthreads optionally.</para> + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&libpthread-stubs-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&libpthread-stubs-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &libpthread-stubs-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &libpthread-stubs-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &libpthread-stubs-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &libpthread-stubs-time;</para> + </listitem> + </itemizedlist> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/libpthread-stubs"/></para> + + </sect2> + + <sect2 role="installation"> + <title>Installation of libpthread-stubs</title> + + <para>Install <application>libpthread-stubs</application> by running the + following commands:</para> + +<screen><userinput>./configure --prefix=/usr && +make</userinput></screen> + + <para>This package does not come with a test suite.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> + user:</para> + +<screen role="root"><userinput>make install</userinput></screen> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg>None</seg> + <seg>None</seg> + <seg>None</seg> + </seglistitem> + </segmentedlist> + + </sect2> + +</sect1> diff --git a/BOOK/introduction/welcome/changelog.xml b/BOOK/introduction/welcome/changelog.xml index fa3a970..798cf48 100644 --- a/BOOK/introduction/welcome/changelog.xml +++ b/BOOK/introduction/welcome/changelog.xml @@ -45,6 +45,11 @@ <para>July 8th, 2007</para> <itemizedlist> <listitem> + <para>[dnicholson] - Added libxcb and its dependencies xcb-proto + and libpthread-stubs to the book. Enabled it as a dependency for + the Xorg-7 Libraries.</para> + </listitem> + <listitem> <para>[dnicholson] - Fix a bad commit breaking Xorg-7 libX11 in r6797.</para> </listitem> diff --git a/BOOK/x/installing/installing.xml b/BOOK/x/installing/installing.xml index d349911..9712d76 100644 --- a/BOOK/x/installing/installing.xml +++ b/BOOK/x/installing/installing.xml @@ -51,6 +51,10 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xorg7.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7proto.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7util.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libXau.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libXdmcp.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xcb-proto.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libxcb.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7lib.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xbitmaps.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7app.xml"/> diff --git a/BOOK/x/installing/libXau.xml b/BOOK/x/installing/libXau.xml new file mode 100644 index 0000000..7f39e84 --- /dev/null +++ b/BOOK/x/installing/libXau.xml @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!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 "75a9f2b85cd1617b5ca98c9095323853"> + <!ENTITY libXau-size "224 KB"> + <!ENTITY libXau-buildsize "2.0 MB"> + <!ENTITY libXau-time "less than 0.1 SBU"> +]> + +<sect1 id="libXau" xreflabel="libXau-&libXau-version;"> + <?dbhtml filename="libXau.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>libXau-&libXau-version;</title> + + <indexterm zone="libXau"> + <primary sortas="a-libXau">libXau</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to libXau</title> + + <para>The <application>libXau</application> package contains a library + implementing the X11 Authorization Protocol. This is useful for + restricting client access to the display.</para> + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&libXau-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&libXau-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &libXau-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &libXau-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &libXau-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &libXau-time;</para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">libXau Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"><xref linkend="xorg7-proto"/></para> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/libXau"/></para> + + </sect2> + + <sect2 role="installation"> + <title>Installation of libXau</title> + + <para>Install <application>libXau</application> by running the following + commands:</para> + +<screen><userinput>./configure $XORG_CONFIG && +make</userinput></screen> + + <para>To test the results, issue: <command>make check</command>.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> user:</para> + +<screen role="root"><userinput>make install</userinput></screen> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Library</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg>None</seg> + <seg>libXau.{so,a}</seg> + <seg>None</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="libXau-x7"> + <term><filename class='libraryfile'>libXau.{so,a}</filename></term> + <listitem> + <para>is the library of X authority database routines.</para> + <indexterm zone="libXau libXau-x7"> + <primary sortas="c-libXau">libXau.{so,a}</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> diff --git a/BOOK/x/installing/libXdmcp.xml b/BOOK/x/installing/libXdmcp.xml new file mode 100644 index 0000000..6b8a8f2 --- /dev/null +++ b/BOOK/x/installing/libXdmcp.xml @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!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-buildsize "2.5 MB"> + <!ENTITY libXdmcp-time "0.1 SBU"> +]> + +<sect1 id="libXdmcp" xreflabel="libXdmcp-&libXdmcp-version;"> + <?dbhtml filename="libXdmcp.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>libXdmcp-&libXdmcp-version;</title> + + <indexterm zone="libXdmcp"> + <primary sortas="a-libXdmcp">libXdmcp</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to libXdmcp</title> + + <para>The <application>libXdmcp</application> package contains a library + implementing the X Display Manager Control Protocol. This is useful for + allowing clients to interact with the X Display Manager.</para> + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&libXdmcp-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&libXdmcp-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &libXdmcp-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &libXdmcp-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &libXdmcp-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &libXdmcp-time;</para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">libXdmcp Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"><xref linkend="xorg7-proto"/></para> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/libXdmcp"/></para> + + </sect2> + + <sect2 role="installation"> + <title>Installation of libXdmcp</title> + + <para>Install <application>libXdmcp</application> by running the following + commands:</para> + +<screen><userinput>./configure $XORG_CONFIG && +make</userinput></screen> + + <para>This package does not come with a test suite.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> user:</para> + +<screen role="root"><userinput>make install</userinput></screen> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Library</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg>None</seg> + <seg>libXdmcp.{so,a}</seg> + <seg>None</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="libXdmcp-x7"> + <term><filename class='libraryfile'>libXdmcp.{so,a}</filename></term> + <listitem> + <para>is the X Display Manager Control Protocol library.</para> + <indexterm zone="libXdmcp libXdmcp-x7"> + <primary sortas="c-libXdmcp">libXdmcp.{so,a}</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> diff --git a/BOOK/x/installing/libxcb.xml b/BOOK/x/installing/libxcb.xml new file mode 100644 index 0000000..63b307e --- /dev/null +++ b/BOOK/x/installing/libxcb.xml @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!ENTITY libxcb-download-http "http://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2";> + <!ENTITY libxcb-download-ftp "ftp://ftp.x.org/pub/current/src/extras/libxcb-&libxcb-version;.tar.bz2";> + <!ENTITY libxcb-md5sum "0eb951fd0fa9542dbe4fc3530b81a3b6"> + <!ENTITY libxcb-size "410 KB"> + <!ENTITY libxcb-buildsize "15.0 MB"> + <!ENTITY libxcb-time "0.4 SBU"> +]> + +<sect1 id="libxcb" xreflabel="libxcb-&libxcb-version;"> + <?dbhtml filename="libxcb.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>libxcb-&libxcb-version;</title> + + <indexterm zone="libxcb"> + <primary sortas="a-libxcb">libxcb</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to libxcb</title> + + <para>The <application>libxcb</application> package provides an interface + to the X Window System protocol, which replaces the current Xlib interface. + Xlib can also use XCB as a transport layer, allowing software to make + requests and receive responses with both.</para> + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&libxcb-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&libxcb-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &libxcb-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &libxcb-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &libxcb-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &libxcb-time;</para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Required patch to workaround X11 locking bugs: <ulink + url="&patch-root;/libxcb-&libxcb-version;-sloppy_lock-1.patch"/></para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">libxcb Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"><xref linkend="libXau"/>, + <xref linkend="libXdmcp"/>, + <xref linkend="libpthread-stubs"/>, + <xref linkend="xcb-proto"/>, and + <xref linkend="libxslt"/></para> + + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"><xref linkend="doxygen"/> (to generate API + documentation) and <ulink url="http://check.sourceforge.net/";>Check</ulink> + (to run tests)</para> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/libxcb"/></para> + + </sect2> + + <sect2 role="installation"> + <title>Installation of libxcb</title> + + <para>Install <application>libxcb</application> by running the following + commands:</para> + +<screen><userinput>patch -Np1 -i ../libxcb-&libxcb-version;-sloppy_lock-1.patch && +./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; && +make</userinput></screen> + + <para>To test the results, issue: <command>make check</command>.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> user:</para> + +<screen role="root"><userinput>make install</userinput></screen> + + </sect2> + + <sect2 role="commands"> + <title>Command Explanations</title> + + <para><parameter>--docdir='${datadir}'/doc/libxcb-&libxcb-version;</parameter>: + This parameter ensures the <application>libxcb</application> documentation + is installed to a versioned directory.</para> + + <para><parameter>--without-doxygen</parameter>: This switch can be used + to disable the API documentation if <xref linkend="doxygen"/> is + installed.</para> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg>None</seg> + <seg>libxcb.{so,a} and libxcb-*.{so,a}</seg> + <seg><envar>$XORG_PREFIX</envar>/include/xcb and + <envar>$XORG_PREFIX</envar>/share/doc/libxcb-&libxcb-version;</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="libxcb-lib"> + <term><filename class='libraryfile'>libxcb.{so,a}</filename></term> + <listitem> + <para>is an interface to the X Window System protocol.</para> + <indexterm zone="libxcb libxcb-lib"> + <primary sortas="c-libxcb">libxcb.{so,a}</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> diff --git a/BOOK/x/installing/x7lib.xml b/BOOK/x/installing/x7lib.xml index bf6f38f..b307655 100644 --- a/BOOK/x/installing/x7lib.xml +++ b/BOOK/x/installing/x7lib.xml @@ -7,7 +7,7 @@ <!ENTITY x7libs-download-http "http://xorg.freedesktop.org/releases/individual/lib/";> <!ENTITY x7libs-download-ftp "ftp://ftp.x.org/pub/individual/lib/";> <!ENTITY x7libs-md5sum "&files-anduin;/xorg/md5sums-&xorg7-version;"> - <!ENTITY x7libs-size "11.8 MB"> + <!ENTITY x7libs-size "11.4 MB"> <!ENTITY x7libs-buildsize "186 MB"> <!ENTITY x7libs-time "6.6 SBU"> @@ -77,8 +77,7 @@ <xref linkend="xorg7-proto"/></para> <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"><ulink - url="http://xcb.freedesktop.org/wiki/";>XCB</ulink></para> + <para role="optional"><xref linkend="libxcb"/></para> <para condition="html" role="usernotes">User Notes: <ulink url='&blfs-wiki;/Xorg7Libraries'/></para> @@ -111,7 +110,7 @@ libX11-&libX11-version; ) sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c ;; esac && -./configure $XORG_CONFIG --without-xcb && +./configure $XORG_CONFIG && make</userinput></screen> <para>These packages do not provide test suites.</para> @@ -127,10 +126,11 @@ ldconfig</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> - <para><parameter>--without-xcb</parameter>: <application>libX11</application> - will try to use <ulink url="http://xcb.freedesktop.org/wiki/";>XCB</ulink> - for it's transport layer unless this parameter is supplied. This parameter - will be ignored for other packages.</para> + <para><parameter>--without-xcb</parameter>: By default, + <application>libX11</application> will use <xref linkend="libxcb"/> + for its transport layer. This parameter is necessary in the + <command>./configure</command> command if <xref linkend="libxcb"/> + is not installed.</para> <para><command>patch -Np1 -i ../libX11-&libX11-version;-badargs-1.patch</command>: This patch fixes an error with argument ordering in one of the functions @@ -168,10 +168,10 @@ ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen> <seg>cxpm, makestrs, sxpm, xft-config</seg> <seg>libAppleWM.{so,a}, libdmx.{so,a}, libfontenc.{so,a}, libFS.{so,a}, libICE.{so,a}, liblbxutil.{so,a}, liboldX.{so,a}, - libSM.{so,a}, libWindowsWM.{so,a}, libX11.{so,a}, libXau.{so,a}, + libSM.{so,a}, libWindowsWM.{so,a}, libX11.{so,a}, libXaw6.{so,a}, libXaw7.{so,a}, libXaw8.{so,a}, libXaw.{so,a}, libXcomposite.{so,a}, libXcursor.{so,a}, libXdamage.{so,a}, - libXdmcp.{so,a}, libXevie.{so,a}, libXext.{so,a}, libXfixes.{so,a}, + libXevie.{so,a}, libXext.{so,a}, libXfixes.{so,a}, libXfontcache.{so,a}, libXfont.{so,a}, libXft.{so,a}, libXinerama.{so,a}, libXi.{so,a}, libxkbfile.{so,a}, libxkbui.{so,a}, libXmu.{so,a}, libXmuu.{so,a}, libXpm.{so,a}, libXprintAppUtil.{so,a}, @@ -332,16 +332,6 @@ ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen> </listitem> </varlistentry> - <varlistentry id="libXau-x7"> - <term><filename class='libraryfile'>libXau.{so,a}</filename></term> - <listitem> - <para>is the library of X authority database routines.</para> - <indexterm zone="xorg7-lib libXau-x7"> - <primary sortas="c-libXau">libXau.{so,a}</primary> - </indexterm> - </listitem> - </varlistentry> - <varlistentry id="libXaw6-x7"> <term><filename class='libraryfile'>libXaw6.{so,a}</filename></term> <listitem> @@ -413,16 +403,6 @@ ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen> </listitem> </varlistentry> - <varlistentry id="libXdmcp-x7"> - <term><filename class='libraryfile'>libXdmcp.{so,a}</filename></term> - <listitem> - <para>is the X Display Manager Control Protocol library.</para> - <indexterm zone="xorg7-lib libXdmcp-x7"> - <primary sortas="c-libXdmcp">libXdmcp.{so,a}</primary> - </indexterm> - </listitem> - </varlistentry> - <varlistentry id="libXevie-x7"> <term><filename class='libraryfile'>libXevie.{so,a}</filename></term> <listitem> diff --git a/BOOK/x/installing/xcb-proto.xml b/BOOK/x/installing/xcb-proto.xml new file mode 100644 index 0000000..bb8cef0 --- /dev/null +++ b/BOOK/x/installing/xcb-proto.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!ENTITY xcb-proto-download-http "http://http://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2";> + <!ENTITY xcb-proto-download-ftp "ftp://ftp.x.org/pub/current/src/extras/xcb-proto-&xcb-proto-version;.tar.bz2";> + <!ENTITY xcb-proto-md5sum "d31407eaae7e52d100645217767a41aa"> + <!ENTITY xcb-proto-size "69.4 KB"> + <!ENTITY xcb-proto-buildsize "788 KB"> + <!ENTITY xcb-proto-time "less than 0.1 SBU"> +]> + +<sect1 id="xcb-proto" xreflabel="xcb-proto-&xcb-proto-version;"> + <?dbhtml filename="xcb-proto.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>xcb-proto-&xcb-proto-version;</title> + + <indexterm zone="xcb-proto"> + <primary sortas="a-xcb-proto">xcb-proto</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to xcb-proto</title> + + <para>The <application>xcb-proto</application> package provides the + XML-XCB protocol descriptions that <application>libxcb</application> + uses to generate the majority of its code and API.</para> + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&xcb-proto-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&xcb-proto-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &xcb-proto-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &xcb-proto-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &xcb-proto-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &xcb-proto-time;</para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">xcb-proto Dependencies</bridgehead> + + <bridgehead renderas="sect4">Optional (required to run the + tests)</bridgehead> + <para role="optional"><xref linkend="libxml2"/></para> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/xcb-proto"/></para> + + </sect2> + + <sect2 role="installation"> + <title>Installation of xcb-proto</title> + + <para>Install <application>xcb-proto</application> by running the following + commands:</para> + +<screen><userinput>./configure $XORG_CONFIG && +make</userinput></screen> + + <para>To test the results, issue: <command>make check</command>.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> user:</para> + +<screen role="root"><userinput>make install && +install -dv -m755 ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version; && +install -v -m644 doc/* ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version;</userinput></screen> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Directory</segtitle> + + <seglistitem> + <seg>None</seg> + <seg>None</seg> + <seg><envar>$XORG_PREFIX</envar>/share/xcb</seg> + </seglistitem> + </segmentedlist> + + </sect2> + +</sect1> diff --git a/BOOK/x/lib/cairo.xml b/BOOK/x/lib/cairo.xml index 90f0784..85027de 100644 --- a/BOOK/x/lib/cairo.xml +++ b/BOOK/x/lib/cairo.xml @@ -76,7 +76,8 @@ url="http://www.freedesktop.org/Software/glitz";>glitz</ulink>, <ulink url="http://www.directfb.org/";>DirectFB</ulink>, <ulink url="http://openquartz.sourceforge.net/";>Open Quartz</ulink>, - <ulink url="http://xcb.freedesktop.org/wiki/";>XCB</ulink>, and + <xref linkend="libxcb"/> (also requires + <ulink url="http://xcb.freedesktop.org/dist/";>xcb-util</ulink>), and <xref linkend="gtk-doc"/></para> <bridgehead renderas="sect4">Optional (to provide extended test suite diff --git a/auxfiles/xorg/lib-7.2.wget b/auxfiles/xorg/lib-7.2.wget index 445cfe3..389bc8a 100644 --- a/auxfiles/xorg/lib-7.2.wget +++ b/auxfiles/xorg/lib-7.2.wget @@ -2,8 +2,6 @@ # $LastChangedBy$ # $Date$ xtrans-1.0.3.tar.bz2 -libXau-1.0.3.tar.bz2 -libXdmcp-1.0.2.tar.bz2 libX11-1.1.2.tar.bz2 libXext-1.0.3.tar.bz2 libICE-1.0.3.tar.bz2 diff --git a/auxfiles/xorg/md5sums-7.2 b/auxfiles/xorg/md5sums-7.2 index 404ae07..7d8577e 100644 --- a/auxfiles/xorg/md5sums-7.2 +++ b/auxfiles/xorg/md5sums-7.2 @@ -72,12 +72,10 @@ dfd5de47e232db0891410bec8ee6707b libFS-1.0.0.tar.bz2 710bf38a9477a5a1b235bc94f1d0593c libX11-1.1.2.tar.bz2 ac2d697dd02f51e5c15f7104f4be5328 libXScrnSaver-1.1.2.tar.bz2 1e2d966b5b2b89910e418bb0f78e10de libXTrap-1.0.0.tar.bz2 -75a9f2b85cd1617b5ca98c9095323853 libXau-1.0.3.tar.bz2 ee215536ea78798268ab3a444d10135a libXaw-1.0.3.tar.bz2 50dd31bed383280433404a405d3dcf8f libXcomposite-0.3.2.tar.bz2 ec2acd10a7736a85dd1e1ed9ea5bec96 libXcursor-1.1.8.tar.bz2 4d0eece7a8372a7754db1de08c2be324 libXdamage-1.0.4.tar.bz2 -10facf2bc7cbd5e5c1a698b8a210a582 libXdmcp-1.0.2.tar.bz2 88e9bf535364e7c821ef4014fb1ca2dd libXevie-1.0.2.tar.bz2 1bf6fa1c26f9957d7cc0bd90b038dfa6 libXext-1.0.3.tar.bz2 1990d19725a3c7f32290037f02d3737f libXfixes-4.0.3.tar.bz2 -- 1.5.1.6 -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
