diff options
| -rw-r--r-- | kde/kdebase-workspace/.footprint.i686 | 21 | ||||
| -rw-r--r-- | kde/kdebase-workspace/.footprint.x86_64 | 21 | ||||
| -rw-r--r-- | kde/kdebase-workspace/.md5sum.i686 | 3 | ||||
| -rw-r--r-- | kde/kdebase-workspace/.md5sum.x86_64 | 3 | ||||
| -rwxr-xr-x | kde/kdebase-workspace/Pkgfile | 12 | ||||
| -rwxr-xr-x | kde/kdebase-workspace/Xsession.kde4 | 64 | ||||
| -rwxr-xr-x | kde/kdebase-workspace/ede.desktop | 11 | ||||
| -rw-r--r-- | kde/kdebase-workspace/fixpath.patch | 34 | ||||
| -rw-r--r-- | kde/kdebase-workspace/kdebase-workspace-4.6.0-fix-MALLOC_CHECK.patch | 23 | ||||
| -rw-r--r-- | kde/kdebase-workspace/kdebase-workspace-4.6.0-fix-plasma-crash-on-exit.patch | 127 | ||||
| -rw-r--r-- | kde/kdebase-workspace/kdm | 36 | ||||
| -rwxr-xr-x | kde/kdebase-workspace/lxde.desktop | 10 | ||||
| -rwxr-xr-x | kde/kdebase-workspace/pre-install | 4 |
13 files changed, 21 insertions, 348 deletions
diff --git a/kde/kdebase-workspace/.footprint.i686 b/kde/kdebase-workspace/.footprint.i686 index 0c33664e6..3f1ccacc8 100644 --- a/kde/kdebase-workspace/.footprint.i686 +++ b/kde/kdebase-workspace/.footprint.i686 @@ -1,14 +1,13 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/dbus-1/ -drwxr-xr-x root/root etc/dbus-1/system.d/ --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.fontinst.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf drwxr-xr-x root/root etc/kde/ --rw-r--r-- root/root etc/kde/kdmrc --rw-r--r-- root/root etc/ksysguarddrc +drwxr-xr-x root/root etc/kde/dbus-1/ +drwxr-xr-x root/root etc/kde/dbus-1/system.d/ +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.fontinst.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf +-rw-r--r-- root/root etc/kde/ksysguarddrc drwxr-xr-x root/root etc/pam.d/ -rw-r--r-- root/root etc/pam.d/kde -rw-r--r-- root/root etc/pam.d/kde-np @@ -684,7 +683,6 @@ drwxr-xr-x root/root usr/share/apps/kdm/sessions/ -rw-r--r-- root/root usr/share/apps/kdm/sessions/ctwm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/cwwm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/e16.desktop --rw-r--r-- root/root usr/share/apps/kdm/sessions/ede.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/enlightenment.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/evilwm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/fluxbox.desktop @@ -699,7 +697,6 @@ drwxr-xr-x root/root usr/share/apps/kdm/sessions/ -rw-r--r-- root/root usr/share/apps/kdm/sessions/kde-plasma.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/larswm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/lwm.desktop --rw-r--r-- root/root usr/share/apps/kdm/sessions/lxde.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/matchbox.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/metacity.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/mwm.desktop @@ -1124,7 +1121,7 @@ drwxr-xr-x root/root usr/share/config/kdm/ -rwxr-xr-x root/root usr/share/config/kdm/Xstartup -rwxr-xr-x root/root usr/share/config/kdm/Xwilling -rw-r--r-- root/root usr/share/config/kdm/backgroundrc -lrwxrwxrwx root/root usr/share/config/kdm/kdmrc -> /etc/kde/kdmrc +-rw-r--r-- root/root usr/share/config/kdm/kdmrc drwxr-xr-x root/root usr/share/config/kdm/sessions/ -rw-r--r-- root/root usr/share/config/ksplash.knsrc -rw-r--r-- root/root usr/share/config/ksysguard.knsrc diff --git a/kde/kdebase-workspace/.footprint.x86_64 b/kde/kdebase-workspace/.footprint.x86_64 index 0c33664e6..3f1ccacc8 100644 --- a/kde/kdebase-workspace/.footprint.x86_64 +++ b/kde/kdebase-workspace/.footprint.x86_64 @@ -1,14 +1,13 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/dbus-1/ -drwxr-xr-x root/root etc/dbus-1/system.d/ --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.fontinst.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf --rw-r--r-- root/root etc/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf drwxr-xr-x root/root etc/kde/ --rw-r--r-- root/root etc/kde/kdmrc --rw-r--r-- root/root etc/ksysguarddrc +drwxr-xr-x root/root etc/kde/dbus-1/ +drwxr-xr-x root/root etc/kde/dbus-1/system.d/ +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.fontinst.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf +-rw-r--r-- root/root etc/kde/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf +-rw-r--r-- root/root etc/kde/ksysguarddrc drwxr-xr-x root/root etc/pam.d/ -rw-r--r-- root/root etc/pam.d/kde -rw-r--r-- root/root etc/pam.d/kde-np @@ -684,7 +683,6 @@ drwxr-xr-x root/root usr/share/apps/kdm/sessions/ -rw-r--r-- root/root usr/share/apps/kdm/sessions/ctwm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/cwwm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/e16.desktop --rw-r--r-- root/root usr/share/apps/kdm/sessions/ede.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/enlightenment.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/evilwm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/fluxbox.desktop @@ -699,7 +697,6 @@ drwxr-xr-x root/root usr/share/apps/kdm/sessions/ -rw-r--r-- root/root usr/share/apps/kdm/sessions/kde-plasma.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/larswm.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/lwm.desktop --rw-r--r-- root/root usr/share/apps/kdm/sessions/lxde.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/matchbox.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/metacity.desktop -rw-r--r-- root/root usr/share/apps/kdm/sessions/mwm.desktop @@ -1124,7 +1121,7 @@ drwxr-xr-x root/root usr/share/config/kdm/ -rwxr-xr-x root/root usr/share/config/kdm/Xstartup -rwxr-xr-x root/root usr/share/config/kdm/Xwilling -rw-r--r-- root/root usr/share/config/kdm/backgroundrc -lrwxrwxrwx root/root usr/share/config/kdm/kdmrc -> /etc/kde/kdmrc +-rw-r--r-- root/root usr/share/config/kdm/kdmrc drwxr-xr-x root/root usr/share/config/kdm/sessions/ -rw-r--r-- root/root usr/share/config/ksplash.knsrc -rw-r--r-- root/root usr/share/config/ksysguard.knsrc diff --git a/kde/kdebase-workspace/.md5sum.i686 b/kde/kdebase-workspace/.md5sum.i686 index c4a893eaa..b72efdcbb 100644 --- a/kde/kdebase-workspace/.md5sum.i686 +++ b/kde/kdebase-workspace/.md5sum.i686 @@ -1,8 +1,5 @@ 5a8c274168dcacd657c1f0c6fe4f72a0 Pakxe.tar.bz2 -2b0d7acd26d472a7295d489973672094 Xsession.kde4 -304ef605ca6fc78f538ef38f7ae93b26 ede.desktop 98068b12ed7ea671ae631ff5893249a2 kde-np.pam d388941b3e86b14ce25a72be945ed3d9 kde.pam c544190b7f145df58f0e0bad5b46e0b3 kdebase-workspace-4.6.2.tar.bz2 367a3538f54db71f108b34cfa31088ac kscreensaver.pam -48803caf97653dfcffb68b5ed9a184fd lxde.desktop diff --git a/kde/kdebase-workspace/.md5sum.x86_64 b/kde/kdebase-workspace/.md5sum.x86_64 index 4e46d00e1..b72efdcbb 100644 --- a/kde/kdebase-workspace/.md5sum.x86_64 +++ b/kde/kdebase-workspace/.md5sum.x86_64 @@ -1,8 +1,5 @@ 5a8c274168dcacd657c1f0c6fe4f72a0 Pakxe.tar.bz2 -2e3f3525323055c74da28cd431e35b0e Xsession.kde4 -304ef605ca6fc78f538ef38f7ae93b26 ede.desktop 98068b12ed7ea671ae631ff5893249a2 kde-np.pam d388941b3e86b14ce25a72be945ed3d9 kde.pam c544190b7f145df58f0e0bad5b46e0b3 kdebase-workspace-4.6.2.tar.bz2 367a3538f54db71f108b34cfa31088ac kscreensaver.pam -48803caf97653dfcffb68b5ed9a184fd lxde.desktop diff --git a/kde/kdebase-workspace/Pkgfile b/kde/kdebase-workspace/Pkgfile index 88eceaa78..45df3ecb5 100755 --- a/kde/kdebase-workspace/Pkgfile +++ b/kde/kdebase-workspace/Pkgfile @@ -8,9 +8,8 @@ name=kdebase-workspace version=4.6.2 -release=2 +release=3 source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 \ - lxde.desktop ede.desktop Xsession.kde4 \ http://nutyx.meticul.eu/files/patchs/$name/Pakxe.tar.bz2 \ kde.pam kde-np.pam kscreensaver.pam) @@ -31,20 +30,15 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ - -DWITH_PolkitQt=OFF + -DKDE_DEFAULT_HOME=.kde \ + -DSYSCONF_INSTALL_DIR=/etc/kde make make DESTDIR=$PKG install cd .. - install -m644 ../{ede.desktop,lxde.desktop} \ - $PKG/usr/share/apps/kdm/sessions/ - install -m755 ../Xsession.kde4 \ - $PKG/usr/share/config/kdm/Xsession sed -i "s/AllowRootLogin=false/AllowRootLogin=true/" \ $PKG/usr/share/config/kdm/kdmrc sed -i "s/#Language=de_DE/Language=fr_FR/" $PKG/usr/share/config/kdm/kdmrc - mv $PKG/usr/share/config/kdm/kdmrc $PKG/etc/kde/kdmrc - ln -sv /etc/kde/kdmrc $PKG/usr/share/config/kdm/kdmrc mv ../Pakxe $PKG/usr/share/wallpapers/ chown -R root:root $PKG diff --git a/kde/kdebase-workspace/Xsession.kde4 b/kde/kdebase-workspace/Xsession.kde4 deleted file mode 100755 index d50f24565..000000000 --- a/kde/kdebase-workspace/Xsession.kde4 +++ /dev/null @@ -1,64 +0,0 @@ -#! /bin/sh -# Xsession - run as user - -session=$1 - -# Note that the respective logout scripts are not sourced. -case $SHELL in - */bash) - [ -z "$BASH" ] && exec $SHELL $0 "$@" - set +o posix - [ -f /etc/profile ] && . /etc/profile - if [ -f $HOME/.bash_profile ]; then - . $HOME/.bash_profile - elif [ -f $HOME/.bash_login ]; then - . $HOME/.bash_login - elif [ -f $HOME/.profile ]; then - . $HOME/.profile - fi - ;; - */zsh) - [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" - emulate -R zsh - [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc - zhome=${ZDOTDIR:-$HOME} - # zshenv is always sourced automatically. - [ -f $zdir/zprofile ] && . $zdir/zprofile - [ -f $zhome/.zprofile ] && . $zhome/.zprofile - [ -f $zdir/zlogin ] && . $zdir/zlogin - [ -f $zhome/.zlogin ] && . $zhome/.zlogin - ;; - */csh|*/tcsh) - # [t]cshrc is always sourced automatically. - # Note that sourcing csh.login after .cshrc is non-standard. - xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` - $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp" - . $xsess_tmp - rm -f $xsess_tmp - ;; - *) # Plain sh, ksh, and anything we do not know. - [ -f /etc/profile ] && . /etc/profile - [ -f $HOME/.profile ] && . $HOME/.profile - ;; -esac - -[ -f /etc/xprofile ] && . /etc/xprofile -[ -f $HOME/.xprofile ] && . $HOME/.xprofile -case $session in - "") - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - ;; - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - custom) - exec $HOME/.xsession - ;; - default) - exec dbus-launch startkde - ;; - *) - eval exec "$session" - ;; -esac -exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/kde/kdebase-workspace/ede.desktop b/kde/kdebase-workspace/ede.desktop deleted file mode 100755 index 436600d2d..000000000 --- a/kde/kdebase-workspace/ede.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=XSession -Exec=/usr/bin/startede -TryExec=/usr/bin/startede -Name=EDE -Name[eo]=Facoj 4 -Name[hi]=एक्सएफसीई4 -Name[sv]=Ede -Name[te]=ఎక్స్ ఎఫ్ సి ఈ 4 -Comment=Equinox. A very light Desktop Environment
\ No newline at end of file diff --git a/kde/kdebase-workspace/fixpath.patch b/kde/kdebase-workspace/fixpath.patch deleted file mode 100644 index be2b8383e..000000000 --- a/kde/kdebase-workspace/fixpath.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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/kdebase-workspace-4.6.0-fix-MALLOC_CHECK.patch b/kde/kdebase-workspace/kdebase-workspace-4.6.0-fix-MALLOC_CHECK.patch deleted file mode 100644 index a0448a8ba..000000000 --- a/kde/kdebase-workspace/kdebase-workspace-4.6.0-fix-MALLOC_CHECK.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: startkde.cmake -=================================================================== ---- startkde.cmake (revision 1217283) -+++ startkde.cmake (revision 1217284) -@@ -36,18 +36,6 @@ - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# Enable lightweight memory corruption checker if not already set --# -- this is for trunk only, we remove it for releases --if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then -- # Extract the first two components of the version from the output. -- glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q') -- -- MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher. -- test $glibc_version \> 2.08 && MALLOC_CHECK_=3 -- -- export MALLOC_CHECK_ --fi -- - # 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 diff --git a/kde/kdebase-workspace/kdebase-workspace-4.6.0-fix-plasma-crash-on-exit.patch b/kde/kdebase-workspace/kdebase-workspace-4.6.0-fix-plasma-crash-on-exit.patch deleted file mode 100644 index 41561858d..000000000 --- a/kde/kdebase-workspace/kdebase-workspace-4.6.0-fix-plasma-crash-on-exit.patch +++ /dev/null @@ -1,127 +0,0 @@ -commit 92f71adb8bb6e46d4a3187ab8824c859312e9136 -Author: Aaron Seigo <aseigo@kde.org> -Date: Tue Feb 1 12:54:44 2011 -0800 - - try to avoid doing any work when we are deleting - -diff --git a/plasma/generic/applets/notifications/ui/notificationgroup.cpp b/plasma/generic/applets/notifications/ui/notificationgroup.cpp -index 1f7c0b8..6bbf43c 100644 ---- a/plasma/generic/applets/notifications/ui/notificationgroup.cpp -+++ b/plasma/generic/applets/notifications/ui/notificationgroup.cpp -@@ -66,6 +66,8 @@ NotificationGroup::NotificationGroup(Extender *parent, uint groupId) - - NotificationGroup::~NotificationGroup() - { -+ m_extenderItemsForNotification.clear(); -+ m_notificationForExtenderItems.clear(); - qDeleteAll(m_notifications); - } - -@@ -137,6 +139,11 @@ void NotificationGroup::addNotification(Notification *notification) - - void NotificationGroup::extenderItemDestroyed(Plasma::ExtenderItem *object) - { -+ if (m_extenderItemsForNotification.isEmpty()) { -+ // either we aren't tracking this notification or else we're being deleted -+ return; -+ } -+ - Notification *n = m_notificationForExtenderItems.value(object); - - if (n) { -@@ -148,10 +155,16 @@ void NotificationGroup::extenderItemDestroyed(Plasma::ExtenderItem *object) - - void NotificationGroup::removeNotification(Notification *notification) - { -+ if (m_extenderItemsForNotification.isEmpty()) { -+ // either we aren't tracking this notification or else we're being deleted -+ return; -+ } -+ - Plasma::ExtenderItem *item = m_extenderItemsForNotification.value(notification); - if (item) { - m_notificationForExtenderItems.remove(item); - } -+ - m_extenderItemsForNotification.remove(notification); - m_notifications.removeAll(notification); - QString applicationName = m_appForNotification.value(notification); -diff --git a/plasma/generic/applets/notifications/ui/notifications.cpp b/plasma/generic/applets/notifications/ui/notifications.cpp -index 9b1a7c0..c7aa6dd 100644 ---- a/plasma/generic/applets/notifications/ui/notifications.cpp -+++ b/plasma/generic/applets/notifications/ui/notifications.cpp -@@ -106,6 +106,9 @@ Notifications::~Notifications() - { - // stop listening to the manager - disconnect(m_manager, 0, this, 0); -+ if (m_notificationStackDialog) { -+ disconnect(m_notificationStackDialog, 0, this, 0); -+ } - - foreach (Notification *notification, m_manager->notifications()) { - // we don't want a destroyed managed after the destruction of manager -@@ -342,10 +345,10 @@ void Notifications::initExtenderItem(Plasma::ExtenderItem *extenderItem) - return; - } - -- if (extenderItem->config().readEntry("type", "") == "job") { -+ if (extenderItem->config().readEntry("type", QString()) == "job") { - extenderItem->setWidget(new JobWidget(0, extenderItem)); -- //unknown type, this should never happen - } else { -+ //unknown type, this should never happen - extenderItem->destroy(); - } - -commit 1fc6c46a49695ec6ad6cd80a8459c5c083de8e06 -Author: Aaron Seigo <aseigo@kde.org> -Date: Tue Feb 1 12:54:25 2011 -0800 - - make them all uniqueconnections - -diff --git a/plasma/generic/applets/notifications/ui/notificationstack.cpp b/plasma/generic/applets/notifications/ui/notificationstack.cpp -index 2f68961..3b53559 100644 ---- a/plasma/generic/applets/notifications/ui/notificationstack.cpp -+++ b/plasma/generic/applets/notifications/ui/notificationstack.cpp -@@ -54,11 +54,9 @@ NotificationStack::~NotificationStack() - void NotificationStack::addNotification(Notification *notification) - { - m_canDismissTimer->start(1000); -- connect(notification, SIGNAL(notificationDestroyed(Notification *)), this, SLOT(removeNotification(Notification *))); -- connect(notification, SIGNAL(expired(Notification *)), this, SLOT(delayedRemoveNotification(Notification *))); -- -- disconnect(notification, SIGNAL(changed(Notification *)), this, SLOT(notificationChanged(Notification *))); -- connect(notification, SIGNAL(changed(Notification *)), this, SLOT(notificationChanged(Notification *))); -+ connect(notification, SIGNAL(notificationDestroyed(Notification *)), this, SLOT(removeNotification(Notification *)), Qt::UniqueConnection); -+ connect(notification, SIGNAL(expired(Notification *)), this, SLOT(delayedRemoveNotification(Notification *)), Qt::UniqueConnection); -+ connect(notification, SIGNAL(changed(Notification *)), this, SLOT(notificationChanged(Notification *)), Qt::UniqueConnection); - - NotificationWidget *notificationWidget = new NotificationWidget(notification, this); - notificationWidget->installEventFilter(this); -commit f0f66f023e6f2896bcc2ea67d7922fc0745ff7b5 -Author: Aaron Seigo <aseigo@kde.org> -Date: Tue Feb 1 12:54:10 2011 -0800 - - simplification - -diff --git a/plasma/generic/applets/notifications/ui/notificationwidget.cpp b/plasma/generic/applets/notifications/ui/notificationwidget.cpp -index 7764ede..3f87cfe 100644 ---- a/plasma/generic/applets/notifications/ui/notificationwidget.cpp -+++ b/plasma/generic/applets/notifications/ui/notificationwidget.cpp -@@ -43,7 +43,6 @@ - - #include <Plasma/Animation> - #include <Plasma/Animator> --#include <Plasma/Extender> - #include <Plasma/Frame> - #include <Plasma/IconWidget> - #include <Plasma/Label> -@@ -170,7 +169,7 @@ NotificationWidget::NotificationWidget(Notification *notification, QGraphicsWidg - d->notification = notification; - - connect(d->signalMapper, SIGNAL(mapped(const QString &)), -- d->notification.data(), SLOT(triggerAction(const QString &))); -+ notification, SLOT(triggerAction(const QString &))); - connect(notification, SIGNAL(changed()), - this, SLOT(updateNotification())); - connect(notification, SIGNAL(destroyed()), diff --git a/kde/kdebase-workspace/kdm b/kde/kdebase-workspace/kdm deleted file mode 100644 index 799d58f4b..000000000 --- a/kde/kdebase-workspace/kdm +++ /dev/null @@ -1,36 +0,0 @@ -#!/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/lxde.desktop b/kde/kdebase-workspace/lxde.desktop deleted file mode 100755 index 7e067e2b6..000000000 --- a/kde/kdebase-workspace/lxde.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=lxde -Name[fr]= lxde -Comment[fr]=Slectionner cette session pour utiliser lxde comme environnment graphique - -Exec=startlxde -Icon= -Type=Application - diff --git a/kde/kdebase-workspace/pre-install b/kde/kdebase-workspace/pre-install deleted file mode 100755 index 8ee4a87f7..000000000 --- a/kde/kdebase-workspace/pre-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -if ( pkginfo -i | grep kdebase3 > /dev/null ) ; then - pkgrm kdebase3 -fi |