From f8c8726feadfc2c1e2a12b928330071cf53f1b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 18 Nov 2015 21:42:30 +0200 Subject: [PATCH 1/2] sddm add pam-devel --- desktop/kde/plasma/sddm/actions.py | 6 ++--- desktop/kde/plasma/sddm/actions.py.new | 34 ++++++++++++++++++++++++++ desktop/kde/plasma/sddm/pspec.xml | 2 ++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 desktop/kde/plasma/sddm/actions.py.new diff --git a/desktop/kde/plasma/sddm/actions.py b/desktop/kde/plasma/sddm/actions.py index afea9a582b..f7cdf72f3f 100644 --- a/desktop/kde/plasma/sddm/actions.py +++ b/desktop/kde/plasma/sddm/actions.py @@ -15,8 +15,8 @@ def setup(): cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DUSE_QT5:bool=ON \ - -DUSE_WAYLAND:bool=ON \ + -DUSE_QT5=ON \ + -DUSE_WAYLAND=ON \ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ -DBUILD_MAN_PAGES=ON", sourceDir=".." ) @@ -32,4 +32,4 @@ def install(): cmaketools.install() - pisitools.dodoc("../COPYING") \ No newline at end of file + pisitools.dodoc("../COPYING") diff --git a/desktop/kde/plasma/sddm/actions.py.new b/desktop/kde/plasma/sddm/actions.py.new new file mode 100644 index 0000000000..8ccabed0ab --- /dev/null +++ b/desktop/kde/plasma/sddm/actions.py.new @@ -0,0 +1,34 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import cmaketools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + shelltools.makedirs("build") + shelltools.cd("build") + + cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ + -DBUILD_MAN_PAGES=ON", sourceDir=".." ) + +def build(): + shelltools.makedirs("build") + shelltools.cd("build") + + cmaketools.make() + +def install(): + shelltools.makedirs("build") + shelltools.cd("build") + + cmaketools.install() + + pisitools.insinto("/usr/share/dbus-1/interfaces", "../data/interfaces/*.xml") + + pisitools.dodoc("../COPYING") \ No newline at end of file diff --git a/desktop/kde/plasma/sddm/pspec.xml b/desktop/kde/plasma/sddm/pspec.xml index 0987745d6a..cebca3172f 100644 --- a/desktop/kde/plasma/sddm/pspec.xml +++ b/desktop/kde/plasma/sddm/pspec.xml @@ -20,6 +20,7 @@ qt5-declarative-devel libxcb-devel libxkbfile-devel + pam-devel extra-cmake-modules docutils @@ -34,6 +35,7 @@ qt5-base qt5-declarative + pam libgcc libxcb From 9f1dbed012ed1626a61cca372538425f60d36bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 18 Nov 2015 21:43:11 +0200 Subject: [PATCH 2/2] rm --- desktop/kde/plasma/sddm/actions.py.new | 34 -------------------------- 1 file changed, 34 deletions(-) delete mode 100644 desktop/kde/plasma/sddm/actions.py.new diff --git a/desktop/kde/plasma/sddm/actions.py.new b/desktop/kde/plasma/sddm/actions.py.new deleted file mode 100644 index 8ccabed0ab..0000000000 --- a/desktop/kde/plasma/sddm/actions.py.new +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import cmaketools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools - -def setup(): - shelltools.makedirs("build") - shelltools.cd("build") - - cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ - -DBUILD_MAN_PAGES=ON", sourceDir=".." ) - -def build(): - shelltools.makedirs("build") - shelltools.cd("build") - - cmaketools.make() - -def install(): - shelltools.makedirs("build") - shelltools.cd("build") - - cmaketools.install() - - pisitools.insinto("/usr/share/dbus-1/interfaces", "../data/interfaces/*.xml") - - pisitools.dodoc("../COPYING") \ No newline at end of file