Author: bdubbs Date: 2011-12-25 22:48:37 -0700 (Sun, 25 Dec 2011) New Revision: 9145
Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/kde/add/kdeadmin.xml trunk/BOOK/kde/add/kdenetwork.xml Log: Update to kdenetwork-3.5.13 (Trinity) Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2011-12-26 02:16:49 UTC (rev 9144) +++ trunk/BOOK/general.ent 2011-12-26 05:48:37 UTC (rev 9145) @@ -3,13 +3,13 @@ $Date$ --> -<!ENTITY day "25"> <!-- Always 2 digits --> +<!ENTITY day "26"> <!-- Always 2 digits --> <!ENTITY month "12"> <!-- Always 2 digits --> <!ENTITY year "2011"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "&year;-&month;-&day;"> -<!ENTITY releasedate "December 23rd, &year;"> +<!ENTITY releasedate "December 26th, &year;"> <!-- <!ENTITY releasedate "November &day;st, &year;"> --> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> @@ -58,7 +58,7 @@ <!ENTITY lfs-vim-version "7.3"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20111219"> +<!ENTITY blfs-bootscripts-version "20111226"> <!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"> <!ENTITY blfs-wiki "http://wiki.&lfs-domainname;/blfs/wiki";> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2011-12-26 02:16:49 UTC (rev 9144) +++ trunk/BOOK/introduction/welcome/changelog.xml 2011-12-26 05:48:37 UTC (rev 9145) @@ -42,6 +42,18 @@ --> <listitem> + <para>December 26th, 2011</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to kdenetork-3.5.13. (Trinity)</para> + </listitem> + <listitem> + <para>[abenton] - Seamonkey 2.6.1.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>December 25th, 2011</para> <itemizedlist> <listitem> @@ -66,7 +78,7 @@ <para>December 22nd, 2011</para> <itemizedlist> <listitem> - <para>[Bdubbs] - Update to kdeadmin-3.5.13.</para> + <para>[Bdubbs] - Update to kdeadmin-3.5.13. (Trinity)</para> </listitem> <listitem> <para>[abenton] - Tiff 4.0.0.</para> Modified: trunk/BOOK/kde/add/kdeadmin.xml =================================================================== --- trunk/BOOK/kde/add/kdeadmin.xml 2011-12-26 02:16:49 UTC (rev 9144) +++ trunk/BOOK/kde/add/kdeadmin.xml 2011-12-26 05:48:37 UTC (rev 9145) @@ -3,8 +3,8 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY kdeadmin-download-http "&trinity-repo-http;/kdeadmin-&trinity-version;.tar.bz2"> - <!ENTITY kdeadmin-download-ftp "&trinity-repo-ftp;/kdeadmin-&trinity-version;.tar.bz2"> + <!ENTITY kdeadmin-download-http "&trinity-repo-http;/kdeadmin-&trinity-version;.tar.gz"> + <!ENTITY kdeadmin-download-ftp "&trinity-repo-ftp;/kdeadmin-&trinity-version;.tar.gz"> <!ENTITY kdeadmin-md5sum "b8bbabf353070a3e730464e0ce2960e2"> <!ENTITY kdeadmin-size "1.9 MB"> <!ENTITY kdeadmin-buildsize "132 MB"> Modified: trunk/BOOK/kde/add/kdenetwork.xml =================================================================== --- trunk/BOOK/kde/add/kdenetwork.xml 2011-12-26 02:16:49 UTC (rev 9144) +++ trunk/BOOK/kde/add/kdenetwork.xml 2011-12-26 05:48:37 UTC (rev 9145) @@ -3,15 +3,15 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY kdenetwork-download-http "&kde-download-http;/kdenetwork-&kde-version;.tar.bz2"> - <!ENTITY kdenetwork-download-ftp "&kde-download-ftp;/kdenetwork-&kde-version;.tar.bz2"> + <!ENTITY kdenetwork-download-http "&trinity-repo-http;/kdenetwork-&trinity-version;.tar.gz"> + <!ENTITY kdenetwork-download-ftp "&trinity-repo-ftp;/kdenetwork-&trinity-version;.tar.gz"> <!ENTITY kdenetwork-md5sum "0ec1d4ccd550510821a622eb91b893e8"> - <!ENTITY kdenetwork-size "8.9 MB"> - <!ENTITY kdenetwork-buildsize "155 MB (additional 24 MB for API docs)"> - <!ENTITY kdenetwork-time "13.5 SBU (additional 0.1 SBU for API docs)"> + <!ENTITY kdenetwork-size "8.6 MB"> + <!ENTITY kdenetwork-buildsize "98 MB"> + <!ENTITY kdenetwork-time "5.1 SBU"> ]> -<sect1 id="kdenetwork" xreflabel="kdenetwork-&kde-version;"> +<sect1 id="kdenetwork" xreflabel="kdenetwork-&trinity-version;"> <?dbhtml filename="kdenetwork.html"?> <sect1info> @@ -19,7 +19,7 @@ <date>$Date$</date> </sect1info> - <title>Kdenetwork-&kde-version;</title> + <title>Kdenetwork-&trinity-version;</title> <indexterm zone="kdenetwork"> <primary sortas="a-kdenetwork">Kdenetwork</primary> @@ -55,30 +55,42 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing='compact'> + <listitem> + <para>Required patch: <ulink + url="&patch-root;/kdenetwork-&trinity-version;-upstream_fixs-1.patch"/></para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">Kdenetwork Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> - <para role="required"><xref linkend="kdebase"/></para> + <para role="required"> + <xref linkend="kdebase"/> + </para> <bridgehead renderas="sect4">Recommended</bridgehead> - <para role="recommended"><xref linkend="libjpeg"/>, - <xref linkend="libxml2"/>, - <xref linkend="libxslt"/>, and - <xref linkend="openssl"/></para> + <para role="recommended"> + <xref linkend="libjpeg"/>, + <xref linkend="libxml2"/>, + <xref linkend="libxslt"/>, + <xref linkend="openssl"/>, and + <xref linkend="speex"/> + </para> <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"><xref linkend="ppp"/>, - <!-- <xref linkend="xmms"/>, --> - <xref linkend="graphviz"/>, - <xref linkend="doxygen"/>, - <xref linkend="wireless_tools"/>, - <xref linkend="speex"/>, - <xref linkend="alsa"/>, - <ulink url="http://www.pxh.de/fs/gsmlib/index.html";>gsmlib</ulink>, - <ulink url="http://meanwhile.sourceforge.net";>Meanwhile</ulink>, - <ulink url="http://www.openslp.org/";>OpenSLP</ulink>, - <ulink url="http://dev.null.pl/ekg/";>libgadu</ulink>, and - <ulink url="http://valgrind.org/";>Valgrind</ulink></para> + <para role="optional"> + <xref linkend="doxygen"/>, + <xref linkend="graphviz"/>, + <xref linkend="ppp"/>, + <xref linkend="wireless_tools"/>, + <ulink url="http://linuxtv.org/downloads/v4l-utils/";>v4l-utils (Video 4 Linux)</ulink>, + <ulink url="http://linux.softpedia.com/progDownload/gsmlib-Download-15052.html";>gsmlib</ulink>, + <ulink url="http://meanwhile.sourceforge.net";>Meanwhile</ulink>, + <ulink url="http://www.openslp.org/";>OpenSLP</ulink>, and + <ulink url="http://toxygen.net/libgadu/";>libgadu (Polish)</ulink>, + </para> <para condition="html" role="usernotes">User Notes: <ulink url="&blfs-wiki;/kdenetwork"/></para> @@ -88,10 +100,39 @@ <sect2 role="installation"> <title>Installation of Kdenetwork</title> + <note><para>The following installation procedures assume that the + recommended dependencies as well as v4l-utils and wireless_tools are + installed. Examine CMakeLists.txt to determine other options.</para> + + <para>v4l-utils must be installed to build any kopete (instant + messenger) plugin.</para> + </note> + <para>Install <application>kdenetwork</application> with:</para> -<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \ - --disable-dependency-tracking && +<screen><userinput>patch -Np1 -i ../kdenetwork&trinity-version;-upstream_fixes-1.patch && + +MAKEDIR=/tmp/buildkdenet && +KDENET=`pwd` && +rm -rf $MAKEDIR && +mkdir -p $MAKEDIR && +cd $MAKEDIR && + +cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_JINGLE=ON \ + -DWITH_SPEEX=ON \ + -DWITH_WEBCAM=ON \ + -DWITH_GSM=OFF \ + -DWITH_ARTS=ON \ + -DBUILD_KOPETE_PROTOCOL_ALL=ON \ + -DBUILD_KOPETE_PROTOCOL_GADU=OFF \ + -DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF \ + -DBUILD_KOPETE_PLUGIN_ALL=ON \ + -DBUILD_ALL=ON \ + $KDENET && + +unset MAKEDIR KDENET && make</userinput></screen> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; @@ -162,10 +203,16 @@ <segtitle>Installed Directories</segtitle> <seglistitem> - <seg>kdict, kget, knewsticker, kopete, kpf, kppp, krdc, krfb, ksirc, - ktalkd, kwifimanager, and lisa</seg> - <seg>None</seg> - <seg>None</seg> + + <seg>dsirc, feedbrowser, kdict, kget, knewstickerstub, kopete, kppp, + krdc, krfb, ksirc, ktalkd, kwifimanager, lisa, rssclient, rssservice, + stunserver, and some additional support scripts</seg> + + <seg>libkdeinit_kdict.so, libkdeinit_ksirc.so, libkopete.so, + libkopete_msn_shared.so, libkopete_oscar.so, libkopete_videodevice.so, + librss.so</seg> + + <seg>$TRINITY_PREFIX/include/{kopete,rss}, $TRINITY_PREFIX/lib/trinity</seg> </seglistitem> </segmentedlist> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
