r3110 - in trunk: BOOK/kde/add patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Dec 17 16:16:23 PST 2004


Author: randy
Date: 2004-12-17 17:16:22 -0700 (Fri, 17 Dec 2004)
New Revision: 3110

Removed:
   trunk/patches/kdebindings-3.3.0-libqt-1.patch
Modified:
   trunk/BOOK/kde/add/kdebindings.xml
   trunk/BOOK/kde/add/kdemultimedia.xml
Log:
Updated build entities and dependencies for kdemultimedia-3.3.2 and kdebindings-3.3.2

Modified: trunk/BOOK/kde/add/kdebindings.xml
===================================================================
--- trunk/BOOK/kde/add/kdebindings.xml	2004-12-17 22:23:36 UTC (rev 3109)
+++ trunk/BOOK/kde/add/kdebindings.xml	2004-12-18 00:16:22 UTC (rev 3110)
@@ -6,10 +6,10 @@
 
 <!ENTITY kdebindings-download-http "&kde-download-http;/kdebindings-&kde-version;.tar.bz2">
 <!ENTITY kdebindings-download-ftp  "&kde-download-ftp;/kdebindings-&kde-version;.tar.bz2">
-<!ENTITY kdebindings-md5sum        "63f7cd3ae52397c2182527899efb4c80">
+<!ENTITY kdebindings-md5sum        "a8ae8e2ef4dd3680d0756adf76086d85">
 <!ENTITY kdebindings-size          "7.1 MB">
-<!ENTITY kdebindings-buildsize     "464 MB">
-<!ENTITY kdebindings-time          "34.65 SBU">
+<!ENTITY kdebindings-buildsize     "466 MB">
+<!ENTITY kdebindings-time          "36.25 SBU">
 ]>
 
 <sect1 id="kdebindings">
@@ -29,20 +29,20 @@
 url="&kdebindings-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&kdebindings-download-ftp;"/></para></listitem>
-<listitem><para>MD5 Sum: &kdebindings-md5sum;</para></listitem>
+<listitem><para>Download MD5 sum: &kdebindings-md5sum;</para></listitem>
 <listitem><para>Download size: &kdebindings-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &kdebindings-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &kdebindings-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
+<!-- <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink 
 url="&patch-root;/kdebindings-&kde-version;-libqt-1.patch"></ulink></para>
 </listitem></itemizedlist>
-</sect3>
+</sect3> -->
 
 <sect3><title><application>kdebindings</application> dependencies</title>
 <sect4><title>Required</title>
@@ -56,8 +56,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para>
-<xref linkend="GLib"/>,
+<para><xref linkend="GLib"/>, 
 <xref linkend="GTK"/>,
 <xref linkend="Python"/>,
 <xref linkend="ruby"/>,
@@ -85,8 +84,8 @@
     python/pykde/configure.py</command></userinput></screen>
 
 <para>Install <application>kdebindings</application> with:</para>
-<screen><userinput><command>patch -Np1 -i ../kdebindings-&kde-version;-libqt-1.patch &&
-./configure --prefix=&kde-dir; --disable-debug \
+
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &&
 make &&
 make install</command></userinput></screen>

Modified: trunk/BOOK/kde/add/kdemultimedia.xml
===================================================================
--- trunk/BOOK/kde/add/kdemultimedia.xml	2004-12-17 22:23:36 UTC (rev 3109)
+++ trunk/BOOK/kde/add/kdemultimedia.xml	2004-12-18 00:16:22 UTC (rev 3110)
@@ -6,10 +6,10 @@
 
 <!ENTITY kdemultimedia-download-http "&kde-download-http;/kdemultimedia-&kde-version;.tar.bz2">
 <!ENTITY kdemultimedia-download-ftp  "&kde-download-ftp;/kdemultimedia-&kde-version;.tar.bz2">
-<!ENTITY kdemultimedia-md5sum        "2579f41004b39168da25cb4db0043f00">
-<!ENTITY kdemultimedia-size          "5.4 MB">
+<!ENTITY kdemultimedia-md5sum        "2f393da809542dab5bf75bf7a91d1ec0">
+<!ENTITY kdemultimedia-size          "5.3 MB">
 <!ENTITY kdemultimedia-buildsize     "124 MB">
-<!ENTITY kdemultimedia-time          "13.30 SBU">
+<!ENTITY kdemultimedia-time          "13.17 SBU">
 ]>
 
 <sect1 id="kdemultimedia" xreflabel="kdemultimedia-&kde-version;">
@@ -29,9 +29,9 @@
 url="&kdemultimedia-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&kdemultimedia-download-ftp;"/></para></listitem>
-<listitem><para>MD5 Sum: &kdemultimedia-md5sum;</para></listitem>
+<listitem><para>Download MD5 sum: &kdemultimedia-md5sum;</para></listitem>
 <listitem><para>Download size: &kdemultimedia-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &kdemultimedia-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &kdemultimedia-time;</para></listitem></itemizedlist>
@@ -50,8 +50,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="libtiff"/>, 
-<xref linkend="CDParanoia"/>, 
+<para><xref linkend="CDParanoia"/>, 
 <xref linkend="lame"/>,
 <xref linkend="audiofile"/>,
 <xref linkend="libogg"/>,
@@ -62,12 +61,12 @@
 <xref linkend="SDL"/>, 
 <xref linkend="gstreamer"/> 
 (with <ulink url="http://developer.kde.org/~wheeler/juk.html">KGst</ulink>), 
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
 <ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>, 
 <ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>, 
 <ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM 
 Generator</ulink> and 
-<ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
+<ulink 
+url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
 </para></sect4>
 </sect3>
 
@@ -90,7 +89,7 @@
 
 <para>There is no explicit configuration for the 
 <application>kdemultimedia</application> package, however
-<command>kscd</command> needs to find the CD drive. The default is
+<command>kscd</command> needs to find the CD drive. The default device file is 
 <filename>/dev/cdrom</filename> which may not exist on your system.  The
 easiest way to do this is to create a symbolic link to this from your CD drive
 (e.g., <filename>/dev/hdc</filename>, <filename>/dev/scd0</filename>, etc.):

Deleted: trunk/patches/kdebindings-3.3.0-libqt-1.patch
===================================================================
--- trunk/patches/kdebindings-3.3.0-libqt-1.patch	2004-12-17 22:23:36 UTC (rev 3109)
+++ trunk/patches/kdebindings-3.3.0-libqt-1.patch	2004-12-18 00:16:22 UTC (rev 3110)
@@ -1,22 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2004-08-24
-Initial Package Version: 3.3
-Origin: Jim Gifford
-Upstream Status: Sent
-Description: Fails on checking for the qt library since two
-	     libraries exist. This forces the use of lqt-mt library
- 
-$LastChangedBy$
-$Date$
-
---- kdebindings-3.3.0/python/Makefile.in.orig	2004-08-24 20:53:02.070317336 +0000
-+++ kdebindings-3.3.0/python/Makefile.in	2004-08-24 20:53:24.458913752 +0000
-@@ -549,7 +549,7 @@
- 	@(cd pykde && $(MAKE))
- 
- sipdone:
--	cd sip && export QTDIR=${qt_dir} && @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -v ${sip_dir}
-+	cd sip && export QTDIR=${qt_dir} && @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -v ${sip_dir} -lqt-mt
- 	@(cd sip && $(MAKE))
- 	echo "" > sipdone
- 




More information about the blfs-book mailing list