[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [yocto-meta-kde] recipes-support: Add SDDM recipe
From:       Volker Krause <null () kde ! org>
Date:       2018-06-30 12:11:19
Message-ID: E1fZEil-0002Qv-SW () code ! kde ! org
[Download RAW message or body]

Git commit 53ceb3e0664b8a91bf4b12a0d954661773d41120 by Volker Krause.
Committed on 30/06/2018 at 10:00.
Pushed by vkrause into branch 'master'.

Add SDDM recipe

A  +42   -0    recipes-support/sddm.inc
A  +38   -0    recipes-support/sddm/0001-fix-qml-installation.diff
A  +4    -0    recipes-support/sddm_0.17.0.bb

https://commits.kde.org/yocto-meta-kde/53ceb3e0664b8a91bf4b12a0d954661773d41120

diff --git a/recipes-support/sddm.inc b/recipes-support/sddm.inc
new file mode 100644
index 0000000..f016b37
--- /dev/null
+++ b/recipes-support/sddm.inc
@@ -0,0 +1,42 @@
+DESCRIPTION = "QML based X11 and Wayland display manager"
+HOMEPAGE = "https://github.com/sddm/sddm"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b"
+PR = "r0"
+
+DEPENDS = " \
+    qtdeclarative \
+    qttools \
+    qttools-native \
+    extra-cmake-modules \
+    libpam \
+    libxcb \
+"
+
+SRC_URI = " \
+    git://github.com/sddm/${BPN};nobranch=1 \
+    file://0001-fix-qml-installation.diff \
+"
+S = "${WORKDIR}/git"
+
+inherit cmake_qt5 pkgconfig systemd useradd
+
+EXTRA_OECMAKE += "-DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML}"
+
+FILES_${PN} += " \
+    ${libdir}/qml \
+"
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false \
--user-group --groups video sddm" +
+RDEPENDS_${PN} += "\
+    packagegroup-core-x11-xserver \
+    xauth \
+    xinit \
+    xmessage \
+    xrdb \
+    qtbase-plugins \
+    qtdeclarative-plugins \
+    qtdeclarative-qmlplugins \
+"
diff --git a/recipes-support/sddm/0001-fix-qml-installation.diff \
b/recipes-support/sddm/0001-fix-qml-installation.diff new file mode 100644
index 0000000..7d3b87a
--- /dev/null
+++ b/recipes-support/sddm/0001-fix-qml-installation.diff
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8903b52..ce9b5bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -178,6 +178,7 @@ set(DATA_INSTALL_DIR            \
"${CMAKE_INSTALL_FULL_DATADIR}/sddm" + set(DBUS_CONFIG_DIR             \
"${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d"       CACHE PATH      "DBus config \
files directory") + set(STATE_DIR                   \
"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/sddm"      CACHE PATH      "State \
directory") + set(RUNTIME_DIR                 \
"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/sddm"      CACHE PATH      "Runtime data \
storage directory") ++set(QML_INSTALL_DIR             "${QT_IMPORTS_DIR}"             \
CACHE PATH      "QML component installation directory") + 
+ set(SESSION_COMMAND             "${DATA_INSTALL_DIR}/scripts/Xsession"              \
CACHE PATH      "Script to execute when starting the X11 desktop session") + \
set(WAYLAND_SESSION_COMMAND     "${DATA_INSTALL_DIR}/scripts/wayland-session"       \
CACHE PATH      "Script to execute when starting the Wayland desktop session") +diff \
--git a/components/CMakeLists.txt b/components/CMakeLists.txt +index 33920a6..22d75c9 \
100644 +--- a/components/CMakeLists.txt
++++ b/components/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ configure_file("2.0/LayoutBox.qml" "2.0/LayoutBox.qml")
+ 
+-install(DIRECTORY "2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
+-install(DIRECTORY "common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
+-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION \
"${QT_IMPORTS_DIR}/SddmComponents") ++install(DIRECTORY "2.0/" DESTINATION \
"${QML_INSTALL_DIR}/SddmComponents") ++install(DIRECTORY "common/" DESTINATION \
"${QML_INSTALL_DIR}/SddmComponents") ++install(DIRECTORY \
"${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents") \
+diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in +index \
7500a49..e174b5b 100644 +--- a/src/common/Constants.h.in
++++ b/src/common/Constants.h.in
+@@ -24,7 +24,7 @@
+ #define LIBEXEC_INSTALL_DIR         "@CMAKE_INSTALL_FULL_LIBEXECDIR@"
+ #define DATA_INSTALL_DIR            "@DATA_INSTALL_DIR@"
+ #define SYS_CONFIG_DIR              "@CMAKE_INSTALL_FULL_SYSCONFDIR@"
+-#define IMPORTS_INSTALL_DIR         "@QT_IMPORTS_DIR@"
++#define IMPORTS_INSTALL_DIR         "@QML_INSTALL_DIR@"
+ #define COMPONENTS_TRANSLATION_DIR  "@COMPONENTS_TRANSLATION_DIR@"
+ #define RUNTIME_DIR                 "@RUNTIME_DIR@"
+ #define STATE_DIR                   "@STATE_DIR@"
diff --git a/recipes-support/sddm_0.17.0.bb b/recipes-support/sddm_0.17.0.bb
new file mode 100644
index 0000000..ac79ebf
--- /dev/null
+++ b/recipes-support/sddm_0.17.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+# SRCREV = "v${PV}"
+# 0.17.0 tries to run generated binaries durign the build, which fails when \
cross-compiling +SRCREV = "develop"


[prev in list] [next in list] [prev in thread] [next in thread]