@@ -0,0 +1,44 @@
|
||||
From b8a111ae9033ff490432d032f3cbe06ec1e5507c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 21 Feb 2015 19:57:41 +0100
|
||||
Subject: [PATCH] handle merge of libsystemd-journal -> libsystemd for systemd
|
||||
>= 209
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
see [1]:
|
||||
|
||||
'The APIs "sd-journal.h", "sd-login.h", "sd-id128.h", "sd-daemon.h" are no
|
||||
longer found in individual libraries libsystemd-journal.so, , libsystemd-login.so,
|
||||
libsystemd-id128.so, libsystemd-daemon.so. Instead, we have merged them into
|
||||
a single library, libsystemd.so, which provides all symbols.
|
||||
|
||||
[1] http://cgit.freedesktop.org/systemd/systemd/tree/NEWS
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
CMakeLists.txt | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 61230a4..3a34ba6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -98,7 +98,12 @@ if(SYSTEMD_FOUND)
|
||||
add_definitions(-DHAVE_SYSTEMD)
|
||||
set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_SYSTEMD)
|
||||
|
||||
- pkg_check_modules(JOURNALD "libsystemd-journal")
|
||||
+ # libsystemd-journal was merged into libsystemd in 209
|
||||
+ if(${SYSTEMD_VERSION} VERSION_LESS 209)
|
||||
+ pkg_check_modules(JOURNALD "libsystemd-journal")
|
||||
+ else()
|
||||
+ pkg_check_modules(JOURNALD "libsystemd")
|
||||
+ endif()
|
||||
|
||||
if(ENABLE_JOURNALD)
|
||||
if(JOURNALD_FOUND)
|
||||
--
|
||||
1.9.3
|
||||
|
||||
35
recipes-graphics/sddm/files/0002-fix-qml-install-dir.patch
Normal file
35
recipes-graphics/sddm/files/0002-fix-qml-install-dir.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
From 45038115cf962f0b5923a74ae362e3a430ec5a3b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 21 Feb 2015 16:35:40 +0100
|
||||
Subject: [PATCH] fix qml install dir
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
components/CMakeLists.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
|
||||
index bf95f4c..ac75b90 100644
|
||||
--- a/components/CMakeLists.txt
|
||||
+++ b/components/CMakeLists.txt
|
||||
@@ -1,8 +1,8 @@
|
||||
configure_file("${COMPONENTS_VERSION}/LayoutBox.qml" "${COMPONENTS_VERSION}/LayoutBox.qml")
|
||||
configure_file("common/qmldir" "common/qmldir")
|
||||
|
||||
-install(DIRECTORY "${COMPONENTS_VERSION}/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${COMPONENTS_VERSION}/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "${COMPONENTS_VERSION}/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${COMPONENTS_VERSION}/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
|
||||
-install(DIRECTORY "common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "common/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/common/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
--
|
||||
1.9.3
|
||||
|
||||
35
recipes-graphics/sddm/sddm_git.bb
Normal file
35
recipes-graphics/sddm/sddm_git.bb
Normal file
@@ -0,0 +1,35 @@
|
||||
SUMMARY = "SDDM is a modern display manager for X11"
|
||||
LICENSE = "GPLv2 & CC-BY-3.0 & CC-BY-NC-SA-3.0"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING-CC-BY-3.0;md5=3f91257948001a369d427b9028de84b2 \
|
||||
file://COPYING-CC-BY-SA-3.0;md5=c0e44077d8998dd1cd1324f7bc4d7b67 \
|
||||
"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
inherit cmake_qt5 pkgconfig systemd useradd
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qttools-native libxcb"
|
||||
# REVISIT optionals
|
||||
DEPENDS += "libpam"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
|
||||
file://0001-handle-merge-of-libsystemd-journal-libsystemd-for-sy.patch \
|
||||
file://0002-fix-qml-install-dir.patch \
|
||||
"
|
||||
SRCREV = "5fef418d71730f631fa313a521b23fa1b40a332c"
|
||||
PV = "0.11.0+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECMAKE += "-DQML_INSTALL_DIR=${libdir}/qml"
|
||||
|
||||
FILES_${PN} += "${libdir}/qml"
|
||||
|
||||
SYSTEMD_SERVICE_${PN} = "${BPN}.service"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
USERADD_PARAM_${PN} = "--system --home /var/lib/sddm --shell /bin/false --user-group sddm"
|
||||
|
||||
Reference in New Issue
Block a user