[arch-commits] Commit in systemd/trunk (PKGBUILD cpp-compat.patch)

[Jan Steffens]

    Date: Sunday, March 11, 2012 @ 11:08:52
  Author: heftig
Revision: 153035

move manpages back; remove systemadm manpage; fix a c++ compile error

Added:
  systemd/trunk/cpp-compat.patch
Modified:
  systemd/trunk/PKGBUILD

------------------+
 PKGBUILD         |   16 ++++++++++------
 cpp-compat.patch |   19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-11 13:58:12 UTC (rev 153034)
+++ PKGBUILD	2012-03-11 15:08:52 UTC (rev 153035)
@@ -4,7 +4,7 @@
 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 @@
              '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 @@
   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 @@
   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() {

Added: cpp-compat.patch
===================================================================
--- cpp-compat.patch	                        (rev 0)
+++ cpp-compat.patch	2012-03-11 15:08:52 UTC (rev 153035)
@@ -0,0 +1,19 @@
+commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
+Author: Lennart Poettering <lennart at 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);