Hello community, here is the log from the commit of package lxdm for openSUSE:Factory checked in at 2014-09-08 21:28:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxdm (Old) and /work/SRC/openSUSE:Factory/.lxdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxdm" Changes: -------- --- /work/SRC/openSUSE:Factory/lxdm/lxdm.changes 2014-08-13 08:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm.changes 2014-09-08 21:30:08.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Sep 3 21:19:26 UTC 2014 - [email protected] + +- Downgrade to version 0.4.1 + * version 0.5.0 breaks first boot after installation of 13.2 + * rolled back the following patches + lxdm-0.4.1-fix-small-bug-in-theme.patch + lxdm-0.4.0-gnome-start.patch + lxdm-0.5.0-use-openSUSE-background.patch + lxdm-bnc-741454-d4e41ec.patch + lxdm-0.4.0-common.patch + lxdm-0.5.0-use-sysconfig.patch + lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch + lxdm-0.5.0-common.patch + lxdm-0.4.0-fix-null-pointer-dereference.patch + lxdm-0.5.0-gnome-start.patch + lxdm-0.4.0-use-sysconfig.patch + lxdm-0.4.1-background-12.1.patch + +------------------------------------------------------------------- Old: ---- lxdm-0.5.0-common.patch lxdm-0.5.0-gnome-start.patch lxdm-0.5.0-use-openSUSE-background.patch lxdm-0.5.0-use-sysconfig.patch lxdm-0.5.0.tar.xz New: ---- lxdm-0.4.0-common.patch lxdm-0.4.0-fix-null-pointer-dereference.patch lxdm-0.4.0-gnome-start.patch lxdm-0.4.0-use-sysconfig.patch lxdm-0.4.1-background-12.1.patch lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch lxdm-0.4.1-fix-small-bug-in-theme.patch lxdm-0.4.1.tar.bz2 lxdm-bnc-741454-d4e41ec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxdm.spec ++++++ --- /var/tmp/diff_new_pack.Cv9kE2/_old 2014-09-08 21:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Cv9kE2/_new 2014-09-08 21:30:10.000000000 +0200 @@ -16,34 +16,37 @@ # -%define _dminitdir %{_libexecdir}/X11/displaymanagers -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif +%define _dminitdir %{_prefix}/lib/X11/displaymanagers + Name: lxdm -Version: 0.5.0 -Release: 0 Summary: LXDE Display Manager License: GPL-2.0 and LGPL-2.0 Group: System/GUI/LXDE +Version: 0.4.1 +Release: 0 Url: http://lxde.org/ -Source0: %{name}-%{version}.tar.xz +Source0: %name-%version.tar.bz2 Source1: README.SUSE Source2: %{name}.pamd -Source3: %{name}-config.desktop +Source3: lxdm-config.desktop Source4: config-users.png -Source5: %{name} -Source6: sysconfig.%{name} -# PATCH-FEATURE-OPENSUSE lxdm-0.5.0-use-sysconfig.patch [email protected] +Source5: lxdm +Source6: sysconfig.lxdm +# PATCH-FEATURE-OPENSUSE lxdm-0.4.0-use-sysconfig.patch [email protected] # this patch allow lxdm to read system settings from /etc/sysconfig -Patch1: %{name}-0.5.0-use-sysconfig.patch -Patch2: %{name}-0.5.0-gnome-start.patch -# PATCH-FIX-OPENSUSE lxdm-0.5.0-common.patch [email protected] +Patch1: %{name}-0.4.0-use-sysconfig.patch +Patch2: %{name}-0.4.0-gnome-start.patch +# PATCH-FIX-OPENSUSE lxdm-0.4.0-common.patch [email protected] # this patch fix bnc#586555 lxdm now use common scripts in /etc/X11/xdm -Patch3: %{name}-0.5.0-common.patch +Patch3: %{name}-0.4.0-common.patch +Patch4: %{name}-0.4.0-fix-null-pointer-dereference.patch # Patch needed to use current new default wallpaper location # bnc#732671 -Patch4: %{name}-0.5.0-use-openSUSE-background.patch +Patch5: %{name}-0.4.1-background-12.1.patch +Patch6: %{name}-bnc-741454-d4e41ec.patch +Patch7: %{name}-0.4.1-fix-gtk2-keyboard-list-empty.patch +Patch8: %{name}-0.4.1-fix-small-bug-in-theme.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ConsoleKit-devel BuildRequires: autoconf BuildRequires: automake @@ -57,16 +60,16 @@ BuildRequires: make BuildRequires: pam-devel BuildRequires: pkg-config -BuildRequires: systemd-devel BuildRequires: update-desktop-files Requires: desktop-data-openSUSE Requires: pam -# FIXME: use proper Requires(pre/post/preun/...) PreReq: %fillup_prereq Recommends: gnome-control-center-user-faces -Provides: lxdm-conf = %{version} -Obsoletes: lxdm-conf < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: lxdm-conf = %version +Obsoletes: lxdm-conf < %version +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif %description LXDM is the future display manager of LXDE, the Lightweight X11 Desktop @@ -79,58 +82,59 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -cp %{SOURCE1} . +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 + +%__cp %{SOURCE1} . %build autoreconf -fi %configure -make %{?_smp_mflags} +%__make %{?jobs:-j%{jobs}} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/%{_datadir}/applications -install %{SOURCE3} %{buildroot}/%{_datadir}/applications/ +%makeinstall +%__mkdir_p %buildroot/%_bindir +%__mkdir_p %buildroot/%_datadir/applications +install %SOURCE3 %buildroot/%_datadir/applications/ #need by post checks -mkdir -p %{buildroot}/%{_datadir}/pixmaps -install %{SOURCE4} %{buildroot}/%{_datadir}/pixmaps +%__mkdir_p %buildroot/%_datadir/pixmaps +install %SOURCE4 %buildroot/%_datadir/pixmaps + %suse_update_desktop_file lxdm-config -rm %{buildroot}/%{_sbindir}/%{name} -rm -rf %{buildroot}/%{_sysconfdir}/pam.d/%{name} -install %{SOURCE2} %{buildroot}/%{_sysconfdir}/pam.d/%{name} -chmod -x %{buildroot}/%{_sysconfdir}/pam.d/%{name} -ln -sf %{_sbindir}/%{name}-binary %{buildroot}/%{_bindir}/%{name} -%find_lang %{name} -mkdir -p %{buildroot}/%{_rundir} -mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name} -touch %{buildroot}/%{_rundir}/%{name}.pid -mkdir -p %{buildroot}%{_dminitdir}/ -cp %{SOURCE5} %{buildroot}%{_dminitdir}/ -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +%__rm %buildroot/%_sbindir/%name +%__rm -rf %buildroot/%_sysconfdir/pam.d/%name +install %SOURCE2 %buildroot/%_sysconfdir/pam.d/%name +chmod -x %buildroot/%_sysconfdir/pam.d/%name +ln -sf %_sbindir/%name-binary %buildroot/%_bindir/%name +%find_lang %name +%__mkdir_p %buildroot/%_rundir +%__mkdir_p %buildroot/%_localstatedir/lib/%name +touch %buildroot/%_rundir/%name.pid +%__mkdir_p %{buildroot}%{_dminitdir}/ +%__cp %{SOURCE5} %{buildroot}%{_dminitdir}/ +%__mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates cp %{SOURCE6} %{buildroot}%{_localstatedir}/adm/fillup-templates/ -%fdupes -s %{buildroot}/%{_datadir} +%fdupes -s %buildroot/%_datadir %pre -%{_sbindir}/groupadd -r lxdm 2> /dev/null || : -%{_sbindir}/useradd -r -g lxdm -s /bin/false \ --c "LXDE Display Manager daemon" -d %{_localstatedir}/lib/lxdm lxdm 2> /dev/null || : -%{_sbindir}/usermod -g lxdm -G lxdm -s /bin/false lxdm 2> /dev/null -%service_add_pre %{name}.service +/usr/sbin/groupadd -r lxdm 2> /dev/null || : +/usr/sbin/useradd -r -g lxdm -s /bin/false \ +-c "LXDE Display Manager daemon" -d /var/lib/lxdm lxdm 2> /dev/null || : +/usr/sbin/usermod -g lxdm -G lxdm -s /bin/false lxdm 2> /dev/null -# this is only needed on initial upgrades because of the "noreplace" +# this is only needed on initial upgrades becuase of the "noreplace" # option into files section %post -chmod 640 %{_sysconfdir}/%{name}/%{name}.conf -chown lxdm:lxdm %{_sysconfdir}/%{name}/%{name}.conf +chmod 640 %_sysconfdir/%name/%name.conf +chown lxdm:lxdm %_sysconfdir/%name/%name.conf %{fillup_only -ns displaymanager lxdm} -%service_add_post %{name}.service - -%preun -%service_del_preun %{name}.service -%files -f %{name}.lang +%files -f %name.lang %defattr (-,root,root,-) %doc AUTHORS README COPYING README.SUSE %dir %{_datadir}/%{name}/ @@ -144,7 +148,6 @@ %{_libexecdir}/%{name}-greeter-gtk %{_libexecdir}/%{name}-greeter-gdk %{_libexecdir}/%{name}-numlock -%{_libexecdir}/%{name}-session %config(noreplace) %{_sysconfdir}/%{name}/Xsession %config(noreplace) %{_sysconfdir}/%{name}/PreReboot %config(noreplace) %{_sysconfdir}/%{name}/PreShutdown @@ -155,10 +158,9 @@ %attr(640,lxdm,lxdm) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/pam.d/%{name} %attr(750,lxdm,lxdm) %dir %{_localstatedir}/lib/%{name} -%ghost %{_rundir}/%{name}.pid -%exclude /%{_datadir}/pixmaps +%ghost %_rundir/%{name}.pid +%exclude /%_datadir/pixmaps %{_dminitdir}/lxdm %config %{_localstatedir}/adm/fillup-templates/sysconfig.lxdm -%{_unitdir}/%{name}.service %changelog ++++++ lxdm-0.5.0-common.patch -> lxdm-0.4.0-common.patch ++++++ --- /work/SRC/openSUSE:Factory/lxdm/lxdm-0.5.0-common.patch 2014-07-16 16:36:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm-0.4.0-common.patch 2014-09-08 21:30:08.000000000 +0200 @@ -1,27 +1,31 @@ ---- lxdm-70843c4-old/data/LoginReady.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/LoginReady.in 2014-07-05 13:31:20.257916715 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/LoginReady.in lxdm-0.4.0.git.1310644223//data/LoginReady.in +--- old-lxdm-0.4.0.git.1310644223//data/LoginReady.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/LoginReady.in 2011-07-15 15:18:16.341044121 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xsetup && exec /etc/X11/xdm/Xsetup ---- lxdm-70843c4-old/data/PostLogout.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/PostLogout.in 2014-07-05 13:31:43.993586553 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/PostLogout.in lxdm-0.4.0.git.1310644223//data/PostLogout.in +--- old-lxdm-0.4.0.git.1310644223//data/PostLogout.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/PostLogout.in 2011-07-15 15:18:16.341044121 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xreset && exec /etc/X11/xdm/Xreset ---- lxdm-70843c4-old/data/PreLogin.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/PreLogin.in 2014-07-05 13:32:34.835782226 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/PreLogin.in lxdm-0.4.0.git.1310644223//data/PreLogin.in +--- old-lxdm-0.4.0.git.1310644223//data/PreLogin.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/PreLogin.in 2011-07-15 15:18:16.342044142 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xstartup && exec /etc/X11/xdm/Xstartup ---- lxdm-70843c4-old/data/Xsession 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/Xsession 2014-07-05 13:36:21.672167760 +0200 -@@ -1,48 +1,26 @@ +diff -uNr old-lxdm-0.4.0.git.1310644223//data/Xsession lxdm-0.4.0.git.1310644223//data/Xsession +--- old-lxdm-0.4.0.git.1310644223//data/Xsession 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/Xsession 2011-07-15 15:19:16.391044441 +0200 +@@ -1,46 +1,26 @@ #!/bin/bash -# use bash for "exec -l", howto run login shell by /bin/sh ? @@ -47,7 +51,12 @@ -if [ -f /etc/X11/xinit/xinitrc-common ]; then -# fedora - . /etc/X11/xinit/xinitrc-common -- exec -l bash -c "$LXSESSION" +- if ! [ -z "$XDG_SESSION_COOKIE" ]; then +- CK_XINIT_SESSION= +- elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then +- CK_XINIT_SESSION="/usr/bin/ck-launch-session" +- fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" -elif [ -x /etc/X11/xinit/Xsession ]; then -# fedora - exec /etc/X11/xinit/Xsession "$LXSESSION" @@ -57,29 +66,23 @@ -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION -- exec -l bash -c /etc/X11/xinit/xinitrc +- exec -l $SHELL -c /etc/X11/xinit/xinitrc -else # unknown, user should custom /etc/lxdm/xinitrc self - if [ -x /etc/lxdm/xinitrc ]; then -- . /etc/lxdm/xinitrc "$LXSESSION" -- fi -- if [ -d /etc/X11/xinit/xinitrc.d ] ; then -- for f in /etc/X11/xinit/xinitrc.d/* ; do -- [ -x "$f" ] && . "$f" -- done -- unset f +- . /etc/lxdm/xinitrc - fi -- -- if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; -- then -- eval "$(dbus-launch --sh-syntax --exit-with-session)" +- 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\"" +test -s /etc/lxdm/xinitrc && . /etc/lxdm/xinitrc - -- exec -l bash -c "$LXSESSION" ++ +if ! test -z "$XDG_SESSION_COOKIE" ; then + CK_XINIT_SESSION= -+elif test- x /usr/bin/ck-launch-session ; then ++elif test -x /usr/bin/ck-launch-session ; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" fi +exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++++++ lxdm-0.4.0-fix-null-pointer-dereference.patch ++++++ diff -urNp lxdm-0.4.0.orig/src/config.c lxdm-0.4.0/src/config.c --- lxdm-0.4.0.orig/src/config.c 2011-07-29 20:56:35.000000000 +0200 +++ lxdm-0.4.0/src/config.c 2011-07-29 20:57:45.000000000 +0200 @@ -127,24 +127,19 @@ static gboolean image_file_valid(const c static void update_face_image(GtkWidget *w) { GdkPixbuf *pixbuf; - char *path; - path=g_build_filename(user->pw_dir,".face",NULL); - if(access(path,R_OK)) - { - g_free(path); - if(ui_nobody) - pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); - if(!pixbuf) - pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + char *path=g_build_filename(user->pw_dir,".face",NULL); + pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); + g_free(path); + if(!pixbuf && ui_nobody) + pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); + if(!pixbuf) + pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); - } - else + if(pixbuf) { - pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); - g_free(path); + gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); + g_object_unref(pixbuf); } - gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); - g_object_unref(pixbuf); } static void set_face_file(const char *filename) ++++++ lxdm-0.5.0-gnome-start.patch -> lxdm-0.4.0-gnome-start.patch ++++++ --- /work/SRC/openSUSE:Factory/lxdm/lxdm-0.5.0-gnome-start.patch 2014-07-16 16:36:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm-0.4.0-gnome-start.patch 2014-09-08 21:30:08.000000000 +0200 @@ -1,6 +1,7 @@ ---- lxdm-70843c4/src/lxdm.c.old 2014-07-05 14:10:05.483754732 +0200 -+++ lxdm-70843c4/src/lxdm.c 2014-07-05 14:10:16.409572981 +0200 -@@ -1111,7 +1111,7 @@ +diff -uNr old-lxdm-0.4.0.git.1310644223//src/lxdm.c lxdm-0.4.0.git.1310644223//src/lxdm.c +--- old-lxdm-0.4.0.git.1310644223//src/lxdm.c 2011-07-15 15:14:21.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//src/lxdm.c 2011-07-15 15:15:27.939044540 +0200 +@@ -1267,7 +1267,7 @@ if(!strcasecmp(name,"LXDE")) exec = g_strdup("startlxde"); else if( !strcasecmp(name, "GNOME") ) ++++++ lxdm-0.5.0-use-sysconfig.patch -> lxdm-0.4.0-use-sysconfig.patch ++++++ --- /work/SRC/openSUSE:Factory/lxdm/lxdm-0.5.0-use-sysconfig.patch 2014-07-16 16:36:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm-0.4.0-use-sysconfig.patch 2014-09-08 21:30:08.000000000 +0200 @@ -1,5 +1,6 @@ ---- lxdm-70843c4-old/data/lxdm.conf.in 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/data/lxdm.conf.in 2014-07-05 12:12:59.000000000 +0200 +diff -uNr old-lxdm-0.4.0//data/lxdm.conf.in lxdm-0.4.0/data/lxdm.conf.in +--- old-lxdm-0.4.0//data/lxdm.conf.in 2011-07-28 00:01:57.537862491 +0200 ++++ lxdm-0.4.0/data/lxdm.conf.in 2011-07-28 00:02:14.276862487 +0200 @@ -1,14 +1,8 @@ [base] -## uncomment and set autologin username to enable autologin @@ -15,44 +16,19 @@ ## uncomment and set to set numlock on your keyboard # numlock=0 ---- lxdm-70843c4-old//src/config.c 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/src/config.c 2014-07-05 12:20:43.000000000 +0200 -@@ -29,6 +29,7 @@ - #include <stdlib.h> +diff -uNr old-lxdm-0.4.0//src/config.c lxdm-0.4.0/src/config.c +--- old-lxdm-0.4.0//src/config.c 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/config.c 2011-07-29 00:33:16.802620577 +0200 +@@ -30,6 +30,8 @@ #include <pwd.h> #include <unistd.h> -+#include "suse-sysconfig.h" ++#include "suse-sysconfig.h" ++ #define CONFIG_UI_FILE LXDM_DATA_DIR"/config.ui" //#define CONFIG_UI_FILE "../data/config.ui" -@@ -74,7 +75,7 @@ - g_key_file_load_from_file(config,CONFIG_FILE,G_KEY_FILE_KEEP_COMMENTS,NULL); - theme_name=g_key_file_get_string(config,"display", "theme", NULL); - theme_dir=g_build_filename(LXDM_DATA_DIR "/themes", theme_name, NULL); -- -+ - ui_nobody = g_build_filename(theme_dir, "nobody.png", NULL); - if( !g_file_test(ui_nobody, G_FILE_TEST_EXISTS) ) - { -@@ -273,7 +274,7 @@ - GDir *dir; - const char *face; - menu=gtk_menu_new(); -- -+ - dir=g_dir_open(FACES_DIR,0,NULL); - if(dir) while((face=g_dir_read_name(dir))!=NULL) - { -@@ -317,7 +318,7 @@ - G_CALLBACK (file_icon_selected), NULL); - gtk_widget_show (menuitem); - photo_popup=menu; -- -+ - g_signal_connect (menu, "unmap",G_CALLBACK (on_photo_popup_unmap), togglebutton); - } - if(gtk_toggle_button_get_active(togglebutton)) -@@ -367,13 +368,18 @@ + #define FACES_DIR "/usr/share/pixmaps/faces" +@@ -372,13 +374,18 @@ gtk_label_set_text(GTK_LABEL(w),user_name); } @@ -68,13 +44,13 @@ +/* I don't have a gdm_sysconfig_remove_value(), so just replace with a "save" with empty string + * g_key_file_remove_key(config,"base","autologin",NULL); + */ -+ result = gdm_sysconfig_save_value(SYSCONFIG_AUTOLOGIN_FILE, SYSCONFIG_AUTOLOGIN_KEY, ""); ++ result = gdm_sysconfig_save_value(SYSCONFIG_AUTOLOGIN_FILE, SYSCONFIG_AUTOLOGIN_KEY, ""); dirty++; + return result; } void prepare_user_autologin(GtkBuilder *builder) -@@ -383,7 +389,7 @@ +@@ -388,7 +395,7 @@ w=(GtkWidget*)gtk_builder_get_object(builder,"user-autologin"); if(!root) gtk_widget_set_sensitive(w,FALSE); g_signal_connect(w,"toggled",G_CALLBACK(on_user_autologin_toggled),NULL); @@ -83,53 +59,9 @@ if(!name) return; if(!strcmp(name,user_name)) { -@@ -507,7 +513,7 @@ - GtkWidget *w; - w=(GtkWidget*)gtk_builder_get_object(builder,"vbox2"); - val=g_key_file_get_integer(config,"display","bottom_pane",NULL); -- if(!root) -+ if(!root) - { - gtk_widget_set_sensitive(w,FALSE); - } -@@ -653,7 +659,7 @@ - GtkDialog *dialog_create(void) - { - GtkDialog *dlg; -- -+ - builder=gtk_builder_new(); - gtk_builder_add_from_file(builder,CONFIG_UI_FILE,NULL); - dlg=(GtkDialog*)gtk_builder_get_object(builder,"lxdm-config-dlg"); -@@ -686,7 +692,7 @@ - GError *error = NULL; - GOptionContext *context; - GtkDialog *dlg; -- -+ - context = g_option_context_new ("- lxdm config"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); -@@ -696,7 +702,7 @@ - exit (1); - } - prepare_user(); -- -+ - #if !GTK_CHECK_VERSION(3,0,0) - gtk_set_locale(); - #endif -@@ -708,7 +714,7 @@ - dlg=dialog_create(); - if(!dlg) exit(-1); - gtk_dialog_run(dlg); -- -+ - if(dirty) - { - gsize length; ---- lxdm-70843c4-old/src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-70843c4/src/gdm/gdm-sysconfig.c 2014-07-05 12:37:30.000000000 +0200 +diff -uNr old-lxdm-0.4.0//src/gdm/gdm-sysconfig.c lxdm-0.4.0/src/gdm/gdm-sysconfig.c +--- old-lxdm-0.4.0//src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/gdm/gdm-sysconfig.c 2011-07-29 00:09:51.029620578 +0200 @@ -0,0 +1,484 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -615,8 +547,9 @@ + g_strfreev (lines); + return result; +} ---- lxdm-70843c4-old/src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-70843c4/src/gdm/gdm-sysconfig.h 2014-07-05 12:40:55.000000000 +0200 +diff -uNr old-lxdm-0.4.0//src/gdm/gdm-sysconfig.h lxdm-0.4.0/src/gdm/gdm-sysconfig.h +--- old-lxdm-0.4.0//src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/gdm/gdm-sysconfig.h 2011-07-29 00:09:51.029620578 +0200 @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -661,142 +594,19 @@ +G_END_DECLS + +#endif /* __GDM_SYSCONFIG_H */ -\ No newline at end of file ---- lxdm-70843c4-old/src/lxdm.c 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/src/lxdm.c 2014-07-05 12:26:50.000000000 +0200 -@@ -78,6 +78,7 @@ - #include "auth.h" +diff -uNr old-lxdm-0.4.0//src/lxdm.c lxdm-0.4.0/src/lxdm.c +--- old-lxdm-0.4.0//src/lxdm.c 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/lxdm.c 2011-07-28 00:05:33.632862492 +0200 +@@ -72,6 +72,8 @@ #define LOGFILE "/var/log/lxdm.log" -+#include "suse-sysconfig.h" ++#include "suse-sysconfig.h" ++ typedef struct{ gboolean idle; -@@ -279,7 +280,7 @@ - static LXSession *lxsession_add(void) - { - LXSession *s; -- -+ - s=lxsession_find_idle(); - if(s) return s; - if(g_slist_length(session_list)>=4) -@@ -423,7 +424,7 @@ - char **arg; - int i; - int novtswitch=0; -- -+ - if(s->option) - { - p=g_key_file_get_string(config,s->option,"xarg",0); -@@ -431,7 +432,7 @@ - } - - p=g_key_file_get_string(config, "server", "arg", 0); -- if(!p) p=g_strdup("/usr/bin/X"); -+ if(!p) p=g_strdup("/usr/bin/X"); - g_shell_parse_argv(p, &arc, &arg, 0); - g_free(p); - for(i=1;i<arc;) -@@ -500,7 +501,7 @@ - int len; - int gotvtarg = 0; - gboolean plymouth; -- -+ - plymouth=plymouth_is_running(); - if(plymouth) - { -@@ -664,10 +665,10 @@ - int fd; - char addr[128]; - char buf[16]; -- -+ - sprintf(buf,"%d",dpy); - gethostname(addr,sizeof(addr)); -- -+ - fd=open(file,O_CREAT|O_TRUNC|O_WRONLY,0600); - if(!fd==-1) return; - xauth_write_uint16(fd,256); //FamilyLocalHost -@@ -704,14 +705,14 @@ - { - LXSession *s; - char *authfile; -- -+ - if(pw->pw_uid==0) /* root don't need it */ - return env; -- -+ - s=lxsession_find_user(pw->pw_uid); - if(!s) - return env; -- -+ - /* pam_mktemp may provide XAUTHORITY to DM, just use it */ - if((authfile=(char*)g_environ_getenv(env,"XAUTHORITY"))!=NULL) - { -@@ -736,7 +737,7 @@ - env=g_environ_setenv(env,"XAUTHORITY",authfile,TRUE); - chown(authfile,pw->pw_uid,pw->pw_gid); - g_free(authfile); -- -+ - return env; - } - #endif -@@ -777,7 +778,7 @@ - close(fd); - } - free(list); -- -+ - int fd = open("/dev/null", O_WRONLY); - if(fd == -1) return; - dup2(fd, 1); -@@ -788,7 +789,7 @@ - void switch_user(struct passwd *pw, const char *run, char **env) - { - int fd; -- -+ - setenv("USER",pw->pw_name,1); - setenv("LOGNAME",pw->pw_name,1); - setenv("SHELL",pw->pw_shell,1); -@@ -848,7 +849,7 @@ - lxdm_quit_self(1); - #else - lxdm_quit_self(1); --#endif -+#endif - } - } - } -@@ -917,9 +918,9 @@ - char **args; - int i; - char display[16]; -- -+ - lxsession_set_active(s); -- -+ - sprintf(display,":%d",s->display); - setenv("DISPLAY",display,1); - -@@ -964,7 +965,7 @@ - g_message("%ld: start xserver in %d retry",time(NULL),i); - if(s->dpy==NULL) - exit(EXIT_FAILURE); -- -+ - if(s->option && g_key_file_has_key(config,s->option,"numlock",NULL)) - { - i=g_key_file_get_integer(config,s->option,"numlock",0); -@@ -1052,7 +1053,7 @@ + gboolean greeter; +@@ -1209,7 +1211,7 @@ char *name=NULL,*exec=NULL; if(!session || !session[0]) { @@ -804,56 +614,8 @@ + name=gdm_sysconfig_load_value(SYSCONFIG_SESSION_FILE, SYSCONFIG_SESSION_KEY); if(!name && getenv("PREFERRED")) name = g_strdup(getenv("PREFERRED")); - if(!name && getenv("DESKTOP")) -@@ -1078,7 +1079,7 @@ - g_free(name); - g_free(exec); - return FALSE; -- } -+ } - } - else - { -@@ -1198,7 +1199,7 @@ - gboolean alloc_session=FALSE,alloc_lang=FALSE; - int pid; - LXSession *s,*prev; -- -+ - lxdm_save_login(session,lang); - if(!strcmp(session,"__default__")) - session=NULL; -@@ -1288,7 +1289,7 @@ - d = x; n = getenv("DISPLAY"); - if( ck_connector_open_session_with_parameters(s->ckc, &error, - "unix-user", &pw->pw_uid, -- // disable this, follow the gdm way -+ // disable this, follow the gdm way - //"display-device", &d, - "x11-display-device", &d, - "x11-display", &n, -@@ -1329,7 +1330,7 @@ - env=g_environ_setenv(env, "LC_MESSAGES", lang, TRUE); - env=g_environ_setenv(env, "LANGUAGE", lang, TRUE); - } -- -+ - #ifndef DISABLE_XAUTH - env=create_client_auth(pw,env); - #endif -@@ -1343,9 +1344,9 @@ - switch_user(pw, session_exec, env); - lxdm_quit_self(4); - }*/ -- -+ - s->child = pid = lxdm_auth_session_run(&s->auth,session_exec,env); -- -+ - g_free(session_name); - g_free(session_exec); - if(alloc_session) -@@ -1390,7 +1391,7 @@ + if(!session && getenv("DESKTOP")) +@@ -1538,7 +1540,7 @@ int i,count,ret; int success=0; @@ -862,71 +624,27 @@ if(!p) return 0; users=g_strsplit(p," ",8); g_free(p); -@@ -1424,7 +1425,7 @@ - /* autologin users starting with '@' get own config section with - * user=, session= and lang= entry - */ -- if(p[0]=='@') -+ if(p[0]=='@') - { - option=p+1; - user=g_key_file_get_string(config,option,"user",NULL); -@@ -1536,7 +1537,7 @@ - char *face; - char **black=NULL; - char **white=NULL; -- -+ - // load black list - face=g_key_file_get_string(config,"userlist","black",NULL); - if(face) -@@ -1558,7 +1559,7 @@ - { - char *valid_shell; - gboolean ret; -- -+ - if(strstr(pw->pw_shell, "nologin")) - continue; - -@@ -1663,7 +1664,7 @@ - } - else if(!strcmp(arg[i],"-c") && i+1<arc) - { -- return lxcom_send("/var/run/lxdm/lxdm.sock",arg[i+1],NULL)?0:-1; -+ return lxcom_send("/var/run/lxdm/lxdm.sock",arg[i+1],NULL)?0:-1; - } - else if(!strcmp(arg[i],"-w") && i+1<arc) - { -@@ -1696,7 +1697,7 @@ - g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); - - get_lock(); -- -+ - if(0!=mkdir("/var/run/lxdm",0755)) - { - if(errno==EEXIST) ---- lxdm-70843c4-old/src/Makefile.am 2014-05-11 15:59:40.000000000 +0200 -+++ lxdm-70843c4/src/Makefile.am 2014-07-05 12:29:10.000000000 +0200 -@@ -22,6 +22,7 @@ +diff -uNr old-lxdm-0.4.0//src/Makefile.am lxdm-0.4.0/src/Makefile.am +--- old-lxdm-0.4.0//src/Makefile.am 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/Makefile.am 2011-07-28 00:16:01.647862492 +0200 +@@ -21,6 +21,7 @@ lxdm_binary_SOURCES = \ - lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c auth.h lxcommon.h \ + lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \ + gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h suse-sysconfig.h\ $(NULL) - libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk lxdm-session -@@ -112,6 +113,7 @@ + libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk +@@ -98,5 +99,6 @@ lxdm_config_SOURCES = \ config.c \ + gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h suse-sysconfig.h\ $(NULL) - ---- lxdm-70843c4-old/src/suse-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-70843c4/src/suse-sysconfig.h 2014-07-05 12:45:03.000000000 +0200 +diff -uNr old-lxdm-0.4.0//src/suse-sysconfig.h lxdm-0.4.0/src/suse-sysconfig.h +--- old-lxdm-0.4.0//src/suse-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/suse-sysconfig.h 2011-07-28 00:24:29.437862492 +0200 @@ -0,0 +1,32 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * ++++++ lxdm-0.4.1-background-12.1.patch ++++++ --- lxdm-0.4.1.old/data/lxdm.conf.in 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1/data/lxdm.conf.in 2011-12-02 16:46:15.821006819 +0100 @@ -27,7 +27,7 @@ gtk_theme=Clearlooks ## background of the greeter -bg=/usr/share/backgrounds/default.png +bg=/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.jpg ## if show bottom pane bottom_pane=1 ++++++ lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch ++++++ From: 4e4f5ca87fb03c2e5b937f381673c51fd00bcb54 2012-10-22 From: dgod <[email protected]> Subject: [PATCH] fix gtk2 keyboard list empty diff -uNr lxdm-0.4.1-old/data/themes/Industrial/greeter.ui lxdm-0.4.1-new/data/themes/Industrial/greeter.ui --- lxdm-0.4.1-old/data/themes/Industrial/greeter.ui 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/greeter.ui 2012-10-22 11:15:02.000000000 +0200 @@ -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> diff -uNr lxdm-0.4.1-old/data/lxdm.glade lxdm-0.4.1-new/data/lxdm.glade --- lxdm-0.4.1-old/data/lxdm.glade 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/lxdm.glade 2012-10-22 11:15:02.000000000 +0200 @@ -125,7 +125,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> ++++++ lxdm-0.4.1-fix-small-bug-in-theme.patch ++++++ From: 8bdf42d903408ed6111b95a2992f3b9d471cfab6 2012-05-29 From: dgod <[email protected]> Subject: [PATCH] fix small bug in theme diff -uNr lxdm-0.4.1-old/data/themes/Industrial/greeter-gtk3.ui lxdm-0.4.1-new/data/themes/Industrial/greeter-gtk3.ui --- lxdm-0.4.1-old/data/themes/Industrial/greeter-gtk3.ui 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/greeter-gtk3.ui 2014-04-18 19:41:03.548173619 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0"?> <interface> - <!-- interface-requires gtk+ 2.12 --> - <!-- interface-naming-policy project-wide --> <object class="GtkWindow" id="lxdm"> <property name="decorated">False</property> <child> diff -uNr lxdm-0.4.1-old/data/themes/Industrial/gtkrc lxdm-0.4.1-new/data/themes/Industrial/gtkrc --- lxdm-0.4.1-old/data/themes/Industrial/gtkrc 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/gtkrc 2014-04-18 19:40:46.627466119 +0200 @@ -45,6 +45,6 @@ widget "lxdm" style "back" widget "lxdm.*.time" style "time" -widget "lxdm.*.prompt" style "prompt" +widget "*.prompt" style "prompt" widget "lxdm.*.bottom_pane" style "bottom" widget_class "GtkWindow.*.GtkEventBox.*.<GtkLabel>" style "bottom" ++++++ lxdm-0.5.0.tar.xz -> lxdm-0.4.1.tar.bz2 ++++++ ++++ 17050 lines of diff (skipped) ++++++ lxdm-bnc-741454-d4e41ec.patch ++++++ >From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001 From: dgod <[email protected]> Date: Sun, 25 Dec 2011 15:23:19 +0800 Subject: [PATCH] fix event check bug caused cpu 100% --- src/lxcom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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) -- 1.7.4.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
