diff options
Diffstat (limited to 'community/systemd')
-rw-r--r-- | community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch | 25 | ||||
-rw-r--r-- | community/systemd/PKGBUILD | 22 |
2 files changed, 8 insertions, 39 deletions
diff --git a/community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch b/community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch deleted file mode 100644 index 675bc0478..000000000 --- a/community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e191553d1dc80cd6d65d05f0cb29f8967fab6983 Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Wed, 17 Aug 2011 19:38:07 +0200 -Subject: [PATCH] convert int to boolean for dbus_bool_t - ---- - src/dbus-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/dbus-manager.c b/src/dbus-manager.c -index ae88895..cfc2afc 100644 ---- a/src/dbus-manager.c -+++ b/src/dbus-manager.c -@@ -444,7 +444,7 @@ static DBusMessage *message_from_file_changes( - if (carries_install_info >= 0) { - dbus_bool_t b; - -- b = carries_install_info; -+ b = !!carries_install_info; - if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b)) - goto oom; - } --- -1.7.6 - diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index f34af6a7e..9cb264b24 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 54516 2011-08-19 14:57:25Z dreisner $ +# $Id: PKGBUILD 55043 2011-09-01 00:45:34Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd -pkgver=33 -pkgrel=3 +pkgver=35 +pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172') -makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf') +makedepends=('docbook-xsl' 'gperf' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' 'gtk2: systemadm' @@ -30,11 +30,9 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/systemd/systemd-logind.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" - "os-release" - 0001-convert-int-to-boolean-for-dbus_bool_t.patch) -md5sums=('361cad7c3debbdd81c211527509ba181' - '752636def0db3c03f121f8b4f44a63cd' - '299c03fa55628af7fdff5955ca4e48ea') + "os-release") +md5sums=('6b37b385d22f28c184a04a4e6c3c69b4' + '752636def0db3c03f121f8b4f44a63cd') build() { cd "$srcdir/$pkgname-$pkgver" @@ -44,12 +42,9 @@ build() { sed -i -e '/^Environ.*LANG/s/^/#/' \ -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 - # fix ABRT on `systemctl enable <unit-with-Also>' - patch -Np1 < "$srcdir/0001-convert-int-to-boolean-for-dbus_bool_t.patch" - ./configure --prefix=/usr \ --sysconfdir=/etc \ - --libexecdir=/usr/lib \ + --libexecdir=/usr/lib/systemd \ --libdir=/usr/lib \ --localstatedir=/var \ --with-rootdir= \ @@ -79,5 +74,4 @@ package() { for manpage in telinit halt reboot poweroff runlevel shutdown; do mv {,systemd.}"$manpage.8" done - } |