diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-13 00:01:30 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-13 00:01:30 +0000 |
| commit | 217a7715291ceb935900b71bde082023bc441290 (patch) | |
| tree | 6cbfcf7d11f0bd1e412f542080ec995fc26daffd /extra | |
| parent | 7e61bbcf6b3c8ffe6c076268044d83b446fceeab (diff) | |
Tue Mar 13 00:01:30 UTC 2012
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/systemd/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/systemd/cpp-compat.patch | 19 |
2 files changed, 30 insertions, 7 deletions
diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index 60a526323..9e77b3e95 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150927 2012-02-23 21:53:17Z dreisner $ +# $Id: PKGBUILD 153036 2012-03-11 15:14:05Z heftig $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgbase=systemd pkgname=('systemd' 'libsystemd') pkgver=43 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') @@ -12,12 +12,17 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release") + "os-release" "cpp-compat.patch") md5sums=('446cc6db7625617af67e2d8e5f503a49' - '752636def0db3c03f121f8b4f44a63cd') + '752636def0db3c03f121f8b4f44a63cd' + '414968aa314ced0b0ab4b2207e46aa69') build() { cd "$pkgname-$pkgver" + + # Fix C++ compile error when including sd-login.h + # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514 + patch -p1 -i ../cpp-compat.patch ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -67,7 +72,7 @@ package_systemd() { sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" # didn't build this... - rm -f "man1/systemadm.1" + rm -f "$pkgdir/usr/share/man/man1/systemadm.1" # fix .so links in manpage stubs find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ @@ -83,13 +88,12 @@ package_systemd() { done ### split off libsystemd (libs, includes, pkgconfig, man3) - install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig,share/man} + install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig} cd "$srcdir"/libsystemd mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib mv "$pkgdir/usr/include/systemd" usr/include mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig - mv "$pkgdir/usr/share/man/man3" usr/share/man } package_libsystemd() { diff --git a/extra/systemd/cpp-compat.patch b/extra/systemd/cpp-compat.patch new file mode 100644 index 000000000..346c353bc --- /dev/null +++ b/extra/systemd/cpp-compat.patch @@ -0,0 +1,19 @@ +commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82 +Author: Lennart Poettering <lennart@poettering.net> +Date: 2012-03-05 15:16:10 +0100 + + sd-login: c++ compatibility + +diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h +index 2f3c90c..6e99cfc 100644 +--- a/src/systemd/sd-login.h ++++ b/src/systemd/sd-login.h +@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service); + int sd_session_get_type(const char *session, char **type); + + /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */ +-int sd_session_get_class(const char *session, char **class); ++int sd_session_get_class(const char *session, char **clazz); + + /* Determine the X11 display of this session. */ + int sd_session_get_display(const char *session, char **display); |