diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-25 18:12:17 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-25 18:12:17 -0500 |
| commit | 0a836025c3e637d0b8b5b917362138bd239de800 (patch) | |
| tree | a34db7e99488583b7805cd42ca7692c219ae2ea2 | |
| parent | fa12bb7540c47af39adb23539a0ee74bc7696839 (diff) | |
| download | packages-0a836025c3e637d0b8b5b917362138bd239de800.tar.gz packages-0a836025c3e637d0b8b5b917362138bd239de800.tar.bz2 packages-0a836025c3e637d0b8b5b917362138bd239de800.tar.xz packages-0a836025c3e637d0b8b5b917362138bd239de800.zip | |
user/sddm: bump to 0.18.0, port to utmps
| -rw-r--r-- | user/sddm/APKBUILD | 19 | ||||
| -rw-r--r-- | user/sddm/ck2-support.patch | 3 | ||||
| -rw-r--r-- | user/sddm/utmpx.patch | 10 |
3 files changed, 22 insertions, 10 deletions
diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index 4f3b13cb7..954f978d8 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -1,23 +1,25 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm -pkgver=0.16.0 -pkgrel=2 +pkgver=0.18.0 +pkgrel=0 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" arch="all" -license="GPL-2.0" +license="GPL-2.0+" depends="consolekit2" makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev - consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev" + consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev + utmps-dev" +subpackages="$pkgname-lang $pkgname-xdm::noarch" install="sddm.post-install" +langdir="/usr/share/sddm/translations" pkgusers="sddm" pkggroups="sddm" -subpackages="$pkgname-lang $pkgname-xdm::noarch" -langdir="/usr/share/sddm/translations" source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz ck2-support.patch pam-path-fix.patch + utmpx.patch xdm.confd" build() { @@ -55,7 +57,8 @@ xdm() { install -D -m644 "$srcdir"/xdm.confd "$subpkgdir"/etc/conf.d/xdm } -sha512sums="114848909d3910e686f1cd0e0059a6804f7fdb45d391cdb63ce9fc319b395399bf3971534072e351fdcf525a9d2c0ed042e2b8d07679a72fa98bece9685652ca sddm-0.16.0.tar.xz -2ca671e662150083f5ad26f83aab9fab7f0da064a237c303e921f95638ff46c41e200ba08ae9cbdbb11f3c62539a30b977f3c3f65a04b2dcf27006f305618492 ck2-support.patch +sha512sums="359ea6060d02bcc1c810c8338b836f1c8e76d7e3ec132c4ed2327374f4e52b8a56884626dd2d0df87465137b275deba7b6c48b2e992aafed4375f0929fafda6f sddm-0.18.0.tar.xz +075e3baf24606cdea620737dbc00f7cf5c487ab6d88e37b23a581afcfbcf872c379753c89c80ad5c90c28fa27d3e5c5df64d4fd30764fdbfc0586e0f26666fe1 ck2-support.patch f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch +c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch 5a03b3211e9d84ee762523631859a26b869aee2189f6845dc780c7a1e60a6658e2240e9ef9be05858708d2552ae77b594509dabe49794538f88d2ad6578d1fdf xdm.confd" diff --git a/user/sddm/ck2-support.patch b/user/sddm/ck2-support.patch index 8a9e6ee85..f073877fc 100644 --- a/user/sddm/ck2-support.patch +++ b/user/sddm/ck2-support.patch @@ -24,8 +24,7 @@ index 79c7031..4ccfeb5 100644 available = true; serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); -- managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind -+ managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind + managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat"); sessionIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Session"); userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User"); diff --git a/user/sddm/utmpx.patch b/user/sddm/utmpx.patch new file mode 100644 index 000000000..1edd72d7d --- /dev/null +++ b/user/sddm/utmpx.patch @@ -0,0 +1,10 @@ +--- sddm-0.18.0/src/helper/HelperApp.cpp.old 2018-07-18 10:31:40.000000000 +0000 ++++ sddm-0.18.0/src/helper/HelperApp.cpp 2018-07-25 23:11:09.840000000 +0000 +@@ -35,7 +35,6 @@ + #include <sys/socket.h> + #include <sys/time.h> + +-#include <utmp.h> + #include <utmpx.h> + #include <QByteArray> + |