[arch-commits] Commit in lxdm/trunk (PKGBUILD default-config.patch xauth.patch)
Balló György
bgyorgy at archlinux.org
Wed Feb 17 01:15:34 UTC 2016
Date: Wednesday, February 17, 2016 @ 02:15:34
Author: bgyorgy
Revision: 161926
upgpkg: lxdm 0.5.3-1
Update to new version, add GTK+ 3 version
Modified:
lxdm/trunk/PKGBUILD
lxdm/trunk/default-config.patch
Deleted:
lxdm/trunk/xauth.patch
----------------------+
PKGBUILD | 67 +++++++++++++++++++++++++++-------------
default-config.patch | 8 +++-
xauth.patch | 82 -------------------------------------------------
3 files changed, 52 insertions(+), 105 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-17 00:10:51 UTC (rev 161925)
+++ PKGBUILD 2016-02-17 01:15:34 UTC (rev 161926)
@@ -4,40 +4,34 @@
# Contributor: AndyRTR <andyrtr at archlinux.org>
# Contributor: kiefer <jorgelmadrid at gmail.com>
-pkgname=lxdm
-pkgver=0.5.2
-pkgrel=2
+pkgbase=lxdm
+pkgname=(lxdm lxdm-gtk3)
+pkgver=0.5.3
+pkgrel=1
pkgdesc='Lightweight X11 Display Manager'
arch=('i686' 'x86_64')
-url="https://sourceforge.net/projects/lxdm/"
+url="http://lxde.org/"
license=('GPL')
-groups=('lxde')
-depends=('gtk2' 'xorg-server')
+depends=('gtk2' 'gtk3' 'xorg-server')
makedepends=('intltool' 'iso-codes')
-optdepends=('gtk-engines: default GTK+ theme'
- 'iso-codes: show language names in language chooser'
+optdepends=('iso-codes: show language names in language chooser'
'librsvg: display the default background')
-install=$pkgname.install
+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/lxdm/$pkgname-$pkgver.tar.xz
- xauth.patch
+source=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
default-config.patch
lxdm.pam
Xsession)
-md5sums=('7806aeb11d4565c88dca2b05c9f7c44b'
- 'e5e9957f34f40ed5b7f7a47c778e38cd'
- 'f0ae6c072f151104c53a030fd7757821'
+md5sums=('061caae432634e6db38bbdc84bc6ffa0'
+ 'fb2fb99acb11b6dfdb8d5fd72605b8da'
'c941ef896248bc7c03901b513490425c'
'6ff73570368501a06ee7badc8e415d0a')
prepare(){
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgbase-$pkgver"
- # Revert broken commit
- patch -RNp1 -i ../xauth.patch
-
# Adjust Arch-specific settings
patch -Np1 -i ../default-config.patch
@@ -47,14 +41,29 @@
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ # 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() {
- cd "$srcdir/$pkgname-$pkgver"
+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"
@@ -63,3 +72,19 @@
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"
+}
Modified: default-config.patch
===================================================================
--- default-config.patch 2016-02-17 00:10:51 UTC (rev 161925)
+++ default-config.patch 2016-02-17 01:15:34 UTC (rev 161926)
@@ -10,9 +10,13 @@
# 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
+@@ -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
Deleted: xauth.patch
===================================================================
--- xauth.patch 2016-02-17 00:10:51 UTC (rev 161925)
+++ xauth.patch 2016-02-17 01:15:34 UTC (rev 161926)
@@ -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