[arch-commits] Commit in lxdm/repos (22 files)

Balló György bgyorgy at archlinux.org
Wed Feb 17 01:15:47 UTC 2016 

    Date: Wednesday, February 17, 2016 @ 02:15:46
  Author: bgyorgy
Revision: 161927

archrelease: copy trunk to community-i686, community-x86_64

Added:
  lxdm/repos/community-i686/PKGBUILD
    (from rev 161926, lxdm/trunk/PKGBUILD)
  lxdm/repos/community-i686/Xsession
    (from rev 161926, lxdm/trunk/Xsession)
  lxdm/repos/community-i686/default-config.patch
    (from rev 161926, lxdm/trunk/default-config.patch)
  lxdm/repos/community-i686/lxdm.install
    (from rev 161926, lxdm/trunk/lxdm.install)
  lxdm/repos/community-i686/lxdm.pam
    (from rev 161926, lxdm/trunk/lxdm.pam)
  lxdm/repos/community-x86_64/PKGBUILD
    (from rev 161926, lxdm/trunk/PKGBUILD)
  lxdm/repos/community-x86_64/Xsession
    (from rev 161926, lxdm/trunk/Xsession)
  lxdm/repos/community-x86_64/default-config.patch
    (from rev 161926, lxdm/trunk/default-config.patch)
  lxdm/repos/community-x86_64/lxdm.install
    (from rev 161926, lxdm/trunk/lxdm.install)
  lxdm/repos/community-x86_64/lxdm.pam
    (from rev 161926, lxdm/trunk/lxdm.pam)
Deleted:
  lxdm/repos/community-i686/PKGBUILD
  lxdm/repos/community-i686/Xsession
  lxdm/repos/community-i686/default-config.patch
  lxdm/repos/community-i686/lxdm.install
  lxdm/repos/community-i686/lxdm.pam
  lxdm/repos/community-i686/xauth.patch
  lxdm/repos/community-x86_64/PKGBUILD
  lxdm/repos/community-x86_64/Xsession
  lxdm/repos/community-x86_64/default-config.patch
  lxdm/repos/community-x86_64/lxdm.install
  lxdm/repos/community-x86_64/lxdm.pam
  lxdm/repos/community-x86_64/xauth.patch

---------------------------------------+
 /PKGBUILD                             |  180 ++++++++++++++++++++++++++++++++
 /Xsession                             |  142 +++++++++++++++++++++++++
 /default-config.patch                 |   50 ++++++++
 /lxdm.install                         |   26 ++++
 /lxdm.pam                             |   14 ++
 community-i686/PKGBUILD               |   65 -----------
 community-i686/Xsession               |   71 ------------
 community-i686/default-config.patch   |   21 ---
 community-i686/lxdm.install           |   13 --
 community-i686/lxdm.pam               |    7 -
 community-i686/xauth.patch            |   82 --------------
 community-x86_64/PKGBUILD             |   65 -----------
 community-x86_64/Xsession             |   71 ------------
 community-x86_64/default-config.patch |   21 ---
 community-x86_64/lxdm.install         |   13 --
 community-x86_64/lxdm.pam             |    7 -
 community-x86_64/xauth.patch          |   82 --------------
 17 files changed, 412 insertions(+), 518 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-i686/PKGBUILD	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: AndyRTR <andyrtr at archlinux.org>
-# Contributor: kiefer <jorgelmadrid at gmail.com>
-
-pkgname=lxdm
-pkgver=0.5.2
-pkgrel=2
-pkgdesc='Lightweight X11 Display Manager'
-arch=('i686' 'x86_64')
-url="https://sourceforge.net/projects/lxdm/"
-license=('GPL')
-groups=('lxde')
-depends=('gtk2' 'xorg-server')
-makedepends=('intltool' 'iso-codes')
-optdepends=('gtk-engines: default GTK+ theme'
-            'iso-codes: show language names in language chooser'
-            'librsvg: display the default background')
-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=(http://downloads.sourceforge.net/lxdm/$pkgname-$pkgver.tar.xz
-        xauth.patch
-        default-config.patch
-        lxdm.pam
-        Xsession)
-md5sums=('7806aeb11d4565c88dca2b05c9f7c44b'
-         'e5e9957f34f40ed5b7f7a47c778e38cd'
-         'f0ae6c072f151104c53a030fd7757821'
-         'c941ef896248bc7c03901b513490425c'
-         '6ff73570368501a06ee7badc8e415d0a')
-
-prepare(){
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Revert broken commit
-  patch -RNp1 -i ../xauth.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
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
-              --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-
-  # Home directory
-  install -dm 755 "$pkgdir/var/lib/lxdm"
-  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
-  chown -R 121:121 "$pkgdir/var/lib/lxdm"
-}

