From 6ec6e3ae2c2151243f2ad13e45e5802db3e12f05 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 26 Jul 2011 07:41:19 +0000
Subject: [PATCH] Update KDE - noch immer nicht komplett...

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6123 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/kde/kdeaccessibility     |  2 +-
 SysBuild/kde/kdeadmin             |  2 +-
 SysBuild/kde/kdeartwork           |  2 +-
 SysBuild/kde/kdebase              | 18 ++++++++++-------
 SysBuild/kde/kdebase-runtime      |  8 +++++---
 SysBuild/kde/kdebase-workspace    | 31 +++++++++++++++++++++++++----
 SysBuild/kde/kdeedu               |  2 +-
 SysBuild/kde/kdegames             |  2 +-
 SysBuild/kde/kdegraphics          |  2 +-
 SysBuild/kde/kdelibs              | 33 ++++++++++++++++++++++++++++++-
 SysBuild/kde/kdelibs-experimental |  2 +-
 SysBuild/kde/kdemultimedia        |  2 +-
 SysBuild/kde/kdenetwork           |  2 +-
 SysBuild/kde/kdepim               |  2 +-
 SysBuild/kde/kdepim-runtime       |  2 +-
 SysBuild/kde/kdepimlibs           |  6 ++++--
 SysBuild/kde/kdeplasma-addons     |  2 +-
 SysBuild/kde/kdetoys              |  2 +-
 SysBuild/kde/kdeutils             |  2 +-
 19 files changed, 93 insertions(+), 31 deletions(-)

diff --git a/SysBuild/kde/kdeaccessibility b/SysBuild/kde/kdeaccessibility
index 47546f7..2989133 100644
--- a/SysBuild/kde/kdeaccessibility
+++ b/SysBuild/kde/kdeaccessibility
@@ -101,7 +101,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdeadmin b/SysBuild/kde/kdeadmin
index 70c67fc..eeb1b47 100644
--- a/SysBuild/kde/kdeadmin
+++ b/SysBuild/kde/kdeadmin
@@ -103,7 +103,7 @@ mk32() {
 	done
 	sed -i "s%$%-L/usr/lib/sasl2 -lgssapiv2 -lgssapi_krb5%" kuser/CMakeFiles/kuser.dir/link.txt
 	sed -i "s%$%-L/usr/lib/sasl2 -lgssapiv2 -lgssapi_krb5%" kuser/CMakeFiles/kuser.dir/relink.txt
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdeartwork b/SysBuild/kde/kdeartwork
index 8a9da10..e167fe2 100644
--- a/SysBuild/kde/kdeartwork
+++ b/SysBuild/kde/kdeartwork
@@ -124,7 +124,7 @@ mk32() {
 		 kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/relink.txt; do
 		 sed -i "s%$% -L/usr/X11R7/lib -lGLU%" $i
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdebase b/SysBuild/kde/kdebase
index 41daa7b..829ad0e 100644
--- a/SysBuild/kde/kdebase
+++ b/SysBuild/kde/kdebase
@@ -96,16 +96,18 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
-	for i in apps/kinfocenter/opengl/CMakeFiles/kcm_opengl.dir/link.txt; do
-		sed -i "s/\(^.*\)/\1 -lGL -lGLU -L\/usr\/X11R7\/lib/" $i
-	done
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
+	for i in doc/kfind/kfind.1 \
+		 doc/konqueror/kbookmarkmerger.1; do
+		 touch $i
+	done
 	make DESTDIR=$TMPROOT install
 	cd ..
 	rm -r build
@@ -133,12 +135,14 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
-	for i in apps/kinfocenter/opengl/CMakeFiles/kcm_opengl.dir/link.txt; do
-		sed -i "s/\(^.*\)/\1 -lGL -lGLU -L\/usr\/X11R7\/$LIBDIR/" $i
+	make -j $NUMCPU
+	for i in doc/kfind/kfind.1 \
+		 doc/konqueror/kbookmarkmerger.1; do
+		 touch $i
 	done
-	make -k -j $NUMCPU
 	make DESTDIR=$TMPROOT install
 }
 
diff --git a/SysBuild/kde/kdebase-runtime b/SysBuild/kde/kdebase-runtime
index ad6ff44..0b5c0d4 100644
--- a/SysBuild/kde/kdebase-runtime
+++ b/SysBuild/kde/kdebase-runtime
@@ -85,15 +85,17 @@ mk32() {
 	      -DSYSCONF_INSTALL_DIR=/etc/kde \
 	      -DLIB_INSTALL_DIR=${KDEDIR}/lib \
 	      -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32} -L/lib -L/usr/lib -L/usr/X11R7/lib" \
-	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32} -L/lib -L/usr/lib -L/usr/X11R7/lib" \
+	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32} -L/opt/kde/lib -L/lib -L/usr/lib -L/usr/X11R7/lib" \
+	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32} -L/opt/kde/lib -L/lib -L/usr/lib -L/usr/X11R7/lib" \
 	      -DX11_LIBRARY=/usr/X11R7/lib \
 	      -DXEXT_LIBRARY=/usr/X11R7/lib \
 	      -DSAMBA_INCLUDE_DIR=/opt/samba/include \
 	      -DSAMBA_LIBRARIES=/opt/samba/lib/libsmbclient.so \
 	      -DLIB_SUFFIX= \
 	      .. &&
