diff options
| author | David P <megver83@parabola.nu> | 2018-05-06 18:29:20 -0300 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2018-05-06 18:29:20 -0300 |
| commit | 55668f890b5dbf4abe48f652cd47c53e6d1a147e (patch) | |
| tree | 8731e101bd76bb8cbd9d6abd1eae0419e723bbf9 /pcr/elogind | |
| parent | ac33fd22ae3d8dafc7a9538d22e4381db46cd934 (diff) | |
upgpkg: pcr/elogind 235.2-3
Diffstat (limited to 'pcr/elogind')
| -rw-r--r-- | pcr/elogind/PKGBUILD | 27 | ||||
| -rw-r--r-- | pcr/elogind/elogind.install | 11 |
2 files changed, 12 insertions, 26 deletions
diff --git a/pcr/elogind/PKGBUILD b/pcr/elogind/PKGBUILD index 794047066..6d8ffca43 100644 --- a/pcr/elogind/PKGBUILD +++ b/pcr/elogind/PKGBUILD @@ -1,5 +1,6 @@ # Maintainer (Artix): artoo <artoo@cromnix.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: David P. <megver83@parabola.nu> pkgbase=elogind pkgname=('elogind' 'libelogind') @@ -9,19 +10,16 @@ pkgdesc="The systemd project's logind, extracted to a standalone package" arch=('i686' 'x86_64' 'armv7h') url="https://github.com/elogind/elogind" license=('GPL' 'LGPL2.1') -makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit-elogind' 'dbus-elogind' 'eudev' 'libseccomp' 'meson') +makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit-elogind' 'dbus-elogind' 'eudev' 'libseccomp' 'meson' 'git') options=('!libtool') -source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz" - "protect-user-XDG_RUNTIME_DIR.patch" - "cgroup-hierarchy.patch::https://github.com/elogind/elogind/commit/003ece760231aba0c661e2390dfd11075d72a8da.patch") -sha256sums=('db5d7362ab7fd74a1ea863247f90f3b821cdb3e4433ba049a2fdcf5bf62b0fb9' - '4b04eb4bd87a6b0b15290f87b475d87920d5060ee7bf1583a2320f8f7f4c7658' - '652107d87b35bf78c43ac1610fa431467cf7b582ca6e38b53854286ea72dc983') +# source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz" +# "protect-user-XDG_RUNTIME_DIR.patch") +source=("git+https://github.com/elogind/elogind.git#branch=v235-stable") +sha256sums=('SKIP') prepare() { - cd ${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/protect-user-XDG_RUNTIME_DIR.patch - patch -Np1 -i ${srcdir}/cgroup-hierarchy.patch + cd ${pkgbase} #-${pkgver} +# patch -Np1 -i ${srcdir}/protect-user-XDG_RUNTIME_DIR.patch } build() { @@ -31,11 +29,11 @@ build() { -Ddbuspolicydir=/usr/share/dbus-1/system.d -Ddefault-hierarchy=hybrid -Dcgroup-controller=openrc - -Dman=false # -Ddefault-kill-user-processes=false ) - arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}" +# arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}" + arch-meson "$pkgbase" build "${meson_options[@]}" ninja -C build } @@ -45,11 +43,10 @@ package_elogind() { provides=("elogind=${pkgver}") depends=('acl' 'pam' 'dbus-elogind' 'eudev' 'libseccomp' 'libelogind') conflicts=('systemd-sysvcompat' 'consolekit' 'pm-utils') -# replaces=('consolekit' 'pm-utils') + replaces=('consolekit' 'pm-utils') optdepends=('elogind-openrc: elogind initscript' 'polkit-elogind: polkit support') backup=('etc/elogind/logind.conf') - install=elogind.install DESTDIR="$pkgdir" ninja -C build install @@ -64,7 +61,7 @@ package_libelogind(){ provides=('libelogind.so' "libelogind=${pkgver}") depends=('libcap' 'libeudev') - cd ${pkgbase}-${pkgver} + cd ${pkgbase} #-${pkgver} install -dm755 ${pkgdir}/usr/lib mv ${srcdir}/_libelogind/include ${pkgdir}/usr diff --git a/pcr/elogind/elogind.install b/pcr/elogind/elogind.install deleted file mode 100644 index 004f98a2b..000000000 --- a/pcr/elogind/elogind.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - sed -e 's|pam_systemd.so|pam_elogind.so|' -i etc/pam.d/system-login - - if grep pam_ck_connector.so etc/pam.d/system-login >/dev/null;then - sed -e 's|pam_ck_connector.so nox11|pam_elogind.so|' -i etc/pam.d/system-login - fi -} - -post_remove(){ - sed -e 's|pam_elogind.so|pam_systemd.so|' -i etc/pam.d/system-login -} |