Attachment #203891 for bug #236027

View | Details | Raw Unified | Return to bug 236027
Collapse All | Expand All





PORTNAME=	slim
PORTVERSION=	1.3.6
PORTREVISION=	17
CATEGORIES=	x11
MASTER_SITES=	ftp://ftp.berlios.de/pub/slim/ \
		SF/slim.berlios

		xrender xt
USE_RC_SUBR=	slim
USE_LDCONFIG=	yes

SUB_FILES=	pkg-message

CMAKE_ARGS=	-DUSE_CONSOLEKIT=yes \

		-DBUILD_SLIMLOCK=no \
		-DBUILD_SHARED_LIBS=yes

OPTIONS_DEFINE=		XDEFAULT PAM UTF8 CONSOLEKIT
OPTIONS_DEFAULT=	XDEFAULT PAM UTF8 CONSOLEKIT
OPTIONS_SUB=	yes

XDEFAULT_DESC=Allow to set a default xsession in .xinitrc
UTF8_DESC=	Support UTF-8 characters
CONSOLEKIT_DESC=Enable support for consolekit


PAM_CMAKE_ON=	-DUSE_PAM=yes
PAM_CMAKE_OFF=	-DUSE_PAM=no

# patch taken from https://github.com/iwamatsu/slim/pull/1
XDEFAULT_EXTRA_PATCHES+=  ${PATCHDIR}/extra-patch-xdefault

# patch taken from slim-unicode in Arch User Repository
UTF8_EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-utf8


Lines 1-2 Link Here

(-)distinfo (+1 lines)
		1	TIMESTAMP = 1555924312
1	SHA256 (slim-1.3.6.tar.gz) = 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df	2	SHA256 (slim-1.3.6.tar.gz) = 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df
2	SIZE (slim-1.3.6.tar.gz) = 232547	3	SIZE (slim-1.3.6.tar.gz) = 232547




--- cfg.orig	2019-02-25 15:10:23.454289000 +0100
+++ cfg.cpp	2019-02-25 15:10:52.700402000 +0100
@@ -293,6 +293,9 @@
 
 	sessions.clear();
 
+	pair<string,string> session("","default");
+	sessions.push_back(session);
+
 	if( !strSessionDir.empty() ) {
 		DIR *pDir = opendir(strSessionDir.c_str());
 
@@ -335,11 +338,6 @@
 			}
 			closedir(pDir);
 		}
-	}
-
-	if (sessions.empty()){
-        pair<string,string> session("","");
-        sessions.push_back(session);
 	}
 }




Thanks to Nikos Ntarmos, it is now possible to start slim from /etc/ttys.
Please see %%PREFIX%%/etc/rc.d/slim for instructions on how to do that.

Alternatively, just put the following entry in /etc/rc.conf:

slim_enable=yes

into /etc/rc.conf

*** Option "sessions" is no longer supported. ***

Now you need to put session files in the directory specified by option
"sessiondir". They should be xdg-style .desktop files.
The "Name" entry in the session file would be used as session name.
The "Exec" entry would replace %session in login_cmd.

WARNING: the default behaviour in parsing .xinitrc file has changed!
         You can now set a default xsession as described here:
         https://github.com/iwamatsu/slim/pull/1
         You can turn back to random xsession selection by compiling
         this port without the option XDEFAULT.

*************************************************************************

Return to bug 236027

Lines 3-9 Link Here

(-)Makefile (-3 / +8 lines)
3		3
4	PORTNAME= slim	4	PORTNAME= slim
5	PORTVERSION= 1.3.6	5	PORTVERSION= 1.3.6
6	PORTREVISION= 16	6	PORTREVISION= 17
7	CATEGORIES= x11	7	CATEGORIES= x11
8	MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \	8	MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \
9	SF/slim.berlios	9	SF/slim.berlios
Lines 23-28 Link Here
23	xrender xt	23	xrender xt
24	USE_RC_SUBR= slim	24	USE_RC_SUBR= slim
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
		26