-	make -j $NUMCPU
+	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make -j $NUMCPU depend
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	make DESTDIR=$TMPROOT install
 	cd ..
 	rm -r build
diff --git a/SysBuild/kde/kdebase-workspace b/SysBuild/kde/kdebase-workspace
index 64e1324..bb85d71 100644
--- a/SysBuild/kde/kdebase-workspace
+++ b/SysBuild/kde/kdebase-workspace
@@ -100,14 +100,26 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
-	find kwin -name "*link.txt" sed -i "s/\(^.*$\)/\1 -lGL -L\/usr\/X11R7\/lib/" {} \;
+	for i in kwin \
+	         kcontrol \
+		 kinfocenter \
+		 krunner \
+		 ; do
+		find $i -name "*link.txt" -exec sed -i "s/\(^.*$\)/\1 -lGL -lGLU -L\/usr\/X11R7\/lib/" {} \;
+	done
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
+	for i in doc/plasma-desktop/tools/plasmaengineexplorer.1 \
+		 doc/plasma-desktop/tools/plasmoidviewer.1 \
+		 doc/plasma-desktop/tools/plasmapkg.1; do
+		 touch $i
+	done
 	make DESTDIR=$TMPROOT install
 	cd ..
 	rm -r build
@@ -138,13 +150,24 @@ mk() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX=${LIBSUFFIX}\
 	      .. &&
-	find kwin -name "*link.txt" -exec sed -i "s/\(^.*$\)/\1 -lGL -L\/usr\/X11R7\/$LIBDIR/" {} \;
-	find kcontrol -name "*link.txt" -exec sed -i "s/\(^.*$\)/\1 -lXi -L\/usr\/X11R7\/$LIBDIR/" {} \;
+	for i in kwin \
+	         kcontrol \
+		 kinfocenter \
+		 krunner \
+		 ; do
+		find $i -name "*link.txt" -exec sed -i "s/\(^.*$\)/\1 -lGL -lGLU -L\/usr\/X11R7\/${LIBDIR}/" {} \;
+	done
 	sed -i "s/\(group\.exclusive\)/\/\/\1/" ../kcontrol/kxkb/xklavier_adaptor.cpp
 	sed -i "s/\(XCI_PROP\)/\/\/\1/" ../kcontrol/kxkb/xklavier_adaptor.cpp
 	make -k -j $NUMCPU 
+	for i in doc/plasma-desktop/tools/plasmaengineexplorer.1 \
+		 doc/plasma-desktop/tools/plasmoidviewer.1 \
+		 doc/plasma-desktop/tools/plasmapkg.1; do
+		 touch $i
+	done
 	make DESTDIR=$TMPROOT install
 }
 
