From 8bbd7ad91b66d9ec6d4a7a44b89c7c8f9410353d Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Sun, 6 May 2018 17:03:57 -0300
Subject: upgpkg: pcr/sddm-elogind 0.17.0-1

Signed-off-by: David P <megver83@parabola.nu>
---
 pcr/sddm-elogind/PKGBUILD | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'pcr/sddm-elogind/PKGBUILD')

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 <andrea@archlinux.org>
 
 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
 }
-- 
cgit v1.2.3