summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-07-29 18:51:11 +0200
committersibel <lesibel at free dot fr>2010-07-29 18:51:11 +0200
commit222a3a19e144e34875dd263427e9a40e1e9883ec (patch)
tree28ba95cba963159346f1394dd495d3b50911516c
parent083f22ada5c522b20dc9bed706bd0da88a1b3071 (diff)
downloadnutyx-extra-222a3a19e144e34875dd263427e9a40e1e9883ec.tar.gz
nutyx-extra-222a3a19e144e34875dd263427e9a40e1e9883ec.tar.bz2
nutyx-extra-222a3a19e144e34875dd263427e9a40e1e9883ec.tar.xz
nutyx-extra-222a3a19e144e34875dd263427e9a40e1e9883ec.zip
maj de kdebase-workspace#4.4.95-1
-rw-r--r--kde/kdebase-workspace/.directory3
-rw-r--r--kde/kdebase-workspace/.footprint10
-rw-r--r--kde/kdebase-workspace/.md5sum2
-rwxr-xr-xkde/kdebase-workspace/Pkgfile8
-rw-r--r--kde/kdebase-workspace/fixpath.patch34
-rw-r--r--kde/kdebase-workspace/kdm36
-rw-r--r--kde/kdebase-workspace/kdm-zsh-profile.patch11
-rw-r--r--kde/kdebase-workspace/screensaver-sleep.patch12
-rw-r--r--kde/kdebase-workspace/terminate-server.patch11
9 files changed, 117 insertions, 10 deletions
diff --git a/kde/kdebase-workspace/.directory b/kde/kdebase-workspace/.directory
new file mode 100644
index 000000000..980805199
--- /dev/null
+++ b/kde/kdebase-workspace/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2010,7,20,10,15,19
+ViewMode=1
diff --git a/kde/kdebase-workspace/.footprint b/kde/kdebase-workspace/.footprint
index e15fe6130..8196297ce 100644
--- a/kde/kdebase-workspace/.footprint
+++ b/kde/kdebase-workspace/.footprint
@@ -170,11 +170,11 @@ drwxr-xr-x root/root usr/include/taskmanager/
-rw-r--r-- root/root usr/include/taskmanager/taskmanager_export.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/cmake/
-drwxr-xr-x root/root usr/lib/cmake/KDE4Workspace-4.4.92/
--rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.92/KDE4WorkspaceConfig.cmake
--rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.92/KDE4WorkspaceConfigVersion.cmake
--rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.92/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
--rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.92/KDE4WorkspaceLibraryTargets.cmake
+drwxr-xr-x root/root usr/lib/cmake/KDE4Workspace-4.4.95/
+-rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.95/KDE4WorkspaceConfig.cmake
+-rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.95/KDE4WorkspaceConfigVersion.cmake
+-rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.95/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
+-rw-r--r-- root/root usr/lib/cmake/KDE4Workspace-4.4.95/KDE4WorkspaceLibraryTargets.cmake
drwxr-xr-x root/root usr/lib/kconf_update_bin/
-rwxr-xr-x root/root usr/lib/kconf_update_bin/krdb_clearlibrarypath
-rwxr-xr-x root/root usr/lib/kconf_update_bin/kwin_update_default_rules
diff --git a/kde/kdebase-workspace/.md5sum b/kde/kdebase-workspace/.md5sum
index 52e4d77d3..9fe0019d3 100644
--- a/kde/kdebase-workspace/.md5sum
+++ b/kde/kdebase-workspace/.md5sum
@@ -2,6 +2,6 @@ acd5e67c3fb67e8eb8890da6846ec5da Attapu.tar.gz
abd031b2a8338f768d55596ebabc86c7 Xsession.kde4
994d7d29bb6b02afe5f158192e0019b1 absolute-nutyx.tar.gz
304ef605ca6fc78f538ef38f7ae93b26 ede.desktop
-8dc81a878fe23220bef7bf2d386779d9 kdebase-workspace-4.4.92.tar.bz2
+c033ad8d0cf200ee0e3ee0097c290956 kdebase-workspace-4.4.95.tar.bz2
802071ae9851617e991da7e3352b3e23 kdm-nutyx2009-2.tar.gz
48803caf97653dfcffb68b5ed9a184fd lxde.desktop
diff --git a/kde/kdebase-workspace/Pkgfile b/kde/kdebase-workspace/Pkgfile
index dc7a0ca70..faadbfdeb 100755
--- a/kde/kdebase-workspace/Pkgfile
+++ b/kde/kdebase-workspace/Pkgfile
@@ -6,13 +6,13 @@
name=kdebase-workspace
-version=4.4.92
+version=4.4.95
release=2
source=( ftp://ftp.kde.org/pub/kde/unstable/$version/src/$name-$version.tar.bz2 \
lxde.desktop ede.desktop Xsession.kde4 \
http://kiao.no-ip.info/NuTyX/files/kdm-nutyx2009-2.tar.gz\
http://kiao.no-ip.info/NuTyX/files/absolute-nutyx.tar.gz \
- http://kiao.no-ip.info/NuTyX/files/Attapu.tar.gz)
+ http://kiao.no-ip.info/NuTyX/files/Attapu.tar.gz )
build() {
mkdir -v -p $PKG/etc/kde
@@ -48,8 +48,8 @@ build() {
ln -sv Absolute-NuTyX \
$PKG/usr/share/apps/ksplash/Themes/Default
chown -R root:root $PKG
- mv $PKG/usr/etc/* $PKG/etc/
- rm -r $PKG/usr/etc
+# mv $PKG/usr/etc/* $PKG/etc/
+# rm -r $PKG/usr/etc
mkdir -p $PKG/var/lib/kdm
chown -R kdm:kdm $PKG/var/lib/kdm
}
diff --git a/kde/kdebase-workspace/fixpath.patch b/kde/kdebase-workspace/fixpath.patch
new file mode 100644
index 000000000..be2b8383e
--- /dev/null
+++ b/kde/kdebase-workspace/fixpath.patch
@@ -0,0 +1,34 @@
+--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100
++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100
+@@ -34,22 +34,6 @@
+ MALLOC_CHECK_=2
+ export MALLOC_CHECK_
+
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+- qbindir=`$bindir/kde4-config --qt-binaries`
+- if [ -n "$qbindir" ]; then
+- case $PATH in
+- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
+- *) PATH=$qbindir:$PATH; export PATH;;
+- esac
+- fi
+- case $PATH in
+- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+- *) PATH=$bindir:$PATH; export PATH;;
+- esac
+-fi
+-
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage
+@@ -206,7 +190,7 @@
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+
+-libpath=`kde4-config --path lib | tr : '\n'`
++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
+
+ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+ for file in "$prefix"*.sh; do
diff --git a/kde/kdebase-workspace/kdm b/kde/kdebase-workspace/kdm
new file mode 100644
index 000000000..799d58f4b
--- /dev/null
+++ b/kde/kdebase-workspace/kdm
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof -o %PPID /usr/bin/kdm)
+case "$1" in
+ start)
+ stat_busy "Starting KDE Desktop Manager"
+ [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon kdm
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping KDE Desktop Manager"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon kdm
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/kde/kdebase-workspace/kdm-zsh-profile.patch b/kde/kdebase-workspace/kdm-zsh-profile.patch
new file mode 100644
index 000000000..779456b39
--- /dev/null
+++ b/kde/kdebase-workspace/kdm-zsh-profile.patch
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
++++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
+@@ -662,7 +662,7 @@
+ " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
+ " zhome=${ZDOTDIR:-$HOME}\n"
+ " # zshenv is always sourced automatically.\n"
+-" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
++" [ -f /etc/profile ] && . /etc/profile\n"
+ " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
+ " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
+ " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/kde/kdebase-workspace/screensaver-sleep.patch b/kde/kdebase-workspace/screensaver-sleep.patch
new file mode 100644
index 000000000..c28cdf572
--- /dev/null
+++ b/kde/kdebase-workspace/screensaver-sleep.patch
@@ -0,0 +1,12 @@
+--- kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp.orig 2010-04-29 21:54:40.000000000 +0200
++++ kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp 2010-05-09 17:06:54.000000000 +0200
+@@ -571,7 +571,7 @@
+
+ void PowerDevilDaemon::buttonPressed(int but)
+ {
+- if (!checkIfCurrentSessionActive() || d->screenSaverIface->GetActive()) {
++ if (!checkIfCurrentSessionActive()) {
+ return;
+ }
+
+
diff --git a/kde/kdebase-workspace/terminate-server.patch b/kde/kdebase-workspace/terminate-server.patch
new file mode 100644
index 000000000..094591317
--- /dev/null
+++ b/kde/kdebase-workspace/terminate-server.patch
@@ -0,0 +1,11 @@
+--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200
++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100
+@@ -1448,7 +1448,7 @@
+
+ Key: TerminateServer
+ Type: bool
+-Default: false
++Default: true
+ User: core
+ Instance: #:*/!
+ Merge: xdm