From 8bbd7ad91b66d9ec6d4a7a44b89c7c8f9410353d Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 6 May 2018 17:03:57 -0300 Subject: upgpkg: pcr/sddm-elogind 0.17.0-1 Signed-off-by: David P --- pcr/sddm-elogind/PKGBUILD | 31 +++++--- .../sddm-0.12.0-respect-user-flags.patch | 26 ------- .../sddm-0.14.0-fix_session_selection.patch | 87 ---------------------- pcr/sddm-elogind/sddm-enable-elogind.patch | 58 --------------- pcr/sddm-elogind/sddm-pam.patch | 21 ------ pcr/sddm-elogind/sddm.install | 15 ---- pcr/sddm-elogind/sddm.sysusers | 2 + pcr/sddm-elogind/sddm.tmpfiles | 1 + 8 files changed, 23 insertions(+), 218 deletions(-) delete mode 100644 pcr/sddm-elogind/sddm-0.12.0-respect-user-flags.patch delete mode 100644 pcr/sddm-elogind/sddm-0.14.0-fix_session_selection.patch delete mode 100644 pcr/sddm-elogind/sddm-enable-elogind.patch delete mode 100644 pcr/sddm-elogind/sddm-pam.patch delete mode 100644 pcr/sddm-elogind/sddm.install create mode 100644 pcr/sddm-elogind/sddm.sysusers create mode 100644 pcr/sddm-elogind/sddm.tmpfiles (limited to 'pcr/sddm-elogind') diff --git a/pcr/sddm-elogind/PKGBUILD b/pcr/sddm-elogind/PKGBUILD index 5a58223b8..5be32b89c 100644 --- a/pcr/sddm-elogind/PKGBUILD +++ b/pcr/sddm-elogind/PKGBUILD @@ -4,26 +4,26 @@ # Contributor (Arch): Andrea Scarpino pkgname=sddm-elogind -pkgver=0.16.0 +_pkgname=${pkgname/-elogind} +pkgver=0.17.0 pkgrel=1 pkgdesc='QML based X11 display manager' arch=('i686' 'x86_64' 'armv7h') url='http://github.com/sddm/sddm' license=('GPL') provides=('display-manager' 'sddm') -depends=('qt5-declarative' 'xorg-xauth' 'xorg-server' 'elogind' 'eudev-systemd') -makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools') +depends=('qt5-declarative' 'xorg-xauth' 'xorg-server' 'elogind') +makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools' 'eudev-systemd') # libinput and libwacom depend on 'systemd' optdepends=('displaymanager-openrc: displaymanager initscript') conflicts=('display-manager' 'sddm' 'sddm-consolekit') -# replaces=('sddm-consolekit') +replaces=('sddm-consolekit') backup=('usr/share/sddm/scripts/Xsetup' 'etc/pam.d/sddm' 'etc/sddm.conf') -source=("${pkgname/-*/}-${pkgver}.tar.gz::https://github.com/${pkgname/-*/}/${pkgname/-*/}/archive/v${pkgver}.tar.gz" - 'sddm.sysusers' - 'sddm.tmpfiles') -sha512sums=('c4a8fc4cb23e61defb8ca5a48bb9354cfa694057cb6fc3697f9dcd52a24b21e9a24568ae1f54810137468f3e0b198483cbb500c11f19f654267c40053f301abc' - '1fbc3476034774576801d91ed8edf3c1a7f3ae59023134e10c3950e1cf9a84319bf184a1df65762d8485ee4bdecb690fbf53cbf3de98feb38c538a5439b036e0' +source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz" + 'sddm.sysusers' 'sddm.tmpfiles') +sha512sums=('aeedf25c2e5ef54a1cf469fa4bb14d7f6a9bd1df4501f55ca81ed4d9655c9ae0f5c9ddc94408f6fe5eb2502593c38345cb6afc0b80d42007876d73a942fc99a4' + 'a7ee8f8c400e1360f7c3d8d60404fe3729e765bf1e38aa7c61b469b9fa1c9dd449f8bedd3f94bd9355ca0a9168ead8b2687c79b77c853188d1acefda3cd21eab' 'bb5ecdcc6cfcc6b1056a7b10b8a6f323a3e12ea5496a26d80f199a275402fd99ed0fa810fad6687407605964f980784c24082686e177063113a358e1d4220136') prepare() { @@ -32,7 +32,7 @@ prepare() { build() { cd build - cmake ../${pkgname/-*/}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DNO_SYSTEMD=yes \ @@ -46,7 +46,16 @@ build() { package() { cd build make DESTDIR="${pkgdir}" install - + install -Dm644 "$srcdir"/sddm.sysusers "$pkgdir"/usr/lib/sysusers.d/sddm.conf install -Dm644 "$srcdir"/sddm.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/sddm.conf + + # Move sddm.conf to /usr/lib https://bugs.archlinux.org/task/56609 + mkdir "$pkgdir"/usr/lib/sddm/sddm.conf.d + mv "$pkgdir"/{etc/sddm.conf,usr/lib/sddm/sddm.conf.d} + + # Don't set PATH in sddm.conf + sed -r 's|DefaultPath=.*|DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin|g' -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/sddm.conf + # Unset InputMethod https://github.com/sddm/sddm/issues/952 + sed -e "/^InputMethod/s/qtvirtualkeyboard//" -i "$pkgdir"/usr/lib/sddm/sddm.conf.d/sddm.conf } diff --git a/pcr/sddm-elogind/sddm-0.12.0-respect-user-flags.patch b/pcr/sddm-elogind/sddm-0.12.0-respect-user-flags.patch deleted file mode 100644 index fc4501697..000000000 --- a/pcr/sddm-elogind/sddm-0.12.0-respect-user-flags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -u CMakeLists.txt CMakeLists.txt ---- a/CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 -+++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 -@@ -35,22 +35,6 @@ - # Definitions - add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) - --# Default build type --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Release) --endif() -- --# Handle build type --if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug) -- message(STATUS "Debug build") -- add_definitions(-DDEBUG) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") --else() -- message(STATUS "Release build") -- add_definitions(-DNDEBUG) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") --endif() -- - # Default absolute paths - if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR) - set(CMAKE_INSTALL_SYSCONFDIR "/etc") diff --git a/pcr/sddm-elogind/sddm-0.14.0-fix_session_selection.patch b/pcr/sddm-elogind/sddm-0.14.0-fix_session_selection.patch deleted file mode 100644 index 23664d911..000000000 --- a/pcr/sddm-elogind/sddm-0.14.0-fix_session_selection.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/data/themes/elarun/Main.qml b/data/themes/elarun/Main.qml -index 174a3b8..b5831c2 100644 ---- a/data/themes/elarun/Main.qml -+++ b/data/themes/elarun/Main.qml -@@ -33,6 +33,8 @@ Rectangle { - LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft - LayoutMirroring.childrenInherit: true - -+ property int sessionIndex: session.index -+ - TextConstants { id: textConstants } - - Connections { -@@ -132,7 +134,7 @@ Rectangle { - - Keys.onPressed: { - if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { -- sddm.login(user_entry.text, pw_entry.text, menu_session.index) -+ sddm.login(user_entry.text, pw_entry.text, sessionIndex) - event.accepted = true - } - } -@@ -148,7 +150,7 @@ Rectangle { - - source: "images/login_normal.png" - -- onClicked: sddm.login(user_entry.text, pw_entry.text, menu_session.index) -+ onClicked: sddm.login(user_entry.text, pw_entry.text, sessionIndex) - - KeyNavigation.backtab: pw_entry; KeyNavigation.tab: session_button - } -@@ -213,15 +215,6 @@ Rectangle { - font.bold: true - font.pixelSize: 12 - } -- -- Menu { -- id: menu_session -- width: 200; height: 0 -- anchors.top: buttonRow.bottom; anchors.left: buttonRow.left -- -- model: sessionModel -- index: sessionModel.lastIndex -- } - } - } - } -diff --git a/data/themes/maldives/Main.qml b/data/themes/maldives/Main.qml -index 00feea4..49fbe02 100644 ---- a/data/themes/maldives/Main.qml -+++ b/data/themes/maldives/Main.qml -@@ -33,6 +33,8 @@ Rectangle { - LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft - LayoutMirroring.childrenInherit: true - -+ property int sessionIndex: session.index -+ - TextConstants { id: textConstants } - - Connections { -@@ -121,7 +123,7 @@ Rectangle { - - Keys.onPressed: { - if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { -- sddm.login(name.text, password.text, session.index) -+ sddm.login(name.text, password.text, sessionIndex) - event.accepted = true - } - } -@@ -148,7 +150,7 @@ Rectangle { - - Keys.onPressed: { - if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { -- sddm.login(name.text, password.text, session.index) -+ sddm.login(name.text, password.text, sessionIndex) - event.accepted = true - } - } -@@ -237,7 +239,7 @@ Rectangle { - text: textConstants.login - width: parent.btnWidth - -- onClicked: sddm.login(name.text, password.text, session.index) -+ onClicked: sddm.login(name.text, password.text, sessionIndex) - - KeyNavigation.backtab: layoutBox; KeyNavigation.tab: shutdownButton - } diff --git a/pcr/sddm-elogind/sddm-enable-elogind.patch b/pcr/sddm-elogind/sddm-enable-elogind.patch deleted file mode 100644 index 363a3e4b7..000000000 --- a/pcr/sddm-elogind/sddm-enable-elogind.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/CMakeLists.txt 2016-11-10 09:27:03.866358608 +0100 -+++ b/CMakeLists.txt 2016-11-10 10:28:25.384374766 +0100 -@@ -93,7 +93,7 @@ - endif() - - # systemd --if(NOT NO_SYSTEMD) -+if(NOT NO_SYSTEMD AND NOT USE_ELOGIND) - pkg_check_modules(SYSTEMD "systemd") - endif() - -@@ -127,12 +127,34 @@ - set(REBOOT_COMMAND "/usr/bin/systemctl reboot") - else() - set(SYSTEMD_FOUND 0) -+endif() -+add_feature_info("systemd" SYSTEMD_FOUND "systemd support") -+add_feature_info("journald" JOURNALD_FOUND "journald support") -+ -+# elogind -+if(NO_SYSTEMD AND USE_ELOGIND) -+ pkg_check_modules(ELOGIND "libelogind") -+endif() -+ -+if(ELOGIND_FOUND) -+ add_definitions(-DHAVE_ELOGIND) -+ set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND) -+ -+ set(MINIMUM_VT 7) -+ set(HALT_COMMAND "/usr/bin/loginctl poweroff") -+ set(REBOOT_COMMAND "/usr/bin/loginctl reboot") -+else() -+ set(ELOGIND_FOUND 0) -+endif() -+add_feature_info("elogind" ELOGIND_FOUND "elogind support") -+ -+# Default behaviour if neither systemd nor elogind is used -+if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND) - set(MINIMUM_VT 7) - set(HALT_COMMAND "/sbin/shutdown -h -P now") - set(REBOOT_COMMAND "/sbin/shutdown -r now") - endif() --add_feature_info("systemd" SYSTEMD_FOUND "systemd support") --add_feature_info("journald" JOURNALD_FOUND "journald support") -+ - - # Set constants - set(DATA_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/sddm" CACHE PATH "System application data install directory") -diff --git a/services/sddm-greeter.pam b/services/sddm-greeter.pam -index 44e209e..633a128 100644 ---- a/services/sddm-greeter.pam -+++ b/services/sddm-greeter.pam -@@ -14,4 +14,4 @@ password required pam_deny.so - - # Setup session - session required pam_unix.so --session optional pam_systemd.so -+session optional pam_elogind.so diff --git a/pcr/sddm-elogind/sddm-pam.patch b/pcr/sddm-elogind/sddm-pam.patch deleted file mode 100644 index df41a91c7..000000000 --- a/pcr/sddm-elogind/sddm-pam.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/services/sddm.pam 2015-08-17 18:06:19.000000000 +0200 -+++ b/services/sddm.pam 2016-02-21 19:54:08.654091951 +0100 -@@ -4,3 +4,8 @@ - account include system-login - password include system-login - session include system-login -+-auth optional pam_gnome_keyring.so -+-auth optional pam_kwallet5.so -+-password optional pam_gnome_keyring.so use_authtok -+-session optional pam_gnome_keyring.so auto_start -+-session optional pam_kwallet5.so auto_start -diff --git a/services/sddm-autologin.pam b/services/sddm-autologin.pam -index 4c82048..3b48708 100755 ---- a/services/sddm-autologin.pam -+++ b/services/sddm-autologin.pam -@@ -9,3 +9,5 @@ - password include system-local-login - session include system-local-login - -session optional pam_gnome_keyring.so auto_start -+-auth optional pam_kwallet5.so -+-session optional pam_kwallet5.so auto_start diff --git a/pcr/sddm-elogind/sddm.install b/pcr/sddm-elogind/sddm.install deleted file mode 100644 index f078c1466..000000000 --- a/pcr/sddm-elogind/sddm.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - if ! getent group sddm > /dev/null; then - groupadd --system sddm - fi - if ! getent passwd sddm > /dev/null; then - useradd -c "Simple Desktop Display Manager" --system -d /var/lib/sddm -s /usr/bin/nologin -g sddm sddm - passwd -l sddm > /dev/null - fi - mkdir -p /var/lib/sddm - chown -R sddm:sddm /var/lib/sddm > /dev/null -} - -post_upgrade() { - post_install $1 -} diff --git a/pcr/sddm-elogind/sddm.sysusers b/pcr/sddm-elogind/sddm.sysusers new file mode 100644 index 000000000..e56e07d7d --- /dev/null +++ b/pcr/sddm-elogind/sddm.sysusers @@ -0,0 +1,2 @@ +u sddm - "Simple Desktop Display Manager" /var/lib/sddm +m sddm video diff --git a/pcr/sddm-elogind/sddm.tmpfiles b/pcr/sddm-elogind/sddm.tmpfiles new file mode 100644 index 000000000..300d64613 --- /dev/null +++ b/pcr/sddm-elogind/sddm.tmpfiles @@ -0,0 +1 @@ +d /var/lib/sddm 0755 sddm sddm -- cgit v1.2.3