Added a patch to the kdelibs instructions so it will build if you have CUPS-1.2.x installed; the patch does not affect the build with lesser versions of CUPS; thanks to Matthew Carson for chasing down the problem and sending in the patch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6114 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Randy McMurchy 2006-05-20 21:02:49 +00:00
parent 1b5864741e
commit f685d3eb92
2 changed files with 17 additions and 18 deletions

View File

@ -44,6 +44,12 @@
<listitem>
<para>May 20th, 2006</para>
<itemizedlist>
<listitem>
<para>[randy] - Added a patch to the kdelibs instructions so it
will build if you have CUPS-1.2.x installed. The patch does not
affect the build with lesser versions of CUPS. Thanks to Matthew
Carson for chasing down the problem and sending in the patch.</para>
</listitem>
<listitem>
<para>[dnicholson] - Added -ifv arguments to the autoreconf
command in libdrm so that libtoolize will be run. The shared

View File

@ -4,18 +4,6 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!-- Inserted as a reminder to do this. The mention of a test suite
is usually right before the root user installation commands. Please
delete these 12 (including one blank) lines after you are done.-->
<!-- Use one of the two mentions below about a test suite,
delete the line that is not applicable. Of course, if the
test suite uses syntax other than "make check", revise the
line to reflect the actual syntax to run the test suite -->
<!-- <para>This package does not come with a test suite.</para> -->
<!-- <para>To test the results, issue: <command>make check</command>.</para> -->
<!ENTITY kdelibs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
<!ENTITY kdelibs-download-ftp "&kde-download-ftp;/kdelibs-&kde-version;.tar.bz2">
<!ENTITY kdelibs-md5sum "367738696dc468859cf90d5a6e8f18a9">
@ -72,16 +60,15 @@
</listitem>
</itemizedlist>
<!--
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<bridgehead renderas="sect4">Required Patch</bridgehead>
<itemizedlist spacing='compact'>
<listitem>
<para><ulink url="ftp://ftp.kde.org/pub/kde/security_patches/post-3.4.3-kdelibs-kjs.diff"/></para>
<para><ulink url="&patch-root;/kdelibs-&kde-version;-cups1.2-1.patch"/></para>
</listitem>
</itemizedlist>
-->
<bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
@ -110,7 +97,7 @@
<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
<ulink url="http://www.openexr.com/">OpenEXR</ulink>,
<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
<ulink url="http://www.lua.org/">Lua</ulink>,
<ulink url="http://www.lua.org/">Lua</ulink> (version &lt; 5.1),
<ulink url="http://www.opensource.apple.com/darwinsource/tarballs/apsl/">mDNSResponder</ulink>,
<ulink url="http://sourceforge.net/projects/libthai">LibThai</ulink>,
<ulink url="http://www.ivrix.org.il/projects/spell-checker/">Hspell</ulink>,
@ -130,8 +117,11 @@
<para>Install <application>kdelibs</application> with:</para>
<screen><userinput>./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
--disable-debug --disable-dependency-tracking &amp;&amp;
<screen><userinput>patch -Np1 -i ../kdelibs-&kde-version;-cups1.2-1.patch &amp;&amp;
./configure --prefix=&kde-dir; \
--sysconfdir=/etc/kde \
--disable-debug \
--disable-dependency-tracking &amp;&amp;
make</userinput></screen>
<note>
@ -155,6 +145,9 @@ make</userinput></screen>
</para>
</note>
<para>This package does not come with a test suite that works with
<application>GCC</application>-&gcc-version;.</para>
<para>Now, as the <systemitem class="username">root</systemitem> user:</para>
<screen role='root'><userinput>make install</userinput></screen>