slim: update to 1.3.5.
This commit is contained in:
parent
5693fd3b5a
commit
015d7b3362
6 changed files with 8 additions and 58 deletions
|
@ -7,4 +7,4 @@ password required pam_unix.so
|
||||||
session required pam_limits.so
|
session required pam_limits.so
|
||||||
session required pam_unix.so
|
session required pam_unix.so
|
||||||
session optional pam_loginuid.so
|
session optional pam_loginuid.so
|
||||||
-session optional pam_systemd.so
|
session optional pam_systemd.so
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=SLiM Simple Login Manager
|
|
||||||
After=systemd-user-sessions.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/bin/slim -nodaemon
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
Alias=display-manager.service
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- app.cpp (revision 223)
|
|
||||||
+++ app.cpp (working copy)
|
|
||||||
@@ -593,7 +593,7 @@
|
|
||||||
|
|
||||||
n++;
|
|
||||||
|
|
||||||
- child_env = static_cast<char**>(malloc(sizeof(char*)*n));
|
|
||||||
+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
|
|
||||||
memcpy(child_env, old_env, sizeof(char*)*n);
|
|
||||||
child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
|
|
||||||
child_env[n] = NULL;
|
|
|
@ -1,13 +0,0 @@
|
||||||
--- image.cpp 2012-06-26 04:20:14.000000000 -0400
|
|
||||||
+++ image.cpp 2012-06-27 11:41:34.000000000 -0400
|
|
||||||
@@ -781,7 +781,11 @@
|
|
||||||
(png_infopp) NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
|
||||||
+ if (setjmp(png_jmpbuf((png_ptr)))) {
|
|
||||||
+#else
|
|
||||||
if (setjmp(png_ptr->jmpbuf)) {
|
|
||||||
+#endif
|
|
||||||
goto png_destroy;
|
|
||||||
}
|
|
|
@ -1,20 +0,0 @@
|
||||||
--- panel.cpp 2010-10-24 06:01:15.117000019 +0000
|
|
||||||
+++ panel.cpp 2010-10-24 17:26:30.987999967 +0000
|
|
||||||
@@ -23,7 +23,7 @@
|
|
||||||
Root = root;
|
|
||||||
cfg = config;
|
|
||||||
|
|
||||||
- session = "";
|
|
||||||
+ session = cfg->nextSession(session);
|
|
||||||
|
|
||||||
// Init GC
|
|
||||||
XGCValues gcv;
|
|
||||||
@@ -188,7 +188,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
void Panel::ClearPanel() {
|
|
||||||
- session = "";
|
|
||||||
+ session = cfg->nextSession(session);
|
|
||||||
Reset();
|
|
||||||
XClearWindow(Dpy, Root);
|
|
||||||
XClearWindow(Dpy, Win);
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'slim'
|
# Template file for 'slim'
|
||||||
pkgname=slim
|
pkgname=slim
|
||||||
version=1.3.4
|
version=1.3.5
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no"
|
configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no"
|
||||||
short_desc="Desktop-independent graphical login manager for X11"
|
short_desc="Desktop-independent graphical login manager for X11"
|
||||||
|
@ -9,13 +9,16 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://slim.berlios.de/"
|
homepage="http://slim.berlios.de/"
|
||||||
distfiles="http://download.berlios.de/slim/slim-${version}.tar.gz"
|
distfiles="http://download.berlios.de/slim/slim-${version}.tar.gz"
|
||||||
checksum=155c26460c98b9f0925624028b4254afc0de4fda33300f3ac45606b2c5cbd501
|
checksum=818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629
|
||||||
|
|
||||||
conf_files="/etc/slim.conf /etc/pam.d/slim"
|
conf_files="/etc/slim.conf /etc/pam.d/slim"
|
||||||
makedepends="cmake pkg-config libpng-devel libjpeg-turbo-devel libXmu-devel
|
makedepends="cmake pkg-config libpng-devel libjpeg-turbo-devel libXmu-devel
|
||||||
libXft-devel pam-devel"
|
libXft-devel pam-devel"
|
||||||
|
|
||||||
|
pre_configure() {
|
||||||
|
sed -i 's|usr/lib/systemd/system|/&|' CMakeLists.txt
|
||||||
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
|
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
|
||||||
vinstall ${FILESDIR}/slim.service 644 usr/lib/systemd/system
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue