[arch-commits] Commit in lxdm/trunk (10 files)
Balló György
bgyorgy at nymeria.archlinux.org
Thu Sep 12 00:34:19 UTC 2013
Date: Thursday, September 12, 2013 @ 02:34:19
Author: bgyorgy
Revision: 97059
Remove obsoleted files
Deleted:
lxdm/trunk/lxdm-0.4.1-Xsession-source-profile.patch
lxdm/trunk/lxdm-0.4.1-conf.patch
lxdm/trunk/lxdm-0.4.1-event-check-bug.patch
lxdm/trunk/lxdm-0.4.1-industrial-greeter-ui.patch
lxdm/trunk/lxdm-0.4.1-kill_user_processes.patch
lxdm/trunk/lxdm-0.4.1-modern-systems.patch
lxdm/trunk/lxdm-0.4.1-nolang-show-sessions.patch
lxdm/trunk/lxdm-0.4.1-pam-env-vars.patch
lxdm/trunk/lxdm.pam
lxdm/trunk/lxdm.service
------------------------------------------+
lxdm-0.4.1-Xsession-source-profile.patch | 11 ------
lxdm-0.4.1-conf.patch | 11 ------
lxdm-0.4.1-event-check-bug.patch | 21 ------------
lxdm-0.4.1-industrial-greeter-ui.patch | 13 -------
lxdm-0.4.1-kill_user_processes.patch | 35 --------------------
lxdm-0.4.1-modern-systems.patch | 26 ---------------
lxdm-0.4.1-nolang-show-sessions.patch | 13 -------
lxdm-0.4.1-pam-env-vars.patch | 50 -----------------------------
lxdm.pam | 10 -----
lxdm.service | 9 -----
10 files changed, 199 deletions(-)
Deleted: lxdm-0.4.1-Xsession-source-profile.patch
===================================================================
--- lxdm-0.4.1-Xsession-source-profile.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-Xsession-source-profile.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,11 +0,0 @@
---- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200
-+++ data/Xsession 2011-12-03 09:09:14.592876087 +0100
-@@ -9,6 +9,8 @@
- LXSESSION=/usr/bin/startlxde
- fi
-
-+[ -f /etc/profile ] && . /etc/profile
-+[ -f ~/.profile ] && . ~/.profile
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f ~/.xprofile ] && . ~/.xprofile
-
Deleted: lxdm-0.4.1-conf.patch
===================================================================
--- lxdm-0.4.1-conf.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-conf.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,11 +0,0 @@
---- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100
-+++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100
-@@ -27,7 +27,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
Deleted: lxdm-0.4.1-event-check-bug.patch
===================================================================
--- lxdm-0.4.1-event-check-bug.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-event-check-bug.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,21 +0,0 @@
-From: dgod <dgod.osa at gmail.com>
-Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
-Subject: fix event check bug caused cpu 100%
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
-
-fix event check bug caused cpu 100%
----
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- a/src/lxcom.c
-+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
-
- static gboolean lxcom_check(GSource *source)
- {
-- return TRUE;
-+ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
-
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
Deleted: lxdm-0.4.1-industrial-greeter-ui.patch
===================================================================
--- lxdm-0.4.1-industrial-greeter-ui.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-industrial-greeter-ui.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,13 +0,0 @@
---- data/themes/Industrial/greeter.ui.orig 2012-05-09 23:54:03.743980613 -0300
-+++ data/themes/Industrial/greeter.ui 2012-05-10 00:26:20.340687396 -0300
-@@ -201,7 +201,9 @@
- </packing>
- </child>
- <child>
-- <object class="GtkComboBoxEntry" id="keyboard"/>
-+ <object class="GtkComboBoxEntry" id="keyboard">
-+ <property name="text_column">0</property>
-+ </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
Deleted: lxdm-0.4.1-kill_user_processes.patch
===================================================================
--- lxdm-0.4.1-kill_user_processes.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-kill_user_processes.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,35 +0,0 @@
-diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c
---- lxdm/src/xconn.c 2012-12-23 19:27:04.512531088 -0800
-+++ lxdm/src/xconn.c 2012-12-23 19:28:31.659227448 -0800
-@@ -172,7 +172,7 @@
- free(c);
- }
-
--#if 0
-+//#if 0
- static xcb_window_t xconn_get_root(xconn_t c)
- {
- const xcb_setup_t *setup;
-@@ -181,11 +181,11 @@
- xcb_screen_t *screen = iter.data;
- return screen->root;
- }
--#endif
-+//#endif
-
- void xconn_clean(xconn_t c)
- {
--#if 0
-+//#if 0
- xcb_query_tree_cookie_t wintree;
- xcb_query_tree_reply_t *rep;
- xcb_window_t *children;
-@@ -202,7 +202,7 @@
- xcb_kill_client(c->c,children[i]);
- free(rep);
- xcb_flush(c->c);
--#endif
-+//#endif
- }
-
- #endif
Deleted: lxdm-0.4.1-modern-systems.patch
===================================================================
--- lxdm-0.4.1-modern-systems.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-modern-systems.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,26 +0,0 @@
---- data/lxdm.orig 2010-01-24 16:58:42.262866825 -0200
-+++ data/lxdm 2010-01-19 11:56:34.308668692 -0200
-@@ -1,21 +1,13 @@
- #!/bin/sh
-
--[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
--
--if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
-- . /etc/sysconfig/language
-- if [ -n "$RC_LANG"]; then
-- LANG=$RC_LANG
-- fi
-+if [ -r /etc/profile.d/locale.sh ]; then
-+ . /etc/profile.d/locale.sh
- fi
-
- if [ -n "$LANG" ]; then
- export LANG
- fi
-
--[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
--[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
--
- if [ -n "$DEFAULT_WM" ]; then
- PREFERRED=$DEFAULT_WM
- fi
Deleted: lxdm-0.4.1-nolang-show-sessions.patch
===================================================================
--- lxdm-0.4.1-nolang-show-sessions.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-nolang-show-sessions.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,13 +0,0 @@
-diff --git a/src/greeter.c b/src/greeter.c
-index c0c150d..1f6b88e 100644
---- a/src/greeter.c
-+++ b/src/greeter.c
-@@ -114,7 +114,7 @@ static char *get_session_exec(void)
- GtkTreeModel* model;
- GtkTreeIter it;
- gchar *res;
-- if(!lang)
-+ if(!sessions)
- return g_strdup("");
-
- if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
Deleted: lxdm-0.4.1-pam-env-vars.patch
===================================================================
--- lxdm-0.4.1-pam-env-vars.patch 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm-0.4.1-pam-env-vars.patch 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,50 +0,0 @@
-diff --git a/src/lxdm.c b/src/lxdm.c
-index 369aedf..cd1d486 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name)
- g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err));
- }
-
--void append_pam_environ(pam_handle_t *pamh,char **env)
-+static char **append_pam_environ(pam_handle_t *pamh,char **env)
- {
-- int i,j,n;
-+ int i,j,n,a;
- char **penv;
-- if(!pamh) return;
-+ if(!pamh) return env;
- penv=pam_getenvlist(pamh);
-- if(!penv) return;
-+ if(!penv) return env;
-+ a=g_strv_length(penv);
-+ if(a==0)
-+ {
-+ free(penv);
-+ return env;
-+ }
-+ env=g_renew(char *,env,g_strv_length(env)+1+a+10);
- for(i=0;penv[i]!=NULL;i++)
- {
-- //printf("PAM %s\n",penv[i]);
-+ fprintf(stderr,"PAM %s\n",penv[i]);
- n=strcspn(penv[i],"=")+1;
- for(j=0;env[j]!=NULL;j++)
- {
-@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env)
- free(penv[i]);
- }
- free(penv);
-+ return env;
- }
-
- #endif
-@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
- if(s->child==0)
- {
- #if HAVE_LIBPAM
-- append_pam_environ(s->pamh,env);
-+ env=append_pam_environ(s->pamh,env);
- pam_end(s->pamh,0);
- #endif
- switch_user(pw, session_exec, env);
Deleted: lxdm.pam
===================================================================
--- lxdm.pam 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm.pam 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-password required pam_unix.so
--session optional pam_loginuid.so
--session optional pam_systemd.so
Deleted: lxdm.service
===================================================================
--- lxdm.service 2013-09-11 23:48:41 UTC (rev 97058)
+++ lxdm.service 2013-09-12 00:34:19 UTC (rev 97059)
@@ -1,9 +0,0 @@
-[Unit]
-Description=LXDE Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/lxdm
-
-[Install]
-Alias=display-manager.service
More information about the arch-commits
mailing list