Merge lp:~mterry/gnome-applets/dbus-glib-ftbfs into lp:~ubuntu-desktop/gnome-applets/ubuntu

[Michael Terry]

This fixes an FTBFS due to dbus-glib headers not being included.

[John S. Gruber (jsjgruber)]

I'm certainly far from being an expert, but isn't the Makefile.in file created from the Makefile.am, making that part of the patch unnecessary?

I believe a change to gconf2's package-config file early this month may have triggered this problem.

As support, a similar upstream patch is at git://git.gnome.org/gnome-applets commit eb187f06

From eb187f06a2ad4660e9e6d7f08a4332707eb4de75 Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <email address hidden>
Date: Mon, 23 Aug 2010 23:57:29 +0200
Subject: [PATCH] Add dbus-glib to CFLAGS and LDADD to make this compile

---
 cpufreq/src/Makefile.am | 6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 2f94de7..0fb2983 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -7,7 +7,8 @@ SUBDIRS = $(selector_SUBDIR)
 INCLUDES = \
  -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/gnome-2.0/ui"\" \
  $(GNOME_APPLETS3_CFLAGS) \
- $(LIBGLADE_CFLAGS)
+ $(LIBGLADE_CFLAGS) \
+ $(DBUS_CFLAGS)

 libexec_PROGRAMS = cpufreq-applet

@@ -31,7 +32,8 @@ cpufreq_applet_SOURCES = \
 cpufreq_applet_LDADD = \
  $(GNOME_APPLETS3_LIBS) \
  $(LIBGLADE_LIBS) \
- $(LIBCPUFREQ_LIBS)
+ $(LIBCPUFREQ_LIBS) \
+ $(DBUS_LIBS)

--
1.7.1

[Sebastien Bacher (seb128)]

> but isn't the Makefile.in file created from the Makefile.am, making that part of the patch unnecessary?

it is in this case because autoreconf is ran at build time but doesn't hurt either

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-14 00:33:08 +0000
+++ debian/changelog	2010-09-28 14:10:20 +0000
@@ -1,3 +1,10 @@
+gnome-applets (2.30.0-3ubuntu3) maverick; urgency=low
+
+  * debian/patches/89_fix_dbus_glib_ftbfs.patch:
+    - Fix FTBFS due to missing dbus-glib CFLAGS (LP: #649841)
+
+ -- Michael Terry <[e-mail]>  Tue, 28 Sep 2010 10:07:39 -0400
+
 gnome-applets (2.30.0-3ubuntu2) maverick; urgency=low
 
   * debian/control.in:

=== added file 'debian/patches/89_fix_dbus_glib_ftbfs.patch'
--- debian/patches/89_fix_dbus_glib_ftbfs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/89_fix_dbus_glib_ftbfs.patch	2010-09-28 14:10:20 +0000
@@ -0,0 +1,68 @@
+Index: gnome-applets-2.30.0/cpufreq/src/Makefile.am
+===================================================================
+--- gnome-applets-2.30.0.orig/cpufreq/src/Makefile.am	2010-09-28 09:45:31.604949001 -0400
++++ gnome-applets-2.30.0/cpufreq/src/Makefile.am	2010-09-28 09:47:41.554949001 -0400
+@@ -9,6 +9,12 @@
+ 	$(GNOME_LIBS2_CFLAGS)					\
+ 	$(LIBGLADE_CFLAGS)
+ 
++if HAVE_POLKIT
++INCLUDES += \
++	$(DBUS_CFLAGS)		\
++	$(POLKIT_CFLAGS)
++endif
++
+ libexec_PROGRAMS = cpufreq-applet
+ 
+ if HAVE_LIBCPUFREQ
+@@ -34,6 +40,12 @@
+ 	$(LIBGLADE_LIBS)		\
+ 	$(LIBCPUFREQ_LIBS)
+ 
++if HAVE_POLKIT
++cpufreq_applet_LDADD += \
++	$(DBUS_LIBS)		\
++	$(POLKIT_LIBS)
++endif
++
+ 	
+ 
+ -include $(top_srcdir)/git.mk
+Index: gnome-applets-2.30.0/cpufreq/src/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/cpufreq/src/Makefile.in	2010-09-28 09:45:31.674949001 -0400
++++ gnome-applets-2.30.0/cpufreq/src/Makefile.in	2010-09-28 09:50:19.354949002 -0400
+@@ -33,7 +33,15 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
++@HAVE_POLKIT_TRUE@am__append_1 = \
++@HAVE_POLKIT_TRUE@	$(DBUS_CFLAGS)		\
++@HAVE_POLKIT_TRUE@	$(POLKIT_CFLAGS)
++
+ libexec_PROGRAMS = cpufreq-applet$(EXEEXT)
++@HAVE_POLKIT_TRUE@am__append_2 = \
++@HAVE_POLKIT_TRUE@	$(DBUS_LIBS)		\
++@HAVE_POLKIT_TRUE@	$(POLKIT_LIBS)
++
+ subdir = cpufreq/src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -363,7 +371,7 @@
+ INCLUDES = \
+ 	$(GNOME_APPLETS_CFLAGS) 				\
+ 	$(GNOME_LIBS2_CFLAGS)					\
+-	$(LIBGLADE_CFLAGS)
++	$(LIBGLADE_CFLAGS) $(am__append_1)
+ 
+ @HAVE_LIBCPUFREQ_TRUE@cpufreq_files = cpufreq-monitor-libcpufreq.c    cpufreq-monitor-libcpufreq.h
+ cpufreq_applet_SOURCES = \
+@@ -383,7 +391,7 @@
+ 	$(GNOME_APPLETS_LIBS)   	\
+ 	$(GNOME_LIBS2_LIBS)		\
+ 	$(LIBGLADE_LIBS)		\
+-	$(LIBCPUFREQ_LIBS)
++	$(LIBCPUFREQ_LIBS) $(am__append_2)
+ 
+ all: all-recursive
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-07-13 04:27:53 +0000
+++ debian/patches/series	2010-09-28 14:10:20 +0000
@@ -4,4 +4,5 @@
 86_deprecate_battstatus.patch
 87_deprecate_modemlights.patch
 88_hide_deprecated_mixer.patch
+89_fix_dbus_glib_ftbfs.patch
 99_ltmain_as-needed.patch