From 65ce93ae5876897d9f9e784e2785b525b0df6a3c Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 7 Jan 2009 07:33:33 +0000 Subject: [PATCH] Updated to kde-3.5.10/kevelop-3.5.5. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7722 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 10 +++--- introduction/welcome/changelog.xml | 9 +++++ kde/add/kdeaccessibility.xml | 4 +-- kde/add/kdeaddons.xml | 6 ++-- kde/add/kdeadmin.xml | 8 ++--- kde/add/kdeartwork.xml | 8 ++--- kde/add/kdeedu.xml | 8 ++--- kde/add/kdegames.xml | 8 ++--- kde/add/kdegraphics.xml | 6 ++-- kde/add/kdemultimedia.xml | 31 +++++++++++++---- kde/add/kdenetwork.xml | 6 ++-- kde/add/kdepim.xml | 33 ++++++++++++++---- kde/add/kdetoys.xml | 6 ++-- kde/add/kdeutils.xml | 8 ++--- kde/core/arts.xml | 8 ++--- kde/core/kdebase.xml | 17 +++++---- kde/core/kdelibs.xml | 56 ++++++++++++++++++------------ kde/devel/kdebindings.xml | 40 ++++++++++++--------- kde/devel/kdesdk.xml | 8 ++--- kde/devel/kdevelop.xml | 35 +++++++++++-------- kde/devel/kdewebdev.xml | 6 ++-- 21 files changed, 197 insertions(+), 124 deletions(-) diff --git a/general.ent b/general.ent index 5b71a69d41..51e0fcb687 100644 --- a/general.ent +++ b/general.ent @@ -3,7 +3,7 @@ $LastChangedBy$ $Date$ --> - + @@ -455,15 +455,15 @@ $Date$ - - - + + + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 85e11ac3a7..67e8a6c6eb 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -40,6 +40,15 @@ --> + + January 7th, 2009 + + + [bdubbs] - Updated to kde-3.5.10/kevelop-3.5.5. + + + + January 6th, 2009 diff --git a/kde/add/kdeaccessibility.xml b/kde/add/kdeaccessibility.xml index ed2d640afc..a4a2e5cd27 100644 --- a/kde/add/kdeaccessibility.xml +++ b/kde/add/kdeaccessibility.xml @@ -5,10 +5,10 @@ %general-entities; - + - + ]> diff --git a/kde/add/kdeaddons.xml b/kde/add/kdeaddons.xml index ed5fc989ef..60058988a8 100644 --- a/kde/add/kdeaddons.xml +++ b/kde/add/kdeaddons.xml @@ -5,10 +5,10 @@ %general-entities; - + - - + + ]> diff --git a/kde/add/kdeadmin.xml b/kde/add/kdeadmin.xml index c00c13a9b4..309512784d 100644 --- a/kde/add/kdeadmin.xml +++ b/kde/add/kdeadmin.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> diff --git a/kde/add/kdeartwork.xml b/kde/add/kdeartwork.xml index 0fbb9d371a..6a1bb1986b 100644 --- a/kde/add/kdeartwork.xml +++ b/kde/add/kdeartwork.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> diff --git a/kde/add/kdeedu.xml b/kde/add/kdeedu.xml index 6f52ac4de0..f31ced1566 100644 --- a/kde/add/kdeedu.xml +++ b/kde/add/kdeedu.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> diff --git a/kde/add/kdegames.xml b/kde/add/kdegames.xml index 223e7e855d..7fffcce3b2 100644 --- a/kde/add/kdegames.xml +++ b/kde/add/kdegames.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> diff --git a/kde/add/kdegraphics.xml b/kde/add/kdegraphics.xml index 8d6d2c1c79..62b5f4fd22 100644 --- a/kde/add/kdegraphics.xml +++ b/kde/add/kdegraphics.xml @@ -5,10 +5,10 @@ %general-entities; - + - - + + ]> diff --git a/kde/add/kdemultimedia.xml b/kde/add/kdemultimedia.xml index 7f25fab111..b6f4ac43bb 100644 --- a/kde/add/kdemultimedia.xml +++ b/kde/add/kdemultimedia.xml @@ -6,10 +6,10 @@ - - - - + + + + @@ -108,10 +108,19 @@ Installation of Akode - Install Akode by issuing the following - commands: +sed -i "s/#include <iostream>/&\n#include <cstdlib>/" \ + akode/lib/auto_sink.cpp && -./configure --prefix=&kde-dir; --without-ffmpeg \ +sed -i 's/#include "../lib/decoder.h"/&\n#include <cstdlib>/' \ + akode/akodeplay/akodeplay.cpp && + +sed -i "s/<assert.h>/&\n#include <string.h>\n/" \ + akode/lib/player.cpp && + +sed -i "s/<iostream>/&\n#include <string.h>\n/" \ + akode/lib/magic.cpp && + +./configure --prefix=&kde-dir; --without-ffmpeg \ --disable-debug --disable-dependency-tracking && make @@ -126,6 +135,10 @@ make Command Explanations + sed ...: The four sed commands insert headers + needed by gcc-4.3 and above because the C++ header + dependencies have been cleaned up. + --without-ffmpeg: This option disables the experimental FFmpeg support in Akode, as the build fails if it is enabled. @@ -235,8 +248,12 @@ make --disable-debug --disable-dependency-tracking && make + Now, as the root user: diff --git a/kde/add/kdenetwork.xml b/kde/add/kdenetwork.xml index 968deb018c..6910d69126 100644 --- a/kde/add/kdenetwork.xml +++ b/kde/add/kdenetwork.xml @@ -6,9 +6,9 @@ - - - + + + ]> diff --git a/kde/add/kdepim.xml b/kde/add/kdepim.xml index f2fd13760d..dea171ad1c 100644 --- a/kde/add/kdepim.xml +++ b/kde/add/kdepim.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> @@ -91,10 +91,15 @@ Install kdepim with: -./configure --prefix=&kde-dir; --disable-debug \ - --disable-dependency-tracking && -sed -i "s@ \*/@&\n#define HAVE_FOPENCOOKIE@" \ +sed -i "s@ \*/@&\n#define HAVE_FOPENCOOKIE@" \ libkdenetwork/libgpgme-copy/{assuan,gpgme}/funopen.c && +sed -i -e 's|linux/inotify|sys/inotify|' \ + -e '/^static inline int inotify_init/,/^}/d' \ + -e '/^static inline int inotify_add_watch/,/^}/d' \ + -e '/^static inline int inotify_rm_watch/,/^}/d' \ + kmail/editorwatcher.cpp && +./configure --prefix=&kde-dir; --disable-debug \ + --disable-dependency-tracking && make + + Command Explanations + + sed -i ... funopen.c: This prevents an error + during build that is caused by configure not + properly detecting a capability built into glibc. + + + sed -i ... kmail/editorwatcher.cpp: This This + command is necessary to prevent a conflict in linux headers. The equivalent + instructions that are deleted are now within glibc. + + + Contents diff --git a/kde/add/kdetoys.xml b/kde/add/kdetoys.xml index 39784eb869..70b506a375 100644 --- a/kde/add/kdetoys.xml +++ b/kde/add/kdetoys.xml @@ -5,10 +5,10 @@ %general-entities; - - + + - + ]> diff --git a/kde/add/kdeutils.xml b/kde/add/kdeutils.xml index 800167ea8f..51322974f5 100644 --- a/kde/add/kdeutils.xml +++ b/kde/add/kdeutils.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> diff --git a/kde/core/arts.xml b/kde/core/arts.xml index 7fa46421fa..a300de08e9 100644 --- a/kde/core/arts.xml +++ b/kde/core/arts.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> diff --git a/kde/core/kdebase.xml b/kde/core/kdebase.xml index 9cb916fdfa..14503d9f39 100644 --- a/kde/core/kdebase.xml +++ b/kde/core/kdebase.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -138,7 +138,7 @@ ./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \ --disable-debug --disable-dependency-tracking && -LD_LIBRARY_PATH="$KDE_PREFIX/lib" make +make @@ -148,10 +148,14 @@ LD_LIBRARY_PATH="$KDE_PREFIX/lib" make make install - + Configuring Kdebase diff --git a/kde/core/kdelibs.xml b/kde/core/kdelibs.xml index 6709aede93..45b7983bf1 100644 --- a/kde/core/kdelibs.xml +++ b/kde/core/kdelibs.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -115,18 +115,36 @@ Install kdelibs with: -./configure --prefix=&kde-dir; \ +patch -Np1 -i ../kdelibs-&kde-version;-charset-1.patch && +sed -i -e 's|linux/inotify|sys/inotify|' \ + -e '/^static inline int inotify_init/,/^}/d' \ + -e '/^static inline int inotify_add_watch/,/^}/d' \ + -e '/^static inline int inotify_rm_watch/,/^}/d' \ + kio/kio/kdirwatch.cpp && +./configure --prefix=$KDE_PREFIX \ --sysconfdir=/etc/kde \ - --disable-debug \ + --disable-debug \ --disable-dependency-tracking && -LD_LIBRARY_PATH="$QTDIR/lib" make +make + If you wish to create the API documentation and you have - Doxygen and Graphviz - installed, make apidox must be done before - make install. This applies to all packages which - can utilize Doxygen. + Doxygen and + Graphviz installed, it must be done before the + make install. This applies to all packages which can + utilize Doxygen. + + The usual building the API documentation in this package + will run forever because of a bug in + doxygen. There is a symbolic link + in the kdeprint directory that is + not handled properly. To fix this, delete the link, generate the + documentation, and recreate the symbolic link: + + rm kdeprint/kdeprint && +make apidox && +ln -s management kdeprint/kdeprint The make apidox command generates a lot of errors and warnings. In some cases it complains that Helvetica fonts are @@ -154,6 +172,10 @@ LD_LIBRARY_PATH="$QTDIR/lib" make Command Explanations + sed -i ... kio/kio/kdirwatch.cpp: This command is + necessary to prevent a conflict in linux headers. The equivalent + instructions that are deleted are now within glibc. + --prefix=&kde-dir;: This option tells the process to install the package in &kde-dir;. @@ -163,12 +185,6 @@ LD_LIBRARY_PATH="$QTDIR/lib" make --disable-dependency-tracking: This option speeds up one time builds. - - --sysconfdir=/etc/kde: This option places configuration files in compliance with the class='directory'>$KDE_PREFIX/etc which may be desirable if you have multiple versions of KDE installed. - LD_LIBRARY_PATH="$QTDIR/lib" make: A bug in the - kdelibs build system prevents Qt - from being found by the Makefiles if Qt was - installed in /opt. Setting LD_LIBRARY_PATH - works around the problem. - diff --git a/kde/devel/kdebindings.xml b/kde/devel/kdebindings.xml index de30c31966..1ced66490d 100644 --- a/kde/devel/kdebindings.xml +++ b/kde/devel/kdebindings.xml @@ -5,10 +5,10 @@ %general-entities; - + - - + + ]> @@ -55,6 +55,18 @@ + Additional Downloads + + + Reqiured patch: + + + Reqiured patch: + + + Kdebindings Dependencies Required @@ -94,10 +106,13 @@ Install kdebindings with: -sed -i -e '/configure.*pyqt/s/-c//' \ - -e '/configure.*pykde/s/-c/-i/' python/Makefile.in -sed -i 's%echo "yes" | @PYTHON@ configure.py%& -y qt-mt%' python/Makefile.in -DO_NOT_COMPILE="smoke" ./configure --prefix=&kde-dir; --disable-debug \ +sed -i 's%echo "yes" | @PYTHON@ configure.py%& -y qt-mt%' \ + python/Makefile.in && + +patch -Np1 -i $DIR/kdebindings-3.5.10-ruby-1.patch && +patch -Np1 -i $DIR/kdebindings-3.5.10-python-1.patch && + +./configure --prefix=&kde-dir; --disable-debug \ --disable-dependency-tracking && make @@ -112,21 +127,12 @@ make Command Explanations - sed -i -e '/configure.*pyqt/s/-c//' -e - '/configure.*pykde/s/-c/-i/' python/Makefile.in : Remove a switch - that causes concatenation of multiple files for compilation. This fix - reduces build time by a factor of five. - - sed -i 's%echo "yes" | @PYTHON@ configure.py%& -y qt-mt%' python/Makefile.in: + sed -i ... python/Makefile.in: Specifies that the libqt-mt.so library should be used to build the pyqt bindings. configure.py will fail if it finds both libqt-mt.so and libqt.so. - DO_NOT_COMPILE="smoke" ./configure: Disables the building - of the smoke module of kdebindings, as the build is - currently broken and no workaround has been found. - diff --git a/kde/devel/kdesdk.xml b/kde/devel/kdesdk.xml index a6690c462a..3c272ededb 100644 --- a/kde/devel/kdesdk.xml +++ b/kde/devel/kdesdk.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> diff --git a/kde/devel/kdevelop.xml b/kde/devel/kdevelop.xml index 4fa8235235..b9ebf4013a 100644 --- a/kde/devel/kdevelop.xml +++ b/kde/devel/kdevelop.xml @@ -5,10 +5,10 @@ %general-entities; - + - - + + ]> @@ -61,9 +61,8 @@ Recommended , - , - , and the apidox from - (if building API documentation). + , and + . Optional , @@ -100,17 +99,21 @@ --disable-dependency-tracking && make - + + If you wish to create the API documentation and you have + Doxygen and + Graphviz installed run the command + make apidox. + This package does not come with a test suite. Now, as the root user: -make install && -chown -v -R root:root &kde-dir;/kdevbdb +make install - If you created the API documentation, install it with: + If you created the API documentation, install it as the root user with: make install-apidox @@ -124,11 +127,16 @@ chown -v -R root:root &kde-dir;/kdevbdb line in the Makefile that causes the build of the API documentation to fail. + @@ -143,8 +151,7 @@ chown -v -R root:root &kde-dir;/kdevbdb kdevelop and supporting programs Supporting kdevelop libraries - $KDE_PREFIX/kdevbdb and supporting subdirectoies in - $KDE_PREFIX/{include,share} + Supporting subdirectories in $KDE_PREFIX/{include,share} diff --git a/kde/devel/kdewebdev.xml b/kde/devel/kdewebdev.xml index 37a7eafc9c..39e21f0624 100644 --- a/kde/devel/kdewebdev.xml +++ b/kde/devel/kdewebdev.xml @@ -5,10 +5,10 @@ %general-entities; - + - - + + ]>