[Frugalware-git] frugalware-current: sddm-0.16.0-5-x86_64 * remove /etc/sddm.conf ( see comment about in FB ) * added an patch to have /etc/X11/sessions as default * change VT from 12 to 7 ( why we got 12 no idea )

crazy crazy at frugalware.org
Thu Oct 12 01:13:27 CEST 2017


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e496031a88793a10e73c78de1039801cc92899a2

commit e496031a88793a10e73c78de1039801cc92899a2
Author: crazy <crazy at frugalware.org>
Date:   Thu Oct 12 01:10:59 2017 +0200

sddm-0.16.0-5-x86_64
* remove /etc/sddm.conf ( see comment about in FB )
* added an patch to have /etc/X11/sessions as default
* change VT from 12 to 7 ( why we got 12 no idea )

diff --git a/source/x11/sddm/20-frugalware-sddm.conf b/source/x11/sddm/20-frugalware-sddm.conf
index 9238fd0..27ce425 100644
--- a/source/x11/sddm/20-frugalware-sddm.conf
+++ b/source/x11/sddm/20-frugalware-sddm.conf
@@ -93,7 +93,7 @@ DisplayCommand=/usr/share/sddm/scripts/Xsetup
DisplayStopCommand=/usr/share/sddm/scripts/Xstop

# The lowest virtual terminal number that will be used.
-MinimumVT=12
+MinimumVT=7

# Arguments passed to the X server invocation
ServerArguments=-nolisten tcp
diff --git a/source/x11/sddm/FrugalBuild b/source/x11/sddm/FrugalBuild
index 4ceb862..59c0adf 100644
--- a/source/x11/sddm/FrugalBuild
+++ b/source/x11/sddm/FrugalBuild
@@ -5,7 +5,7 @@

pkgname=sddm
pkgver=0.16.0
-pkgrel=4
+pkgrel=5
pkgdesc='QML based X11 display manager'
archs=('x86_64')
groups=('x11')
@@ -26,17 +26,21 @@ provides=("${conflicts[@]}" 'liblightdm-qt')

Finclude github cmake
options+=('scriptlet')
-source+=(20-frugalware-sddm.conf revert-PR-#714.patch fix-man-files.patch)
+source+=(20-frugalware-sddm.conf revert-PR-#714.patch fix-man-files.patch xsession-dir.patch)
sha1sums=('dedfd2f930198ab9727fca4060c0639c945653e7' \
-          '9ce91afedc3ac6b283fb3ec6a3e332965d3fb4fc' \
+          '2ebc523dd8dd6826581099ff048fd2daaede08ac' \
'65fb1f34361d7b45959b3e340ae47e528529318f' \
-          '477908258055b8e9db5875bb9675f86f7bea9c7c')
+          '477908258055b8e9db5875bb9675f86f7bea9c7c' \
+          '7ea1466963e5ae2e5e2bd847a7f43a0dd5ee0c87')


build() {

Fcd
CMake_build
+	## as long we have everything in $vendor dir this one
+	## cannot be in the package since it will kill any value set in $vendor one!!
+	Frm etc/sddm.conf
Finstall 755 /usr/lib/sddm/sddm.conf.d/20-frugalware-sddm.conf

}
diff --git a/source/x11/sddm/xsession-dir.patch b/source/x11/sddm/xsession-dir.patch
new file mode 100644
index 0000000..8f421e6
--- /dev/null
+++ b/source/x11/sddm/xsession-dir.patch
@@ -0,0 +1,12 @@
+diff -Naur sddm-0.16.0/src/common/Configuration.h sddm-0.16.0-p/src/common/Configuration.h
+--- sddm-0.16.0/src/common/Configuration.h	2017-10-05 08:24:24.000000000 +0200
++++ sddm-0.16.0-p/src/common/Configuration.h	2017-10-12 01:02:35.808843082 +0200
+@@ -62,7 +62,7 @@
+             Entry(ServerArguments,     QString,     _S("-nolisten tcp"),                        _S("Arguments passed to the X server invocation"));
+             Entry(XephyrPath,          QString,     _S("/usr/bin/Xephyr"),                      _S("Path to Xephyr binary"));
+             Entry(XauthPath,           QString,     _S("/usr/bin/xauth"),                       _S("Path to xauth binary"));
+-            Entry(SessionDir,          QString,     _S("/usr/share/xsessions"),                 _S("Directory containing available X sessions"));
++            Entry(SessionDir,          QString,     _S("/etc/X11/sessions"),                    _S("Directory containing available X sessions"));
+             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
+ 	    Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
+ 	    Entry(UserAuthFile,        QString,     _S(".Xauthority"),                          _S("Path to the Xauthority file"));


More information about the Frugalware-git mailing list