summaryrefslogtreecommitdiff
path: root/community/systemd
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-05 11:13:43 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-05 11:13:43 -0300
commit58d6937e71aea203f6693a68146018f950922fbc (patch)
tree3b53b76f930f60717debca5e0d612eeab0279b39 /community/systemd
parentd07d53d7af1e9694d9558783841bc2df3124a90f (diff)
parentf651180e6b1ac9508ec0d1d9b94972de776020a9 (diff)
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el Conflicts: community/addresses/PKGBUILD community/chmsee/PKGBUILD community/coin/PKGBUILD community/critterding/PKGBUILD community/distcc/PKGBUILD community/djview4/PKGBUILD community/freedroid/PKGBUILD community/gnumail/PKGBUILD community/gyachi/PKGBUILD community/java-oracle/PKGBUILD community/liboop/PKGBUILD community/ltris/PKGBUILD community/nepim/PKGBUILD community/pantomime/PKGBUILD community/pyxattr/PKGBUILD community/soqt/PKGBUILD community/tilda/PKGBUILD community/unrealircd/PKGBUILD community/uqm/PKGBUILD core/dnsutils/PKGBUILD core/gcc/PKGBUILD.mips64el core/vpnc/PKGBUILD extra/apache/PKGBUILD extra/bind/PKGBUILD extra/bzflag/PKGBUILD extra/ccache/PKGBUILD extra/claws-mail-extra-plugins/PKGBUILD extra/clutter-gst/PKGBUILD extra/cups/PKGBUILD extra/doxygen/PKGBUILD extra/fam/PKGBUILD extra/fcitx/PKGBUILD extra/gdk-pixbuf2/PKGBUILD extra/geoip/PKGBUILD extra/gtk2/PKGBUILD extra/icedtea-web/PKGBUILD extra/libffi/PKGBUILD extra/libfwbuilder/PKGBUILD extra/libmpd/PKGBUILD extra/libreoffice/PKGBUILD extra/mesa/PKGBUILD extra/pygobject2/PKGBUILD extra/qt/PKGBUILD extra/samba/PKGBUILD extra/wireshark/PKGBUILD extra/xulrunner/PKGBUILD multilib-testing/lib32-keyutils/PKGBUILD multilib-testing/lib32-udev/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-keyutils/PKGBUILD multilib/lib32-libcups/PKGBUILD multilib/lib32-qt/PKGBUILD multilib/wine/PKGBUILD multilib/wine_gecko/PKGBUILD testing/dash/PKGBUILD testing/libssh2/PKGBUILD
Diffstat (limited to 'community/systemd')
-rw-r--r--community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch25
-rw-r--r--community/systemd/PKGBUILD22
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
-
}