svn commit: r513545 - in head/x11/slim: . files
Xin LI
delphij at FreeBSD.org
Wed Oct 2 05:04:16 UTC 2019
Author: delphij
Date: Wed Oct 2 05:04:14 2019
New Revision: 513545
URL: https://svnweb.freebsd.org/changeset/ports/513545
Log:
x11/slim: Permit setting a default xsession from .xinitrc.
PR: 236027
Submitted by: Andrew Hotlab <andrew.hotlab hotmail com>
Approved by: Henry Hu (maintainer)
Added:
head/x11/slim/files/extra-patch-xdefault (contents, props changed)
Modified:
head/x11/slim/Makefile
head/x11/slim/distinfo
head/x11/slim/files/pkg-message.in
Modified: head/x11/slim/Makefile
==============================================================================
--- head/x11/slim/Makefile Wed Oct 2 05:03:22 2019 (r513544)
+++ head/x11/slim/Makefile Wed Oct 2 05:04:14 2019 (r513545)
@@ -3,7 +3,7 @@
PORTNAME= slim
PORTVERSION= 1.3.6
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= x11
MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \
SF/slim.berlios
@@ -23,16 +23,18 @@ USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-s
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= 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
@@ -40,6 +42,9 @@ PLIST_SUB+= VERSION="${PORTVERSION}"
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
Modified: head/x11/slim/distinfo
==============================================================================
--- head/x11/slim/distinfo Wed Oct 2 05:03:22 2019 (r513544)
+++ head/x11/slim/distinfo Wed Oct 2 05:04:14 2019 (r513545)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1555924312
SHA256 (slim-1.3.6.tar.gz) = 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df
SIZE (slim-1.3.6.tar.gz) = 232547
Added: head/x11/slim/files/extra-patch-xdefault
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/slim/files/extra-patch-xdefault Wed Oct 2 05:04:14 2019 (r513545)
@@ -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);
+ }
+ }
Modified: head/x11/slim/files/pkg-message.in
==============================================================================
--- head/x11/slim/files/pkg-message.in Wed Oct 2 05:03:22 2019 (r513544)
+++ head/x11/slim/files/pkg-message.in Wed Oct 2 05:04:14 2019 (r513545)
@@ -4,18 +4,21 @@
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.
+
EOM
}
]
More information about the svn-ports-head
mailing list