diff --git a/SysBuild/kde/kdeedu b/SysBuild/kde/kdeedu
index 3133d69..7ef2b8b 100644
--- a/SysBuild/kde/kdeedu
+++ b/SysBuild/kde/kdeedu
@@ -103,7 +103,7 @@ mk32() {
 	done
 	sed -i "s/$/-L \/usr\/X11R7\/lib -lGLU/" kalgebra/src/CMakeFiles/kalgebra.dir/link.txt
 	sed -i "s/$/-L \/usr\/X11R7\/lib -lGLU/" kalgebra/src/CMakeFiles/kalgebra.dir/relink.txt
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdegames b/SysBuild/kde/kdegames
index df9778d..b3073a9 100644
--- a/SysBuild/kde/kdegames
+++ b/SysBuild/kde/kdegames
@@ -107,7 +107,7 @@ mk32() {
 		 ksudoku/src/CMakeFiles/ksudoku.dir/relink.txt; do
 		sed -i "s%$% -L/usr/X11R7/lib -lGLU%" $i
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdegraphics b/SysBuild/kde/kdegraphics
index 47546f7..2989133 100644
--- a/SysBuild/kde/kdegraphics
+++ b/SysBuild/kde/kdegraphics
@@ -101,7 +101,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdelibs b/SysBuild/kde/kdelibs
index 54deef3..4bff609 100644
--- a/SysBuild/kde/kdelibs
+++ b/SysBuild/kde/kdelibs
@@ -98,9 +98,25 @@ mk32() {
 	      -DPHONON_LIBRARY:FILEPATH=/opt/kde/lib/libphonon.so \
 	      -DLIB_SUFFIX= \
 	      .. &&
-	sed -i "s/\(^.*$\)/\1 -lGL -L\/usr\/X11R7\/lib/" plasma/CMakeFiles/plasma.dir/link.txt
 	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
+	make depend
+	sed -i "s/\(^.*$\)/\1 -lGL -L\/usr\/X11R7\/lib/" plasma/CMakeFiles/plasma.dir/link.txt
 	make QMAKESPEC=linux-g++-32
+	for i in doc/checkXML/checkXML.1 \
+	         doc/kbuildsycoca4/kbuildsycoca4.8 \
+		 doc/kcookiejar4/kcookiejar4.8 \
+		 doc/kdeinit4/kdeinit4.8 \
+		 doc/kdeoptions/kdeoptions.7 \
+		 doc/makekdewidgets/makekdewidgets.1 \
+		 doc/meinproc4/meinproc4.8 \
+		 doc/qtoptions/qtoptions.7 \
+		 doc/kde4-config/kde4-config.1 \
+		 doc/kjs/kjs.1 \
+		 doc/kjscmd/kjscmd.1 \
+		 doc/kross/kross.1 \
+		 doc/kded4/kded4.8; do
+		 touch $i
+	done
 	make DESTDIR=$TMPROOT install
 	mv $TMPROOT/${KDEDIR}/bin/kde4-config{,-32}
 	cd ..
@@ -134,6 +150,21 @@ mk() {
 	      .. &&
 	sed -i "s/\(^.*$\)/\1 -lGL -L\/usr\/X11R7\/$LIBDIR/" plasma/CMakeFiles/plasma.dir/link.txt
 	make -j $NUMCPU
+	for i in doc/checkXML/checkXML.1 \
+	         doc/kbuildsycoca4/kbuildsycoca4.8 \
+		 doc/kcookiejar4/kcookiejar4.8 \
+		 doc/kdeinit4/kdeinit4.8 \
+		 doc/kdeoptions/kdeoptions.7 \
+		 doc/makekdewidgets/makekdewidgets.1 \
+		 doc/meinproc4/meinproc4.8 \
+		 doc/qtoptions/qtoptions.7 \
+		 doc/kde4-config/kde4-config.1 \
+		 doc/kjs/kjs.1 \
+		 doc/kjscmd/kjscmd.1 \
+		 doc/kross/kross.1 \
+		 doc/kded4/kded4.8; do
+		 touch $i
+	done
 	make DESTDIR=$TMPROOT install
 	if [ "$MK64BIT" == "true" ]; then
 		mv $TMPROOT/${KDEDIR}/bin/kde4-config{,-64}
diff --git a/SysBuild/kde/kdelibs-experimental b/SysBuild/kde/kdelibs-experimental
index 95f5060..142a0e6 100644
--- a/SysBuild/kde/kdelibs-experimental
+++ b/SysBuild/kde/kdelibs-experimental
@@ -97,7 +97,7 @@ mk32() {
 	      -DLIB_SUFFIX= \
 	      .. &&
 	find . -type f -exec sed -i "s/lib64/lib/g" {} \;
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	make DESTDIR=$TMPROOT install
 	cd ..
 	rm -r build
diff --git a/SysBuild/kde/kdemultimedia b/SysBuild/kde/kdemultimedia
index 47546f7..2989133 100644
--- a/SysBuild/kde/kdemultimedia
+++ b/SysBuild/kde/kdemultimedia
@@ -101,7 +101,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdenetwork b/SysBuild/kde/kdenetwork
index 2f92cc7..2469491 100644
--- a/SysBuild/kde/kdenetwork
+++ b/SysBuild/kde/kdenetwork
@@ -109,7 +109,7 @@ mk32() {
 	done
 	sed -i "s%$%-L/usr/lib/sasl2 -lgssapiv2 -lgssapi_krb5%" kopete/kopete/CMakeFiles/kopete_bin.dir/link.txt
 	sed -i "s%$%-L/usr/lib/sasl2 -lgssapiv2 -lgssapi_krb5%" kopete/kopete/CMakeFiles/kopete_bin.dir/relink.txt
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdepim b/SysBuild/kde/kdepim
index 04bbe4b..b9b3be0 100644
--- a/SysBuild/kde/kdepim
+++ b/SysBuild/kde/kdepim
@@ -107,7 +107,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdepim-runtime b/SysBuild/kde/kdepim-runtime
index a58af07..a591b8d 100644
--- a/SysBuild/kde/kdepim-runtime
+++ b/SysBuild/kde/kdepim-runtime
@@ -106,7 +106,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdepimlibs b/SysBuild/kde/kdepimlibs
index 23fe201..f592bb7 100644
--- a/SysBuild/kde/kdepimlibs
+++ b/SysBuild/kde/kdepimlibs
@@ -100,11 +100,13 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DQMAKESPEC=linux-g++-32 \
+	      -DCMAKE_SKIP_RPATH=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
 	find . -name "*link.txt" -exec sed -i "s/lib64/lib/g" {} \;
-	make -j $NUMCPU
-	make DESTDIR=$TMPROOT install
+	make -j $NUMCPU QMAKESPEC=linux-g++-32 USE_ARCH=32
+	make DESTDIR=$TMPROOT USE_ARCH=32 install
 	cd ..
 	rm -r build
 }
diff --git a/SysBuild/kde/kdeplasma-addons b/SysBuild/kde/kdeplasma-addons
index 46a4695..736ef6d 100644
--- a/SysBuild/kde/kdeplasma-addons
+++ b/SysBuild/kde/kdeplasma-addons
@@ -101,7 +101,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdetoys b/SysBuild/kde/kdetoys
index 47546f7..2989133 100644
--- a/SysBuild/kde/kdetoys
+++ b/SysBuild/kde/kdetoys
@@ -101,7 +101,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..
diff --git a/SysBuild/kde/kdeutils b/SysBuild/kde/kdeutils
index 47546f7..2989133 100644
--- a/SysBuild/kde/kdeutils
+++ b/SysBuild/kde/kdeutils
@@ -101,7 +101,7 @@ mk32() {
 	for i in build.make link.txt relink.txt; do
 		find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	done
-	make -j $NUMCPU
+	make -j $NUMCPU QMAKESPEC=linux-g++-32
 	find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
 	make DESTDIR=$TMPROOT install
 	cd ..