commit lxdm for openSUSE:Factory
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 - trcs@gmx.com
+
+- 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 andrea@opensuse.org
+Source5: lxdm
+Source6: sysconfig.lxdm
+# PATCH-FEATURE-OPENSUSE lxdm-0.4.0-use-sysconfig.patch andrea@opensuse.org
# 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 werner@novell.com
+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 werner@novell.com
# 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
From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001 From: dgod
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: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de