← Back to branch summary

~ubuntu-branches/ubuntu/precise/policykit-1-gnome/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/04-autorestart.patch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-02-21 16:14:33 UTC
  • Revision ID: james.westby@ubuntu.com-20110221161433-0dxcgnfnyhez0f99
Tags: 0.99-1ubuntu4
* debian/patches/04-autorestart.patch:
  - Check for dbus-glib-1 CFLAGS and LIBS in configure.  Fixes build
    failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04-autorestart.patch
5
5
## Bug: http://launchpad.net/bugs/623819
6
6
Index: policykit-1-gnome-0.99/src/polkit-gnome-authentication-agent-1.desktop.in.in
7
7
===================================================================
8
 
--- policykit-1-gnome-0.99.orig/src/polkit-gnome-authentication-agent-1.desktop.in.in   2010-11-04 18:07:08.662779721 -0400
9
 
+++ policykit-1-gnome-0.99/src/polkit-gnome-authentication-agent-1.desktop.in.in        2010-11-04 18:07:08.722779721 -0400
 
8
--- policykit-1-gnome-0.99.orig/src/polkit-gnome-authentication-agent-1.desktop.in.in   2011-02-21 16:10:25.000000000 +0000
 
9
+++ policykit-1-gnome-0.99/src/polkit-gnome-authentication-agent-1.desktop.in.in        2011-02-21 16:10:26.000000000 +0000
10
10
@@ -7,3 +7,4 @@
11
11
 Categories=
12
12
 NoDisplay=true
14
14
+X-GNOME-AutoRestart=true
15
15
Index: policykit-1-gnome-0.99/src/main.c
16
16
===================================================================
17
 
--- policykit-1-gnome-0.99.orig/src/main.c      2010-08-09 16:43:42.000000000 -0400
18
 
+++ policykit-1-gnome-0.99/src/main.c   2010-11-04 18:07:15.532779721 -0400
 
17
--- policykit-1-gnome-0.99.orig/src/main.c      2011-02-21 16:10:10.000000000 +0000
 
18
+++ policykit-1-gnome-0.99/src/main.c   2011-02-21 16:10:28.000000000 +0000
19
19
@@ -27,6 +27,7 @@
20
20
 #include <gtk/gtk.h>
21
21
 #include <glib/gi18n.h>
168
168
   ret = 0;
169
169
Index: policykit-1-gnome-0.99/src/Makefile.am
170
170
===================================================================
171
 
--- policykit-1-gnome-0.99.orig/src/Makefile.am 2010-07-29 15:05:34.000000000 -0400
172
 
+++ policykit-1-gnome-0.99/src/Makefile.am      2010-11-04 18:07:15.512779721 -0400
 
171
--- policykit-1-gnome-0.99.orig/src/Makefile.am 2011-02-21 16:10:10.000000000 +0000
 
172
+++ policykit-1-gnome-0.99/src/Makefile.am      2011-02-21 16:10:28.000000000 +0000
173
173
@@ -28,6 +28,7 @@
174
174
        $(AM_CPPFLAGS)
175
175
 
186
186
        $(GTK_LIBS)                                     \
187
187
        $(GCONF_LIBS)                                   \
188
188
        $(POLKIT_AGENT_LIBS)                            \
 
189
Index: policykit-1-gnome-0.99/configure.ac
 
190
===================================================================
 
191
--- policykit-1-gnome-0.99.orig/configure.ac    2011-02-21 16:10:10.000000000 +0000
 
192
+++ policykit-1-gnome-0.99/configure.ac 2011-02-21 16:10:28.000000000 +0000
 
193
@@ -136,6 +136,10 @@
 
194
 AC_SUBST(POLKIT_GOBJECT_CFLAGS)
 
195
 AC_SUBST(POLKIT_GOBJECT_LIBS)
 
196
 
 
197
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
 
198
+AC_SUBST(DBUS_GLIB_CFLAGS)
 
199
+AC_SUBST(DBUS_GLIB_LIBS)
 
200
+
 
201
 AC_ARG_ENABLE([examples],
 
202
               AC_HELP_STRING([--enable-examples], [Build the example programs]),,
 
203
               [enable_examples=yes])