CompuExtreme/ViitorMake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update KDE - noch immer nicht komplett...

Browse Source 
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6123 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2011-07-26 07:41:19 +00:00
parent d084019d6c
commit 6ec6e3ae2c
19 changed files with 93 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SysBuild/kde/kdeaccessibility
View File

@ -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 ..

2
SysBuild/kde/kdeadmin
View File

@ -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 ..

2
SysBuild/kde/kdeartwork
View File

@ -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 ..

18
SysBuild/kde/kdebase
View File

@ -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
}

8
SysBuild/kde/kdebase-runtime
View File

@ -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

31
SysBuild/kde/kdebase-workspace
View File

@ -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
}

2
SysBuild/kde/kdeedu
View File

@ -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 ..

2
SysBuild/kde/kdegames
View File

@ -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 ..

2
SysBuild/kde/kdegraphics
View File

@ -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 ..

33
SysBuild/kde/kdelibs
View File

@ -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}

2
SysBuild/kde/kdelibs-experimental
View File

@ -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

2
SysBuild/kde/kdemultimedia
View File

@ -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 ..

2
SysBuild/kde/kdenetwork
View File

@ -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 ..

2
SysBuild/kde/kdepim
View File

@ -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 ..

2
SysBuild/kde/kdepim-runtime
View File

@ -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 ..

6
SysBuild/kde/kdepimlibs
View File

@ -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
}

2
SysBuild/kde/kdeplasma-addons
View File

@ -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 ..

2
SysBuild/kde/kdetoys
View File

@ -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 ..

2
SysBuild/kde/kdeutils
View File

@ -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 ..