packages/lxsession
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

Browse Source
This commit is contained in:
zhuchunyi 2019-11-06 19:42:27 +08:00
commit c34133579c
6 changed files with 489 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
1004-Never-free-buffer-returned-by-gtk_entry_get_text.patch Normal file
View File

@ -0,0 +1,28 @@
From c3f821656bc3402308a495af7f7f1718687f84a1 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 22 Aug 2016 15:36:52 +0900
Subject: [PATCH] Never free buffer returned by gtk_entry_get_text()
Manual says that gtk_entry_get_text(entry) equals to
gtk_entry_buffer_get_text (gtk_entry_get_buffer (entry)), and
the string returned by gtk_entry_buffer_get_text() must not be
freed.
---
lxsession-edit/lxsession-edit.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/lxsession-edit/lxsession-edit.c b/lxsession-edit/lxsession-edit.c
index af63edb..0bb23bf 100644
--- a/lxsession-edit/lxsession-edit.c
+++ b/lxsession-edit/lxsession-edit.c
@@ -144,7 +144,6 @@ int main(int argc, char** argv)
g_key_file_set_string( kf, "Session", "windows_manager/command", wm_cmd );
data = g_key_file_to_data(kf, &len, NULL);
g_file_set_contents(cfg, data, len, NULL);
- g_free( wm_cmd );
}
}
}
--
2.9.3

67
lxsession-0.5.2-git9f8d6133-reload.patch Normal file
View File

@ -0,0 +1,67 @@
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/Makefile.am.reload 2016-06-21 00:15:37.370393487 +0900
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/Makefile.am 2016-06-21 00:17:34.190841661 +0900
@@ -418,6 +418,7 @@
--pkg gio-2.0 \
--pkg posix \
--pkg lxsettings-daemon \
+ --pkg xevent \
$(buildinclip_VALAFLAGS) \
$(buildinpolkit_VALAFLAGS) \
$(lxsession_gtk_lxsession_VALAFLAGS) \
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/vapi/xevent.vapi.reload 2016-06-21 00:15:37.370393487 +0900
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/vapi/xevent.vapi 2016-06-21 00:15:37.370393487 +0900
@@ -0,0 +1,10 @@
+[CCode (cprefix = "LxsessionXEvent", cheader_filename = "lxsettings-daemon/xevent.h")]
+ public static void send_internal_command( int cmd );
+ public static bool xdpy_init();
+
+[CCode (cname = "int", cprefix = "LXS_", cheader_filename = "lxsettings-daemon/xevent.h", has_type_id = false)]
+ public enum LXS_CMD {
+ RELOAD,
+ EXIT,
+ LAST_CMD
+ }
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.c.reload 2016-04-18 03:13:01.000000000 +0900
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.c 2016-06-21 00:15:37.370393487 +0900
@@ -71,13 +71,19 @@
XSync(dpy, False);
}
+gboolean xdpy_init()
+{
+ dpy = XOpenDisplay( g_getenv("DISPLAY") );
+ if( ! dpy )
+ return FALSE;
+}
+
gboolean xevent_init()
{
X11Source* xsource;
int fd;
- dpy = XOpenDisplay( g_getenv("DISPLAY") );
- if( ! dpy )
+ if( xdpy_init() == FALSE )
return FALSE;
/* according to the spec, private Atoms should prefix their names with _. */
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsession/main.vala.reload 2016-04-18 03:13:01.000000000 +0900
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsession/main.vala 2016-06-21 00:15:37.370393487 +0900
@@ -99,6 +99,17 @@
return -1;
}
+ if (xdpy_init() == false)
+ {
+ return 1;
+ }
+
+ if (reload == true)
+ {
+ send_internal_command(LXS_CMD.RELOAD);
+ return 0;
+ }
+
message ("Session is %s",session);
message ("DE is %s", desktop_environnement);

13
lxsession-0.5.2-notify-daemon-default.patch Normal file
View File