Copied: lxdm/repos/community-i686/PKGBUILD (from rev 161926, lxdm/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: AndyRTR <andyrtr at archlinux.org>
+# Contributor: kiefer <jorgelmadrid at gmail.com>
+
+pkgbase=lxdm
+pkgname=(lxdm lxdm-gtk3)
+pkgver=0.5.3
+pkgrel=1
+pkgdesc='Lightweight X11 Display Manager'
+arch=('i686' 'x86_64')
+url="http://lxde.org/"
+license=('GPL')
+depends=('gtk2' 'gtk3' 'xorg-server')
+makedepends=('intltool' 'iso-codes')
+optdepends=('iso-codes: show language names in language chooser'
+            'librsvg: display the default background')
+install=$pkgbase.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=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
+        default-config.patch
+        lxdm.pam
+        Xsession)
+md5sums=('061caae432634e6db38bbdc84bc6ffa0'
+         'fb2fb99acb11b6dfdb8d5fd72605b8da'
+         'c941ef896248bc7c03901b513490425c'
+         '6ff73570368501a06ee7badc8e415d0a')
+
+prepare(){
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  # 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
+}
+
+build() {
+  # GTK+ 2 version
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+  cd gtk2
+  ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
+              --sysconfdir=/etc --localstatedir=/var
+  make
+
+  cd "$srcdir"
+  # GTK+ 3 version
+  cd "$srcdir"
+  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+  cd gtk3
+  ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
+              --sysconfdir=/etc --localstatedir=/var --enable-gtk3
+  make
+}
+
+package_lxdm() {
+  groups=('lxde')
+  depends=('gtk2' 'xorg-server')
+  optdepends+=('gnome-themes-standard: default GTK+ theme')
+
+  cd gtk2
+  make DESTDIR="$pkgdir" install
+  chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Home directory
+  install -dm 755 "$pkgdir/var/lib/lxdm"
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
+  chown -R 121:121 "$pkgdir/var/lib/lxdm"
+}
+
+package_lxdm-gtk3() {
+  groups=('lxde-gtk3')
+  pkgdesc+=' (GTK+ 3 version)'
+  depends=('gtk3' 'xorg-server')
+  conflicts=('lxdm')
+
+  cd gtk3
+  make DESTDIR="$pkgdir" install
+  chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Home directory
+  install -dm 755 "$pkgdir/var/lib/lxdm"
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
+  chown -R 121:121 "$pkgdir/var/lib/lxdm"
+}

Deleted: community-i686/Xsession
===================================================================
--- community-i686/Xsession	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-i686/Xsession	2016-02-17 01:15:46 UTC (rev 161927)
@@ -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 -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
-
-# Run user xsession shell script
-script="$HOME/.xsession"
-if [ -x "$script" -a ! -d "$script" ]; then
-    echo "Loading xsession script $script"
-    . "$script"
-fi
-
-echo "X session wrapper complete, running session $LXSESSION"
-
-exec $LXSESSION

Copied: lxdm/repos/community-i686/Xsession (from rev 161926, lxdm/trunk/Xsession)
===================================================================
--- community-i686/Xsession	                        (rev 0)
+++ community-i686/Xsession	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,71 @@
+#!/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 -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
+
+# Run user xsession shell script
+script="$HOME/.xsession"
+if [ -x "$script" -a ! -d "$script" ]; then
+    echo "Loading xsession script $script"
+    . "$script"
+fi
+
+echo "X session wrapper complete, running session $LXSESSION"
+
+exec $LXSESSION

Deleted: community-i686/default-config.patch
===================================================================
--- community-i686/default-config.patch	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-i686/default-config.patch	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,21 +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
-@@ -23,7 +23,7 @@
- 
- [server]
- ## arg used to start xserver, not fully function
--# arg=/usr/bin/X -background vt1
-+arg=/usr/bin/X -background vt1
- # uncomment this if you really want xserver listen to tcp
- # tcp_listen=1
- # uncoment this if you want reset the xserver after logou
-@@ -34,7 +34,7 @@
- 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

