Tue May 14 01:18:40 PDT 2013

2 files changed, 76 insertions, 13 deletions

diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD
index fc847495c..7d5f551d7 100644
--- a/extra/rtkit/PKGBUILD
+++ b/extra/rtkit/PKGBUILD
@@ -1,41 +1,47 @@
-# $Id: PKGBUILD 165071 2012-08-09 23:24:40Z heftig $
+# $Id: PKGBUILD 185307 2013-05-13 06:17:53Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=rtkit
 pkgver=0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Realtime Policy and Watchdog Daemon"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://git.0pointer.de/?p=rtkit.git"
 license=(GPL 'custom:BSD')
-depends=(dbus polkit)
+depends=(dbus polkit systemd)
 install=rtkit.install
-source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz)
-md5sums=('a96c33b9827de66033d2311f82d79a5d')
+source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz
+        libsystemd.patch)
+md5sums=('a96c33b9827de66033d2311f82d79a5d'
+         '35089c0a284005f4abcf45168415857e')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../libsystemd.patch
+  autoreconf -fi
+}
 
+build() {
+  cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/$pkgname \
     --with-systemdsystemunitdir=/usr/lib/systemd/system
-
   make
+
+  ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
-  # DBus configuration
-  mkdir -p "$pkgdir/usr/share/dbus-1/interfaces"
-  ./rtkit-daemon --introspect \
-    > "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml"
+  install -Dm644 org.freedesktop.RealtimeKit1.xml \
+    "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml"
 
-  # Client license
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   sed -ne '4,25p' rtkit.c >"$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/extra/rtkit/libsystemd.patch b/extra/rtkit/libsystemd.patch
new file mode 100644
index 000000000..51398a76a
--- /dev/null
+++ b/extra/rtkit/libsystemd.patch
@@ -0,0 +1,57 @@
+diff -u -r rtkit-0.11/configure.ac rtkit-0.11-sd/configure.ac
+--- rtkit-0.11/configure.ac	2012-05-15 15:25:40.000000000 +0200
++++ rtkit-0.11-sd/configure.ac	2013-05-13 08:12:17.616825455 +0200
+@@ -115,6 +115,7 @@
+ AC_SEARCH_LIBS([cap_init], [cap])
+ 
+ PKG_CHECK_MODULES(DBUS, dbus-1)
++PKG_CHECK_MODULES(LIBSYSTEMD_DAEMON, libsystemd-daemon)
+ 
+ AC_ARG_WITH([systemdsystemunitdir],
+         AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+diff -u -r rtkit-0.11/Makefile.am rtkit-0.11-sd/Makefile.am
+--- rtkit-0.11/Makefile.am	2012-05-15 15:38:05.000000000 +0200
++++ rtkit-0.11-sd/Makefile.am	2013-05-13 08:12:18.086822253 +0200
+@@ -56,13 +56,14 @@
+ endif
+ 
+ rtkit_daemon_SOURCES = \
+-	rtkit-daemon.c rtkit.h \
+-	sd-daemon.c sd-daemon.h
++	rtkit-daemon.c rtkit.h
+ rtkit_daemon_LDADD = \
+-	$(DBUS_LIBS)
++	$(DBUS_LIBS) \
++	$(LIBSYSTEMD_DAEMON_LIBS)
+ rtkit_daemon_CFLAGS = \
+ 	$(AM_CFLAGS) \
+-	$(DBUS_CFLAGS)
++	$(DBUS_CFLAGS) \
++	$(LIBSYSTEMD_DAEMON_CFLAGS)
+ 
+ rtkitctl_SOURCES = \
+ 	rtkitctl.c rtkit.h
+@@ -93,7 +94,3 @@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+-
+-update-systemd:
+-	curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > sd-daemon.c
+-	curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > sd-daemon.h
+diff -u -r rtkit-0.11/rtkit-daemon.c rtkit-0.11-sd/rtkit-daemon.c
+--- rtkit-0.11/rtkit-daemon.c	2012-05-15 15:25:40.000000000 +0200
++++ rtkit-0.11-sd/rtkit-daemon.c	2013-05-13 08:13:07.933149359 +0200
+@@ -50,9 +50,9 @@
+ #include <dirent.h>
+ #include <syslog.h>
+ #include <grp.h>
++#include <systemd/sd-daemon.h>
+ 
+ #include "rtkit.h"
+-#include "sd-daemon.h"
+ 
+ #ifndef __linux__
+ #error "This stuff only works on Linux!"
+Only in rtkit-0.11: sd-daemon.c
+Only in rtkit-0.11: sd-daemon.h