summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/gdm/README2
-rw-r--r--system/gdm/README.SLACKWARE32
-rw-r--r--system/gdm/gdm.SlackBuild3
3 files changed, 1 insertions, 36 deletions
diff --git a/system/gdm/README b/system/gdm/README
index 118dc4ea64..dbca3fde17 100644
--- a/system/gdm/README
+++ b/system/gdm/README
@@ -6,6 +6,4 @@ If you want xscreensaver to recognize gdm and add a "New Login" button
to the unlock screen, add this line to your ~/.xscreensaver file:
newLoginCommand: gdmflexiserver -ls
-See README.SLACKWARE for some (hopefully) soon to be outdated information.
-
This requires libgnomecanvas.
diff --git a/system/gdm/README.SLACKWARE b/system/gdm/README.SLACKWARE
deleted file mode 100644
index 6233b97c99..0000000000
--- a/system/gdm/README.SLACKWARE
+++ /dev/null
@@ -1,32 +0,0 @@
-Since Slackware now includes polkit and consolekit, gdm will "poke" consolekit
-when your session starts. This is a good thing, but since Slackware patched
-the system xinitrc scripts so start kde and xfce with ck-launch-session, you
-will notice that there are now *two* registered consolekit sessions (using
-ck-list-sessions). You will also notice that one of them is marked as
-inactive, and polkit is setup so that inactive sessions are not allowed to
-do anything (there's not even an opportunity to authenticate). Therefore,
-anything parented from that inactive session is not going to be able to
-authenticate using polkit.
-
-Thankfully, there's an easy solution: edit the kde and xfce xinitrc scripts
-to look like this at the relevant spots:
-
-In /etc/X11/xinit/xinitrc.xfce:
- if [ -z $DESKTOP_SESSION ]; then
- ck-launch-session $xfcesm
- else
- $xfcesm
- fi
-
-In /etc/X11/xinit/xinitrc.kde:
- # Start the window manager:
- if [ -z $DESKTOP_SESSION ]; then
- ck-launch-session startkde
- else
- startkde
- fi
-
-This will cause sessions launched from gdm and kdm to *not* call
-ck-launch-session when invoking the relevant desktop environment.
-Pat is aware of this and will hopefully be getting fixes in /patches :-)
-
diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild
index 6c27023580..727b618089 100644
--- a/system/gdm/gdm.SlackBuild
+++ b/system/gdm/gdm.SlackBuild
@@ -11,7 +11,7 @@
PRGNAM=gdm
VERSION=${VERSION:-2.20.11}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -102,7 +102,6 @@ cp -a \
AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README* TODO docs/C/* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc