Attachment 203891 Details for Bug 236027 – Add the option XDEFAULT to allow setting a default xsession in .xinitrc

[patch] Add the option XDEFAULT to allow setting a default xsession in .xinitrc

option_xdefault.patch (text/plain), 3.61 KB, created by Andrew on 2019-04-22 10:08:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew

Created: 2019-04-22 10:08:38 UTC

Size: 3.61 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 499616)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	slim
> PORTVERSION=	1.3.6
>-PORTREVISION=	16
>+PORTREVISION=	17
> CATEGORIES=	x11
> MASTER_SITES=	ftp://ftp.berlios.de/pub/slim/ \
> 		SF/slim.berlios
>@@ -23,6 +23,7 @@
> 		xrender xt
> USE_RC_SUBR=	slim
> USE_LDCONFIG=	yes
>+
> SUB_FILES=	pkg-message
> 
> CMAKE_ARGS=	-DUSE_CONSOLEKIT=yes \
>@@ -29,10 +30,11 @@
> 		-DBUILD_SLIMLOCK=no \
> 		-DBUILD_SHARED_LIBS=yes
> 
>-OPTIONS_DEFINE=		PAM UTF8 CONSOLEKIT
>-OPTIONS_DEFAULT=	PAM UTF8 CONSOLEKIT
>+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
> 
>@@ -41,6 +43,9 @@
> 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
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 499616)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1555924312
> SHA256 (slim-1.3.6.tar.gz) = 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df
> SIZE (slim-1.3.6.tar.gz) = 232547
>Index: files/extra-patch-xdefault
>===================================================================
>--- files/extra-patch-xdefault	(nonexistent)
>+++ files/extra-patch-xdefault	(working copy)
>@@ -0,0 +1,23 @@
>+--- 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);
>+ 	}
>+ }
>
>Property changes on: files/extra-patch-xdefault
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 499616)
>+++ files/pkg-message.in	(working copy)
>@@ -3,17 +3,18 @@
> 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
>+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.
>+
> *************************************************************************

Flags:

henry.hu.sh: maintainer-approval+

Actions: View | Diff

Attachments on bug 236027: 202354 | 203891