Attachment 38801 Details for Bug 30268 – Proposed patch

[patch] Proposed patch

0001-Bump-dependency-on-dbus-glib-to-0.82.patch (text/plain), 3.08 KB, created by Michael Biebl on 2010-09-19 15:24:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Biebl

Created: 2010-09-19 15:24:29 UTC

Size: 3.08 KB

patch

obsolete

>From b1ea88e23a8598b412bbda4137d8e4e8378a1a45 Mon Sep 17 00:00:00 2001
>From: Michael Biebl <biebl@debian.org>
>Date: Sun, 19 Sep 2010 21:17:26 +0200
>Subject: [PATCH] Bump dependency on dbus-glib to 0.82
>
>dbus-glib requires dbus >= 1.1 so we can safely remove
>DBUS_API_SUBJECT_TO_CHANGE.
>---
> configure.ac            |    2 +-
> src/ck-manager.c        |    1 -
> src/ck-seat.c           |    1 -
> src/ck-session-leader.c |    1 -
> src/ck-session.c        |    1 -
> src/ck-vt-monitor.c     |    1 -
> src/main.c              |    1 -
> tools/list-sessions.c   |    1 -
> 8 files changed, 1 insertions(+), 8 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index c1a8004..0a542a1 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -35,7 +35,7 @@ AM_GLIB_GNU_GETTEXT
> 
> # Dependencies
> 
>-DBUS_REQUIRED_VERSION=0.30
>+DBUS_REQUIRED_VERSION=0.82
> GLIB_REQUIRED_VERSION=2.7.0
> X11_REQUIRED_VERSION=1.0.0
> POLKIT_REQUIRED_VERSION=0.92
>diff --git a/src/ck-manager.c b/src/ck-manager.c
>index ae399e8..a040be3 100644
>--- a/src/ck-manager.c
>+++ b/src/ck-manager.c
>@@ -35,7 +35,6 @@
> #include <glib/gi18n.h>
> #include <glib/gstdio.h>
> #include <glib-object.h>
>-#define DBUS_API_SUBJECT_TO_CHANGE
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/src/ck-seat.c b/src/ck-seat.c
>index 2e48963..59db29f 100644
>--- a/src/ck-seat.c
>+++ b/src/ck-seat.c
>@@ -30,7 +30,6 @@
> #include <glib/gi18n.h>
> #include <glib-object.h>
> 
>-#define DBUS_API_SUBJECT_TO_CHANGE
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/src/ck-session-leader.c b/src/ck-session-leader.c
>index 3702602..c2ab15b 100644
>--- a/src/ck-session-leader.c
>+++ b/src/ck-session-leader.c
>@@ -32,7 +32,6 @@
> #include <glib/gi18n.h>
> #include <glib/gstdio.h>
> #include <glib-object.h>
>-#define DBUS_API_SUBJECT_TO_CHANGE
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/src/ck-session.c b/src/ck-session.c
>index 8a566bb..f291bf3 100644
>--- a/src/ck-session.c
>+++ b/src/ck-session.c
>@@ -32,7 +32,6 @@
> #include <glib/gi18n.h>
> #include <glib/gstdio.h>
> #include <glib-object.h>
>-#define DBUS_API_SUBJECT_TO_CHANGE
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/src/ck-vt-monitor.c b/src/ck-vt-monitor.c
>index 369c63e..d7d1f0b 100644
>--- a/src/ck-vt-monitor.c
>+++ b/src/ck-vt-monitor.c
>@@ -33,7 +33,6 @@
> #include <glib/gstdio.h>
> #include <glib-object.h>
> 
>-#define DBUS_API_SUBJECT_TO_CHANGE
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/src/main.c b/src/main.c
>index f685026..a39bd71 100644
>--- a/src/main.c
>+++ b/src/main.c
>@@ -34,7 +34,6 @@
> #include <glib/gi18n.h>
> #include <glib-object.h>
> 
>-#define DBUS_API_SUBJECT_TO_CHANGE
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/tools/list-sessions.c b/tools/list-sessions.c
>index 3933772..c3a020b 100644
>--- a/tools/list-sessions.c
>+++ b/tools/list-sessions.c
>@@ -32,7 +32,6 @@
> #include <glib.h>
> #include <glib/gi18n.h>
> 
>-#define DBUS_API_SUBJECT_TO_CHANGE
> #include <dbus/dbus.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 30268: 38801 | 38802

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.