@ -0,0 +1,13 @@
--- lxsession-0.5.2/lxsession/settings.vala.notify 2015-08-11 14:14:22.187535605 +0900
+++ lxsession-0.5.2/lxsession/settings.vala 2015-08-11 14:37:18.868694268 +0900
@@ -258,6 +258,10 @@
set_generic_default("Session", "proxy_manager", "command", "string", "build-in");
set_generic_default("Session", "keyring", "command", "string", "ssh-agent");
+ set_generic_default("Session", "notification", "command", "string", "/usr/libexec/notification-daemon");
+ set_generic_default("Session", "notification", "autostart", "string", "true");
+
+
/* Set Xsettings default */
set_generic_default("GTK", "iXft", "Antialias", "string", "1");

BIN
lxsession-0.5.3.tar.xz Normal file
View File

Binary file not shown.

20
lxsession-edit-0.5.2-fix-invalid-memcpy.patch Normal file
View File

@ -0,0 +1,20 @@
--- lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c.memmove 2014-10-05 08:49:49.000000000 +0900
+++ lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c 2016-02-15 19:21:23.780783021 +0900
@@ -216,7 +216,7 @@ void update_enable_state(GKeyFile* kf, g
if( strcmp(list[i], session_name) == 0 )
{
g_free(list[i]);
- memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
+ memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
--n;
break;
}
@@ -259,7 +259,7 @@ void update_enable_state(GKeyFile* kf, g
if( strcmp(list[i], session_name) == 0 )
{
g_free(list[i]);
- memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
+ memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
--n;
break;
}

361
lxsession.spec Normal file
View File

@ -0,0 +1,361 @@
# review https://bugzilla.redhat.com/show_bug.cgi?id=502404
# renamed from lxsession-lite. Original review at
# https://bugzilla.redhat.com/show_bug.cgi?id=442268
%global usegit 0
%global mainrel 2
%global githash e284f41ad4467c8b292d94cbcbc9a3393c618da5
%global shorthash %(TMP=%githash ; echo ${TMP:0:10})
%global gitdate Sat, 10 Dec 2016 12:23:09 +0200
%global gitdate_num 20161210
%if 0%{?usegit} >= 1
%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash}
%else
%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}
%endif
Name: lxsession
Version: 0.5.3
Release: %{fedorarel}%{?dist}.5
Summary: Lightweight X11 session manager
Summary(de): Leichtgewichtiger X11 Sitzungsverwalter
Group: User Interface/Desktops
License: GPLv2+
URL: http://lxde.sourceforge.net/
%if 0%{?usegit} >= 1
Source0: https://github.com/lxde/lxsession/archive/%{githash}/%{name}-%{version}-D%{gitdate_num}git%{githash}.tar.gz
%else
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
%endif
#http://sourceforge.net/p/lxde/bugs/760/
Patch1000: lxsession-0.5.2-git9f8d6133-reload.patch
Patch1002: lxsession-0.5.2-notify-daemon-default.patch
# Possibly fix bug 1308300
Patch1003: lxsession-edit-0.5.2-fix-invalid-memcpy.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1334064
# https://github.com/lxde/lxsession/pull/10
Patch1004: 1004-Never-free-buffer-returned-by-gtk_entry_get_text.patch
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(indicator-0.4)
BuildRequires: pkgconfig(appindicator-0.1)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(unique-1.0)
BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: vala
BuildRequires: docbook-utils
BuildRequires: intltool
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl
BuildRequires: %{_bindir}/xsltproc
BuildRequires: automake
BuildRequires: autoconf
# name changed back from lxsession-lite to lxsession
Obsoletes: lxsession-lite <= 0.3.6-6
Provides: lxsession-lite = %{version}-%{release}
# lxde-settings-daemon was merged into lxsession
Obsoletes: lxde-settings-daemon <= 0.4.1-2
Provides: lxde-settings-daemon = 0.4.1-3
# required for suspend and hibernate
Requires: upower
%description
LXSession is a standard-compliant X11 session manager with shutdown/
reboot/suspend support via systemd. In connection with gdm it also supports user
switching.
LXSession is derived from XSM and is developed as default X11 session manager
of LXDE, the Lightweight X11 Desktop Environment. Though being part of LXDE,
it's totally desktop-independent and only has few dependencies.
%description -l de
LXSession Lite ist ein Standard konformer X11 Sitzungsverwalter mit
Unterstützung für Herunterfahren, Neustart und Schlafmodus mittels systemd.
Zusammen mit GDM unterstützt auch Benutzerwechsel.
LXSession Lite ist von XSM abgeleitet und wird als Sitzungsverwalter von LXDE,
der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Obwohl er Teil von
LXDE ist, ist er komplett Desktop unabhängig und hat nur wenige
Abhängigkeiten.
%package edit
Summary: Simple GUI to configure what’s automatically started in LXDE
%description edit
LXSession-edit is a tool to manage freedesktop.org compliant desktop session
autostarts. Currently adding and removing applications from the startup list
is not yet available, but it will be support in the next release.
%package -n lxpolkit
Summary: Simple PolicyKit authentication agent
Group: User Interface/Desktops
Requires: polkit >= 0.95
# required to replace polkit-gnome and polkit-kde
Provides: PolicyKit-authentication-agent
%description -n lxpolkit
LXPolKit is a simple PolicyKit authentication agent developed for LXDE, the
Lightweight X11 Desktop Environment.
%prep
%if 0%{?usegit} < 1
%setup -q -n %{name}-%{version}%{?prever}
%else
%setup -q -n %{name}-%{githash}
%endif
#%patch0 -p1 -b .dsofix
%patch1000 -p1 -b .reload
%patch1002 -p1 -b .notify
%patch1003 -p1 -b .memmove
%patch1004 -p1 -b .invalid_free
mkdir m4 || :
sh autogen.sh
# Don't start in Xfce to avoid bugs like
# https://bugzilla.redhat.com/show_bug.cgi?id=616730
sed -i 's/^NotShowIn=GNOME;KDE;/NotShowIn=GNOME;KDE;XFCE;/g' data/lxpolkit.desktop.in.in
# fix icon in desktop file
# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxsession-edit;a=commit;h=3789a96691eadac9b8f3bf3034a97645860bd138
sed -i 's/^Icon=xfwm4/Icon=session-properties/g' data/lxsession-edit.desktop.in
%build
%configure --enable-man --disable-silent-rules \
--enable-advanced-notifications \
--enable-debug \
%{nil}
make clean
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
%find_lang %{name}
mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xdg/%{name}
desktop-file-install \
--remove-key="NotShowIn" \
--add-only-show-in="LXDE;" \
--delete-original \
--dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
%{buildroot}%{_sysconfdir}/xdg/autostart/lxpolkit.desktop
desktop-file-install \
--remove-key="NotShowIn" \
--add-only-show-in="LXDE;" \
--delete-original \
%{buildroot}%{_datadir}/applications/*.desktop
%files -f %{name}.lang
%doc AUTHORS ChangeLog COPYING README data/desktop.conf.example
%{_bindir}/%{name}
%{_bindir}/%{name}-logout
%{_bindir}/%{name}-db
%{_bindir}/%{name}-default
%{_bindir}/%{name}-default-apps
%{_bindir}/%{name}-default-terminal
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/%{name}-xsettings
%{_bindir}/lxsettings-daemon
%{_bindir}/%{name}-xdg-autostart
%{_bindir}/lxlock
%{_bindir}/lxclipboard
%{_datadir}/%{name}/
%exclude %{_datadir}/%{name}/ui/lxpolkit.ui
%exclude %{_datadir}/%{name}/ui/lxsession-edit.ui
%{_mandir}/man*/%{name}*.*
# we need to own
%dir %{_sysconfdir}/xdg/%{name}
%{_datadir}/applications/lxsession-default-apps.desktop
%{_mandir}/man1/lxlock.1*
%{_mandir}/man1/lxpolkit.1*
%{_mandir}/man1/lxclipboard.1*
%{_mandir}/man1/lxsettings-daemon.1*
%files edit
%{_bindir}/%{name}-edit
%{_datadir}/applications/lxsession-edit.desktop
%{_datadir}/%{name}/ui/lxsession-edit.ui
%files -n lxpolkit
%{_bindir}/lxpolkit
%config %{_sysconfdir}/xdg/autostart/lxpolkit.desktop
%{_datadir}/%{name}/ui/lxpolkit.ui
%changelog
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Dec 11 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.3-2
- 0.5.3 retagged and released.
* Sun Dec 11 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.3-1.D20161210gite284f41ad4
- 0.5.3 (and some minor fix from git)
* Tue Nov 8 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-12.D20161106git7b9a9580da
- Update to the latest git
* Sun Aug 28 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-11.D20160817git699c1695c2
- Update to the latest git
- Never free buffer returned by gtk_entry_get_text()
(bug 1334064, github:lxsession#10)
* Tue Jun 21 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-10.D20160417git9f8d613332
- Update to the latest git
* Sat Apr 30 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-9
- Only set dpy variable when reloading to aviod polling on
subsequent process (bug 1294579)
* Mon Feb 15 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-8
- Fix invalid memcpy() usage on lxsession-edit (possibly fix
bug 1308300)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Aug 11 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-6
- set notification default command and launch it by default
(bug 1250742)
* Mon Jul 13 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-5
- Handle config key when key2 is null correctly (bug 1242273)
* Fri Jun 26 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-4
- Patch to work with imsettings-lxde
* Mon Jun 22 2015 Kevin Fenzi <kevin@scrye.com> 0.5.2-3
- Fix typo in last Change with desktop name.
* Mon Jun 22 2015 Leigh Scott <leigh123linux@googlemail.com> - 0.5.2-2
- Add only-show-in LXDE
* Sun Jun 21 2015 Leigh Scott <leigh123linux@googlemail.com> - 0.5.2-1
- Update to 0.5.2
* Wed Jun 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-1
- 0.5.2
- lxpolkit is now a subpackage of lxsession
- lxsession-edit is now a subpackage of lxsession
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed Mar 21 2012 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.6.1-3
- Require ConsoleKit (#800658)
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Dec 09 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.6.1-1
- Update to 0.4.6.1
- Require upower (#755376)
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.4.5-4
- Rebuild for new libpng
* Fri Mar 25 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.5-3
- No longer require hal (#688959)
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Nov 17 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.5-1
- Update to 0.4.5
* Tue Apr 06 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.4-1
- Update to 0.4.4
* Sat Mar 20 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.3-1
- Update to 0.4.3
- Fix labels of the German logout dialog
* Mon Mar 08 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.2-1
- Update to 0.4.2
* Wed Feb 17 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.1-2
- Add patch to fix DSO linking (#564645)
* Fri Dec 11 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.1-1
- Update to 0.4.1
* Tue Dec 08 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.0-1
- Update to 0.4.0
- Obsolete lxde-settings-deamon
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Mon May 18 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.8-1
- Update to 0.3.8 and remove all patches
- Rename back to lxsession again (upstream)
* Mon Apr 27 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.6-5
- Fix Session name (Andrew Lee)
* Mon Apr 27 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.6-4
- Support user switching also with newer gdm
- Add patch to fix icon search path (Marty Jack)
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Oct 09 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.6-2
- Preserve timestamps during install
* Thu Jun 12 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.6-1
- Update to 0.3.6
- Remove docbook hack
* Sun Apr 20 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.5-1
- Switch to LXSession lite and drop xorg-x11-xsm requirement again.
* Sat Apr 12 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.2-2
- Require xorg-x11-xsm
* Sat Apr 12 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.2-1
- Update to 0.3.2
* Mon Mar 10 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.0-1
- Initial Fedora RPM