Copied: lxdm/repos/community-i686/default-config.patch (from rev 161926, lxdm/trunk/default-config.patch)
===================================================================
--- community-i686/default-config.patch	                        (rev 0)
+++ community-i686/default-config.patch	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,25 @@
+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
+@@ -23,7 +23,7 @@
+ 
+ [server]
+ ## arg used to start xserver, not fully function
+-# arg=/usr/bin/X -background vt1
++arg=/usr/bin/X -background vt1
+ # uncomment this if you really want xserver listen to tcp
+ # tcp_listen=1
+ # uncoment this if you want reset the xserver after logou
+@@ -31,10 +31,10 @@
+ 
+ [display]
+ ## gtk theme used by greeter
+-gtk_theme=Clearlooks
++gtk_theme=Adwaita
+ 
+ ## background of the greeter
+-bg=/usr/share/backgrounds/default.png
++# bg=/usr/share/backgrounds/default.png
+ 
+ ## if show bottom pane
+ bottom_pane=1

Deleted: community-i686/lxdm.install
===================================================================
--- community-i686/lxdm.install	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-i686/lxdm.install	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,13 +0,0 @@
-post_install() {
-  getent group lxdm > /dev/null 2>&1 && \
-    groupmod -g 121 lxdm > /dev/null 2>&1 || \
-    groupadd -g 121 lxdm
-  getent passwd lxdm > /dev/null 2>&1 && \
-    usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
-    useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm
-  passwd -l lxdm > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}

