From e955e9ae0b2b1640ad1a380c4628843e6647c71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 1 Jul 2023 17:28:41 +0200 Subject: [PATCH] slim: adjust PATH for usrmerge --- .../1.3.6--adjust-PATH-for-usrmerge.patch | 34 +++++++++++++++++++ srcpkgs/slim/template | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch diff --git a/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch b/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch new file mode 100644 index 00000000000..76bf4fa6c6e --- /dev/null +++ b/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch @@ -0,0 +1,34 @@ +From 0a96bb015d9dc30ff98cfc21256851cb2005cea1 Mon Sep 17 00:00:00 2001 +From: Piotr Wójcik +Date: Sat, 1 Jul 2023 17:28:17 +0200 +Subject: adjust-PATH-for-usrmerge + + +diff --git a/cfg.cpp b/cfg.cpp +index 02379f2..56a584b 100644 +--- a/cfg.cpp ++++ b/cfg.cpp +@@ -29,7 +29,7 @@ Cfg::Cfg() + : currentSession(-1) + { + /* Configuration options */ +- options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin")); ++ options.insert(option("default_path","/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin")); + options.insert(option("default_xserver","/usr/bin/X")); + options.insert(option("xserver_arguments","")); + options.insert(option("numlock","")); +diff --git a/slim.conf b/slim.conf +index a8e2e1c..1c14ade 100644 +--- a/slim.conf ++++ b/slim.conf +@@ -1,6 +1,6 @@ + # Path, X server and arguments (if needed) + # Note: -xauth $authfile is automatically appended +-default_path /bin:/usr/bin:/usr/local/bin ++default_path /usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin + default_xserver /usr/bin/X + #xserver_arguments -dpi 75 + +-- +2.41.0 + diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template index b7382cac308..1ca2ff320bf 100644 --- a/srcpkgs/slim/template +++ b/srcpkgs/slim/template @@ -1,7 +1,7 @@ # Template file for 'slim' pkgname=slim version=1.3.6 -revision=13 +revision=14 build_style=cmake configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes" conf_files="/etc/slim.conf /etc/pam.d/slim"