summaryrefslogtreecommitdiff
path: root/pcr/lxdm-consolekit
diff options
context:
space:
mode:
Diffstat (limited to 'pcr/lxdm-consolekit')
-rw-r--r--pcr/lxdm-consolekit/PKGBUILD67
-rw-r--r--pcr/lxdm-consolekit/Xsession71
-rw-r--r--pcr/lxdm-consolekit/default-config.patch19
-rw-r--r--pcr/lxdm-consolekit/git-fixes.patch93
-rw-r--r--pcr/lxdm-consolekit/lxdm.install12
-rw-r--r--pcr/lxdm-consolekit/lxdm.pam8
6 files changed, 0 insertions, 270 deletions
diff --git a/pcr/lxdm-consolekit/PKGBUILD b/pcr/lxdm-consolekit/PKGBUILD
deleted file mode 100644
index 5c400a691..000000000
--- a/pcr/lxdm-consolekit/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributor (Arch): Balló György <ballogyor+arch at gmail dot com>
-# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor (Arch): AndyRTR <andyrtr@archlinux.org>
-# Contributor (Arch): kiefer <jorgelmadrid@gmail.com>
-# Maintainer (Arch): Aaditya Bagga <aaditya_gnulinux@zoho.com>
-# Maintainer: David P. <megver83@openmailbox.org>
-# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgname=lxdm-consolekit
-_pkgname=lxdm
-pkgver=0.5.3
-pkgrel=4
-pkgdesc='LXDM with consolekit support enabled'
-arch=('armv7h' 'i686' 'x86_64')
-url="https://sourceforge.net/projects/lxdm/"
-license=('GPL')
-depends=('gtk2' 'xorg-server' 'consolekit')
-makedepends=('intltool' 'iso-codes')
-optdepends=('gtk-engines: default GTK+ theme'
- 'iso-codes: show language names in language chooser'
- 'librsvg: display the default background')
-conflicts=('lxdm')
-provides=('lxdm')
-install=$_pkgname.install
-backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
- 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
- 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
-source=(https://downloads.sourceforge.net/lxdm/$_pkgname-$pkgver.tar.xz
- git-fixes.patch
- default-config.patch
- lxdm.pam
- Xsession)
-sha256sums=('4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f'
- 'ca3b225fb85a4e87ebb48e2b1a20f4bab86bf619a9ad927f08fdc819bc435bb4'
- '9d0a942d857b641927ce908dc05802339ada09577e591f7bec2cd7630c46f4be'
- '6f7b8078730c13a33ae8c82334d91f1c394e04cec6e667b2814cf7d3a0722957'
- 'c55316e0083c6a8c6fe195e009f271d7cce1da04f04e1640848d76630decfebe')
-
-prepare(){
- cd $_pkgname-$pkgver
-
- # Apply fixes from git
- patch -Np1 -i ../git-fixes.patch
-
- # Adjust Arch-specific settings
- patch -Np1 -i ../default-config.patch
-
- # Use our custom pam and Xsession files
- cp ../lxdm.pam pam/lxdm
- cp ../Xsession data/Xsession
-
- # Support for pulseaudio
- echo 'test -x /usr/bin/pax11publish && /usr/bin/pax11publish -r' >> data/PostLogout.in
-}
-
-build() {
- cd $_pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
- --sysconfdir=/etc --localstatedir=/var --with-systemdsystemunitdir=no
- make
-}
-
-package() {
- cd $_pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-}
diff --git a/pcr/lxdm-consolekit/Xsession b/pcr/lxdm-consolekit/Xsession
deleted file mode 100644
index deba98d72..000000000
--- a/pcr/lxdm-consolekit/Xsession
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# LXDM wrapper to run around X sessions.
-
-echo "Running X session wrapper"
-
-if [ $# -eq 1 -a -n "$1" ]; then
- LXSESSION=$1
-else
-# default session
- LXSESSION=/usr/bin/startlxde
-fi
-
-# Load profile
-for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
- if [ -f "$file" ]; then
- echo "Loading profile from $file";
- . "$file"
- fi
-done
-
-# Load resources
-for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
- if [ -f "$file" ]; then
- echo "Loading resource: $file"
- xrdb -nocpp -merge "$file"
- fi
-done
-
-# Load keymaps
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
- if [ -f "$file" ]; then
- echo "Loading keymap: $file"
- setxkbmap `cat "$file"`
- XKB_IN_USE=yes
- fi
-done
-
-# Load xmodmap if not using XKB
-if [ -z "$XKB_IN_USE" ]; then
- for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
- if [ -f "$file" ]; then
- echo "Loading modmap: $file"
- xmodmap "$file"
- fi
- done
-fi
-
-unset XKB_IN_USE
-
-# Run all system xinitrc shell scripts.
-xinitdir="/etc/X11/xinit/xinitrc.d"
-if [ -d "$xinitdir" ]; then
- for script in $xinitdir/*; do
- echo "Loading xinit script $script"
- if [ -x "$script" -a ! -d "$script" ]; then
- . "$script"
- fi
- done
-fi
-
-echo "X session wrapper complete, running session $LXSESSION"
-
-if ! [ -z "$XDG_SESSION_COOKIE" ]; then
- CK_XINIT_SESSION=
-elif [ -x /usr/bin/ck-launch-session ]; then
- CK_XINIT_SESSION="/usr/bin/ck-launch-session"
-fi
-
-exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""
-
diff --git a/pcr/lxdm-consolekit/default-config.patch b/pcr/lxdm-consolekit/default-config.patch
deleted file mode 100644
index 9aad1d786..000000000
--- a/pcr/lxdm-consolekit/default-config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in
---- lxdm.orig/data/lxdm.conf.in 2013-08-30 17:56:16.097006000 +0200
-+++ lxdm/data/lxdm.conf.in 2013-09-04 01:54:12.942117085 +0200
-@@ -34,13 +34,13 @@
- gtk_theme=Clearlooks
-
- ## background of the greeter
--bg=/usr/share/backgrounds/default.png
-+# bg=/usr/share/backgrounds/default.png
-
- ## if show bottom pane
- bottom_pane=1
-
- ## if show language select control
--lang=1
-+lang=0
-
- ## if show keyboard layout select control
- keyboard=0
diff --git a/pcr/lxdm-consolekit/git-fixes.patch b/pcr/lxdm-consolekit/git-fixes.patch
deleted file mode 100644
index ee4f2147d..000000000
--- a/pcr/lxdm-consolekit/git-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
-index 179f0d6..f8e6432 100644
---- a/data/themes/Industrial/gtk.css
-+++ b/data/themes/Industrial/gtk.css
-@@ -17,6 +17,7 @@
- color: #000000;
- }
-
-+#bottom_pane label,
- #bottom_pane GtkLabel {
- font: Sans 12;
- color: #9E9D9B;
-diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c
-index 1abbefa..ad3267a 100644
---- a/src/greeter-gdk.c
-+++ b/src/greeter-gdk.c
-@@ -22,6 +22,7 @@
-
- #define XLIB_ILLEGAL_ACCESS
-
-+#include <gtk/gtk.h>
- #include <gdk/gdk.h>
- #include <gdk/gdkx.h>
- #include <gdk/gdkkeysyms.h>
-@@ -88,12 +89,14 @@ static void on_ui_expose(void)
- }
-
- cr=gdk_cairo_create(win);
-+#if GTK_CHECK_VERSION(3,0,0)
- cairo_pattern_t *pattern=gdk_window_get_background_pattern(win);
- if(pattern)
- {
- cairo_set_source(cr,pattern);
- cairo_paint(cr);
- }
-+#endif
-
- gdk_cairo_set_source_color(cr, &bg);
- cairo_rectangle(cr, rc.x, rc.y, rc.width, rc.height);
-diff --git a/src/greeter.c b/src/greeter.c
-index 10b7f3f..03503b6 100644
---- a/src/greeter.c
-+++ b/src/greeter.c
-@@ -146,7 +146,7 @@ static void switch_to_input_user(void)
- if(user_list_scrolled)
- gtk_widget_show(user_list_scrolled);
- else
-- gtk_widget_hide(user_list);
-+ gtk_widget_show(user_list);
- gtk_widget_grab_focus(user_list);
- }
- else
-diff --git a/src/lxdm.c b/src/lxdm.c
-index a37f051..722936f 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -488,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s)
- {
- arg[arc++] = g_strdup("-nolisten");
- arg[arc++] = g_strdup("tcp");
-+ } else {
-+ arg[arc++] = g_strdup("-listen");
-+ arg[arc++] = g_strdup("tcp");
- }
- if(!novtswitch)
- {
-@@ -750,7 +755,13 @@ static char ** create_client_auth(struct passwd *pw,char **env)
- if(xauth_write_file(authfile,s->display,s->mcookie)==-1)
- {
- g_free(authfile);
-- authfile = g_strdup_printf("/var/run/lxdm/.Xauth%d",pw->pw_uid);
-+
-+ gchar *authdir = g_strdup_printf("/var/run/lxdm/%d", pw->pw_uid);
-+ g_mkdir_with_parents(authdir, S_IRWXU);
-+ chown(authdir, pw->pw_uid, pw->pw_gid);
-+
-+ authfile = g_strdup_printf("%s/.Xauthority", authdir);
-+ g_free(authdir);
- remove(authfile);
- xauth_write_file(authfile,s->display,s->mcookie);
- }
-@@ -956,6 +967,11 @@ static void on_xserver_stop(void *data,int pid, int status)
- s->dpy=NULL;
- ui_drop();
- lxdm_startx(s);
-+ #ifndef DISABLE_XAUTH
-+ char temp[256];
-+ sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
-+ setenv("XAUTHORITY",temp,1);
-+ #endif
- ui_prepare();
- lxsession_set_active(s);
- }
diff --git a/pcr/lxdm-consolekit/lxdm.install b/pcr/lxdm-consolekit/lxdm.install
deleted file mode 100644
index c07e7c6ca..000000000
--- a/pcr/lxdm-consolekit/lxdm.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- getent passwd lxdm > /dev/null 2>&1 && \
- usermod -L -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
- useradd -rM -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm
- mkdir -p /var/lib/lxdm
- chown lxdm:lxdm /var/lib/lxdm
- chmod 700 /var/lib/lxdm
-}
-
-post_upgrade() {
- post_install
-}
diff --git a/pcr/lxdm-consolekit/lxdm.pam b/pcr/lxdm-consolekit/lxdm.pam
deleted file mode 100644
index 39c77d131..000000000
--- a/pcr/lxdm-consolekit/lxdm.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth include system-login
--auth optional pam_gnome_keyring.so
-account include system-login
-password include system-login
-session include system-login
--session optional pam_gnome_keyring.so auto_start
--session optional pam_ck_connector.so nox11