26	SUB_FILES= pkg-message	27	SUB_FILES= pkg-message
27		28
28	CMAKE_ARGS= -DUSE_CONSOLEKIT=yes \	29	CMAKE_ARGS= -DUSE_CONSOLEKIT=yes \
Lines 29-38 Link Here
29	-DBUILD_SLIMLOCK=no \	30	-DBUILD_SLIMLOCK=no \
30	-DBUILD_SHARED_LIBS=yes	31	-DBUILD_SHARED_LIBS=yes
31		32
32	OPTIONS_DEFINE= PAM UTF8 CONSOLEKIT	33	OPTIONS_DEFINE= XDEFAULT PAM UTF8 CONSOLEKIT
33	OPTIONS_DEFAULT= PAM UTF8 CONSOLEKIT	34	OPTIONS_DEFAULT= XDEFAULT PAM UTF8 CONSOLEKIT
34	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
35		36
		37	XDEFAULT_DESC=Allow to set a default xsession in .xinitrc
36	UTF8_DESC= Support UTF-8 characters	38	UTF8_DESC= Support UTF-8 characters
37	CONSOLEKIT_DESC=Enable support for consolekit	39	CONSOLEKIT_DESC=Enable support for consolekit
38		40
Lines 41-46 Link Here
41	PAM_CMAKE_ON= -DUSE_PAM=yes	43	PAM_CMAKE_ON= -DUSE_PAM=yes
42	PAM_CMAKE_OFF= -DUSE_PAM=no	44	PAM_CMAKE_OFF= -DUSE_PAM=no
43		45
		46	# patch taken from https://github.com/iwamatsu/slim/pull/1
		47	XDEFAULT_EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-xdefault
		48
44	# patch taken from slim-unicode in Arch User Repository	49	# patch taken from slim-unicode in Arch User Repository
45	UTF8_EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-utf8	50	UTF8_EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-utf8
46		51

Line 0 Link Here

(-)files/extra-patch-xdefault (+23 lines)
	1	--- cfg.orig 2019-02-25 15:10:23.454289000 +0100
	2	+++ cfg.cpp 2019-02-25 15:10:52.700402000 +0100
	3	@@ -293,6 +293,9 @@
	4
	5	sessions.clear();
	6
	7	+ pair<string,string> session("","default");
	8	+ sessions.push_back(session);
	9	+
	10	if( !strSessionDir.empty() ) {
	11	DIR *pDir = opendir(strSessionDir.c_str());
	12
	13	@@ -335,11 +338,6 @@
	14	}
	15	closedir(pDir);
	16	}
	17	- }
	18	-
	19	- if (sessions.empty()){
	20	- pair<string,string> session("","");
	21	- sessions.push_back(session);
	22	}
	23	}

Lines 3-19 Link Here

(-)files/pkg-message.in (-6 / +7 lines)
3	Thanks to Nikos Ntarmos, it is now possible to start slim from /etc/ttys.	3	Thanks to Nikos Ntarmos, it is now possible to start slim from /etc/ttys.
4	Please see %%PREFIX%%/etc/rc.d/slim for instructions on how to do that.	4	Please see %%PREFIX%%/etc/rc.d/slim for instructions on how to do that.
5		5
6	Alternatively, just put	6	Alternatively, just put the following entry in /etc/rc.conf:
7		7
8	slim_enable=yes	8	slim_enable=yes
9		9
10	into /etc/rc.conf
11
12	* Option "sessions" is no longer supported. *	10	* Option "sessions" is no longer supported. *
13
14	Now you need to put session files in the directory specified by option	11	Now you need to put session files in the directory specified by option
15	"sessiondir". They should be xdg-style .desktop files.	12	"sessiondir". They should be xdg-style .desktop files.
16	The "Name" entry in the session file would be used as session name.
17	The "Exec" entry would replace %session in login_cmd.
18		13
		14	WARNING: the default behaviour in parsing .xinitrc file has changed!
		15	You can now set a default xsession as described here:
		16	https://github.com/iwamatsu/slim/pull/1
		17	You can turn back to random xsession selection by compiling
		18	this port without the option XDEFAULT.
		19
19	*************************************************************************	20	*************************************************************************