diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /community/systemd | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
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 | 15 |
2 files changed, 35 insertions, 5 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 new file mode 100644 index 000000000..675bc0478 --- /dev/null +++ b/community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch @@ -0,0 +1,25 @@ +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 1e156047d..f34af6a7e 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 53877 2011-08-09 02:05:40Z dreisner $ +# $Id: PKGBUILD 54516 2011-08-19 14:57:25Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd pkgver=33 -pkgrel=2 +pkgrel=3 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -19,7 +19,7 @@ optdepends=('cryptsetup: required for encrypted block devices' 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') groups=('systemd') -options=('!libtool') +options=('!libtool' '!strip') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -30,9 +30,11 @@ 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") + "os-release" + 0001-convert-int-to-boolean-for-dbus_bool_t.patch) md5sums=('361cad7c3debbdd81c211527509ba181' - '752636def0db3c03f121f8b4f44a63cd') + '752636def0db3c03f121f8b4f44a63cd' + '299c03fa55628af7fdff5955ca4e48ea') build() { cd "$srcdir/$pkgname-$pkgver" @@ -42,6 +44,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 \ |