Copied: lxdm/repos/community-i686/lxdm.install (from rev 161926, lxdm/trunk/lxdm.install)
===================================================================
--- community-i686/lxdm.install	                        (rev 0)
+++ community-i686/lxdm.install	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,13 @@
+post_install() {
+  getent group lxdm > /dev/null 2>&1 && \
+    groupmod -g 121 lxdm > /dev/null 2>&1 || \
+    groupadd -g 121 lxdm
+  getent passwd lxdm > /dev/null 2>&1 && \
+    usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
+    useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm
+  passwd -l lxdm > /dev/null
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: community-i686/lxdm.pam
===================================================================
--- community-i686/lxdm.pam	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-i686/lxdm.pam	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,7 +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

Copied: lxdm/repos/community-i686/lxdm.pam (from rev 161926, lxdm/trunk/lxdm.pam)
===================================================================
--- community-i686/lxdm.pam	                        (rev 0)
+++ community-i686/lxdm.pam	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,7 @@
+#%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

Deleted: community-i686/xauth.patch
===================================================================
--- community-i686/xauth.patch	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-i686/xauth.patch	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,82 +0,0 @@
-From e8f387089e241360bdc6955d3e479450722dcea3 Mon Sep 17 00:00:00 2001
-From: dgod <dgod.osa at gmail.com>
-Date: Wed, 7 Oct 2015 16:38:52 +0800
-Subject: [PATCH] pass xauth file to xserver command
-
----
- src/lxdm.c | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/lxdm.c b/src/lxdm.c
-index 43a98c7..03bc477 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -304,7 +304,7 @@ static LXSession *lxsession_add(void)
- 
- static LXSession *lxsession_greeter(void)
- {
--	char temp[16];
-+	char temp[128];
- 	LXSession *s;
- 	s=lxsession_find_greeter();
- 	if(s)
-@@ -327,10 +327,17 @@ static LXSession *lxsession_greeter(void)
- 	s->idle=FALSE;
- 	sprintf(temp,":%d",s->display);
- 	setenv("DISPLAY",temp,1);
-+	#ifndef DISABLE_XAUTH
-+	sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
-+	setenv("XAUTHORITY",temp,1);
-+	#endif
- 	g_message("prepare greeter on %s\n",temp);
- 	ui_prepare();
- 	lxsession_set_active(s);
- 	g_message("start greeter on %s\n",temp);
-+	#ifndef DISABLE_XAUTH
-+	unsetenv("XAUTHORITY");
-+	#endif
- 	return s;
- }
- 
-@@ -468,7 +475,7 @@ static char *lxsession_xserver_command(LXSession *s)
- 		}
- 	}
- 
--	arg = g_renew(char *, arg, arc + 10);
-+	arg = g_renew(char *, arg, arc + 15);
- 	if(nr_tty)
- 	{
- 		arg[arc++] = g_strdup("-background");
-@@ -486,6 +493,10 @@ static char *lxsession_xserver_command(LXSession *s)
- 	{
- 		arg[arc++] = g_strdup("-novtswitch");
- 	}
-+#ifndef DISABLE_XAUTH
-+	arg[arc++] = g_strdup("-auth");
-+	arg[arc++] = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display);
-+#endif
- 	arg[arc] = NULL;
- 	p=g_strjoinv(" ", arg);
- 	g_strfreev(arg);
-@@ -694,7 +705,7 @@ static void create_server_auth(LXSession *s)
- 
- 	authfile = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display);
- 
--	//setenv("XAUTHORITY",authfile,1);
-+	setenv("XAUTHORITY",authfile,1);
- 	remove(authfile);
- 	xauth_write_file(authfile,s->display,s->mcookie);
- 	g_free(authfile);
-@@ -998,6 +1009,9 @@ static void lxdm_startx(LXSession *s)
- 	g_message("%ld: start xserver in %d retry",time(NULL),i);
- 	if(s->dpy==NULL)
- 		exit(EXIT_FAILURE);
-+	#ifndef DISABLE_XAUTH
-+	unsetenv("XAUTHORITY");
-+	#endif
- 	
- 	if(s->option && g_key_file_has_key(config,s->option,"numlock",NULL))
- 	{
--- 
-2.1.4
-

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-x86_64/PKGBUILD	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: AndyRTR <andyrtr at archlinux.org>
-# Contributor: kiefer <jorgelmadrid at gmail.com>
-
-pkgname=lxdm
-pkgver=0.5.2
-pkgrel=2
-pkgdesc='Lightweight X11 Display Manager'
-arch=('i686' 'x86_64')
-url="https://sourceforge.net/projects/lxdm/"
-license=('GPL')
-groups=('lxde')
-depends=('gtk2' 'xorg-server')
-makedepends=('intltool' 'iso-codes')
-optdepends=('gtk-engines: default GTK+ theme'
-            'iso-codes: show language names in language chooser'
-            'librsvg: display the default background')
-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=(http://downloads.sourceforge.net/lxdm/$pkgname-$pkgver.tar.xz
-        xauth.patch
-        default-config.patch
-        lxdm.pam
-        Xsession)
-md5sums=('7806aeb11d4565c88dca2b05c9f7c44b'
-         'e5e9957f34f40ed5b7f7a47c778e38cd'
-         'f0ae6c072f151104c53a030fd7757821'
-         'c941ef896248bc7c03901b513490425c'
-         '6ff73570368501a06ee7badc8e415d0a')
-
-prepare(){
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Revert broken commit
-  patch -RNp1 -i ../xauth.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
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
-              --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-
-  # Home directory
-  install -dm 755 "$pkgdir/var/lib/lxdm"
-  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
-  chown -R 121:121 "$pkgdir/var/lib/lxdm"
-}

Copied: lxdm/repos/community-x86_64/PKGBUILD (from rev 161926, lxdm/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: AndyRTR <andyrtr at archlinux.org>
+# Contributor: kiefer <jorgelmadrid at gmail.com>
+
+pkgbase=lxdm
+pkgname=(lxdm lxdm-gtk3)
+pkgver=0.5.3
+pkgrel=1
+pkgdesc='Lightweight X11 Display Manager'
+arch=('i686' 'x86_64')
+url="http://lxde.org/"
+license=('GPL')
+depends=('gtk2' 'gtk3' 'xorg-server')
+makedepends=('intltool' 'iso-codes')
+optdepends=('iso-codes: show language names in language chooser'
+            'librsvg: display the default background')
+install=$pkgbase.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=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
+        default-config.patch
+        lxdm.pam
+        Xsession)
+md5sums=('061caae432634e6db38bbdc84bc6ffa0'
+         'fb2fb99acb11b6dfdb8d5fd72605b8da'
+         'c941ef896248bc7c03901b513490425c'
+         '6ff73570368501a06ee7badc8e415d0a')
+
+prepare(){
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  # 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
+}
+
+build() {
+  # GTK+ 2 version
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+  cd gtk2
+  ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
+              --sysconfdir=/etc --localstatedir=/var
+  make
+
+  cd "$srcdir"
+  # GTK+ 3 version
+  cd "$srcdir"
+  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+  cd gtk3
+  ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
+              --sysconfdir=/etc --localstatedir=/var --enable-gtk3
+  make
+}
+
+package_lxdm() {
+  groups=('lxde')
+  depends=('gtk2' 'xorg-server')
+  optdepends+=('gnome-themes-standard: default GTK+ theme')
+
+  cd gtk2
+  make DESTDIR="$pkgdir" install
+  chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Home directory
+  install -dm 755 "$pkgdir/var/lib/lxdm"
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
+  chown -R 121:121 "$pkgdir/var/lib/lxdm"
+}
+
+package_lxdm-gtk3() {
+  groups=('lxde-gtk3')
+  pkgdesc+=' (GTK+ 3 version)'
+  depends=('gtk3' 'xorg-server')
+  conflicts=('lxdm')
+
+  cd gtk3
+  make DESTDIR="$pkgdir" install
+  chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Home directory
+  install -dm 755 "$pkgdir/var/lib/lxdm"
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
+  chown -R 121:121 "$pkgdir/var/lib/lxdm"
+}

Deleted: community-x86_64/Xsession
===================================================================
--- community-x86_64/Xsession	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-x86_64/Xsession	2016-02-17 01:15:46 UTC (rev 161927)
@@ -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 -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
-
-# Run user xsession shell script
-script="$HOME/.xsession"
-if [ -x "$script" -a ! -d "$script" ]; then
-    echo "Loading xsession script $script"
-    . "$script"
-fi
-
-echo "X session wrapper complete, running session $LXSESSION"
-
-exec $LXSESSION

Copied: lxdm/repos/community-x86_64/Xsession (from rev 161926, lxdm/trunk/Xsession)
===================================================================
--- community-x86_64/Xsession	                        (rev 0)
+++ community-x86_64/Xsession	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,71 @@
+#!/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 -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
+
+# Run user xsession shell script
+script="$HOME/.xsession"
+if [ -x "$script" -a ! -d "$script" ]; then
+    echo "Loading xsession script $script"
+    . "$script"
+fi
+
+echo "X session wrapper complete, running session $LXSESSION"
+
+exec $LXSESSION

Deleted: community-x86_64/default-config.patch
===================================================================
--- community-x86_64/default-config.patch	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-x86_64/default-config.patch	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,21 +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
-@@ -23,7 +23,7 @@
- 
- [server]
- ## arg used to start xserver, not fully function
--# arg=/usr/bin/X -background vt1
-+arg=/usr/bin/X -background vt1
- # uncomment this if you really want xserver listen to tcp
- # tcp_listen=1
- # uncoment this if you want reset the xserver after logou
-@@ -34,7 +34,7 @@
- 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

Copied: lxdm/repos/community-x86_64/default-config.patch (from rev 161926, lxdm/trunk/default-config.patch)
===================================================================
--- community-x86_64/default-config.patch	                        (rev 0)
+++ community-x86_64/default-config.patch	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,25 @@
+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
+@@ -23,7 +23,7 @@
+ 
+ [server]
+ ## arg used to start xserver, not fully function
+-# arg=/usr/bin/X -background vt1
++arg=/usr/bin/X -background vt1
+ # uncomment this if you really want xserver listen to tcp
+ # tcp_listen=1
+ # uncoment this if you want reset the xserver after logou
+@@ -31,10 +31,10 @@
+ 
+ [display]
+ ## gtk theme used by greeter
+-gtk_theme=Clearlooks
++gtk_theme=Adwaita
+ 
+ ## background of the greeter
+-bg=/usr/share/backgrounds/default.png
++# bg=/usr/share/backgrounds/default.png
+ 
+ ## if show bottom pane
+ bottom_pane=1

Deleted: community-x86_64/lxdm.install
===================================================================
--- community-x86_64/lxdm.install	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-x86_64/lxdm.install	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,13 +0,0 @@
-post_install() {
-  getent group lxdm > /dev/null 2>&1 && \
-    groupmod -g 121 lxdm > /dev/null 2>&1 || \
-    groupadd -g 121 lxdm
-  getent passwd lxdm > /dev/null 2>&1 && \
-    usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
-    useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm
-  passwd -l lxdm > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}

Copied: lxdm/repos/community-x86_64/lxdm.install (from rev 161926, lxdm/trunk/lxdm.install)
===================================================================
--- community-x86_64/lxdm.install	                        (rev 0)
+++ community-x86_64/lxdm.install	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,13 @@
+post_install() {
+  getent group lxdm > /dev/null 2>&1 && \
+    groupmod -g 121 lxdm > /dev/null 2>&1 || \
+    groupadd -g 121 lxdm
+  getent passwd lxdm > /dev/null 2>&1 && \
+    usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
+    useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm
+  passwd -l lxdm > /dev/null
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: community-x86_64/lxdm.pam
===================================================================
--- community-x86_64/lxdm.pam	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-x86_64/lxdm.pam	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,7 +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

Copied: lxdm/repos/community-x86_64/lxdm.pam (from rev 161926, lxdm/trunk/lxdm.pam)
===================================================================
--- community-x86_64/lxdm.pam	                        (rev 0)
+++ community-x86_64/lxdm.pam	2016-02-17 01:15:46 UTC (rev 161927)
@@ -0,0 +1,7 @@
+#%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

Deleted: community-x86_64/xauth.patch
===================================================================
--- community-x86_64/xauth.patch	2016-02-17 01:15:34 UTC (rev 161926)
+++ community-x86_64/xauth.patch	2016-02-17 01:15:46 UTC (rev 161927)
@@ -1,82 +0,0 @@
-From e8f387089e241360bdc6955d3e479450722dcea3 Mon Sep 17 00:00:00 2001
-From: dgod <dgod.osa at gmail.com>
-Date: Wed, 7 Oct 2015 16:38:52 +0800
-Subject: [PATCH] pass xauth file to xserver command
-
----
- src/lxdm.c | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/lxdm.c b/src/lxdm.c
-index 43a98c7..03bc477 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -304,7 +304,7 @@ static LXSession *lxsession_add(void)
- 
- static LXSession *lxsession_greeter(void)
- {
--	char temp[16];
-+	char temp[128];
- 	LXSession *s;
- 	s=lxsession_find_greeter();
- 	if(s)
-@@ -327,10 +327,17 @@ static LXSession *lxsession_greeter(void)
- 	s->idle=FALSE;
- 	sprintf(temp,":%d",s->display);
- 	setenv("DISPLAY",temp,1);
-+	#ifndef DISABLE_XAUTH
-+	sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
-+	setenv("XAUTHORITY",temp,1);
-+	#endif
- 	g_message("prepare greeter on %s\n",temp);
- 	ui_prepare();
- 	lxsession_set_active(s);
- 	g_message("start greeter on %s\n",temp);
-+	#ifndef DISABLE_XAUTH
-+	unsetenv("XAUTHORITY");
-+	#endif
- 	return s;
- }
- 
-@@ -468,7 +475,7 @@ static char *lxsession_xserver_command(LXSession *s)
- 		}
- 	}
- 
--	arg = g_renew(char *, arg, arc + 10);
-+	arg = g_renew(char *, arg, arc + 15);
- 	if(nr_tty)
- 	{
- 		arg[arc++] = g_strdup("-background");
-@@ -486,6 +493,10 @@ static char *lxsession_xserver_command(LXSession *s)
- 	{
- 		arg[arc++] = g_strdup("-novtswitch");
- 	}
-+#ifndef DISABLE_XAUTH
-+	arg[arc++] = g_strdup("-auth");
-+	arg[arc++] = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display);
-+#endif
- 	arg[arc] = NULL;
- 	p=g_strjoinv(" ", arg);
- 	g_strfreev(arg);
-@@ -694,7 +705,7 @@ static void create_server_auth(LXSession *s)
- 
- 	authfile = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display);
- 
--	//setenv("XAUTHORITY",authfile,1);
-+	setenv("XAUTHORITY",authfile,1);
- 	remove(authfile);
- 	xauth_write_file(authfile,s->display,s->mcookie);
- 	g_free(authfile);
-@@ -998,6 +1009,9 @@ static void lxdm_startx(LXSession *s)
- 	g_message("%ld: start xserver in %d retry",time(NULL),i);
- 	if(s->dpy==NULL)
- 		exit(EXIT_FAILURE);
-+	#ifndef DISABLE_XAUTH
-+	unsetenv("XAUTHORITY");
-+	#endif
- 	
- 	if(s->option && g_key_file_has_key(config,s->option,"numlock",NULL))
- 	{
--- 
-2.1.4
-

More information about the arch-commits mailing list