From 1a31b163ba19a6d99dc210ea9175a4e78197f3dbcd0cb25e761f38e332554bcc Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 12 Mar 2012 19:17:08 +0000 Subject: [PATCH] Accepting request 108835 from Base:System - Add fix-c++-compat.patch: fix C++ compatibility error in header. OBS-URL: https://build.opensuse.org/request/show/108835 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=92 --- fix-c++-compat.patch | 25 +++++++++++++++++++++++++ systemd-gtk.changes | 5 +++++ systemd.changes | 5 +++++ systemd.spec | 2 ++ 4 files changed, 37 insertions(+) create mode 100644 fix-c++-compat.patch diff --git a/fix-c++-compat.patch b/fix-c++-compat.patch new file mode 100644 index 00000000..85f78d8d --- /dev/null +++ b/fix-c++-compat.patch @@ -0,0 +1,25 @@ +From e09a9a35a1fdb4e849e63bdaf47d936c272b5e82 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 5 Mar 2012 15:16:10 +0100 +Subject: [PATCH] sd-login: c++ compatibility + +--- + src/systemd/sd-login.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +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); +-- +1.7.7 + diff --git a/systemd-gtk.changes b/systemd-gtk.changes index 9b996461..c065d07d 100644 --- a/systemd-gtk.changes +++ b/systemd-gtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 12 08:50:36 UTC 2012 - fcrozat@suse.com + +- Add fix-c++-compat.patch: fix C++ compatibility error in header. + ------------------------------------------------------------------- Wed Feb 29 13:22:17 UTC 2012 - fcrozat@suse.com diff --git a/systemd.changes b/systemd.changes index 9b996461..c065d07d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 12 08:50:36 UTC 2012 - fcrozat@suse.com + +- Add fix-c++-compat.patch: fix C++ compatibility error in header. + ------------------------------------------------------------------- Wed Feb 29 13:22:17 UTC 2012 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index 6d6a0362..04f53eda 100644 --- a/systemd.spec +++ b/systemd.spec @@ -88,6 +88,7 @@ Patch39: correct_plymouth_paths_and_conflicts.patch # an exception will be silently removed with the next version update. Patch21: no-tmpfs-fsck.patch Patch40: systemd-journald-fix-endianess-bug.patch +Patch41: fix-c++-compat.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -148,6 +149,7 @@ Plymouth integration for systemd %patch38 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 %build autoreconf -fiv