./modest/debian r19: Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE

[Loïc Minier]

------------------------------------------------------------
revno: 19
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Thu 2008-08-14 17:02:24 +0200
message:
  Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
  differ.
modified:
  configure.ac
  debian/changelog
  debian/rules
  src/Makefile.am
  src/maemo/Makefile.am
  src/maemo/modest-msg-edit-window.c
-------------- next part --------------
=== modified file 'configure.ac'
--- a/configure.ac	2008-07-04 13:23:38 +0000
+++ b/configure.ac	2008-08-14 15:02:24 +0000
@@ -65,7 +65,7 @@
 
 
 dnl # GLib/Gobject/Gtk/Gconf => mandatory
-PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-3.8 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) 
+PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-3.14 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) 
 AC_SUBST(MODEST_GSTUFF_CFLAGS)
 AC_SUBST(MODEST_GSTUFF_LIBS)
 
@@ -365,7 +365,7 @@
 
   # warnings are errors, but don't check format errors, because
   # it breaks with logical ids
-  CFLAGS="$CFLAGS -Wno-format-extra-args -Werror"
+  CFLAGS="$CFLAGS -Wno-format-extra-args"
 
    desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir`
    serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-08-14 14:55:45 +0000
+++ b/debian/changelog	2008-08-14 15:02:24 +0000
@@ -42,6 +42,8 @@
   * Add a Debian TODO tracking possible enhancements (currently additional
     packages which should be prepared for advanced modest functionalities).
   * Build-dep on check (>= 0.9.4) in case we want to run the testsuite.
+  * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
+    differ.
 
  -- Jonny Lamb <jonnylamb at jonnylamb.com>  Fri, 27 Jun 2008 21:00:21 +0100
 

=== modified file 'debian/rules'
--- a/debian/rules	2008-08-14 14:34:36 +0000
+++ b/debian/rules	2008-08-14 15:02:24 +0000
@@ -6,14 +6,18 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 configure_flags += \
-	--host=$(DEB_HOST_GNU_TYPE) \
-	--build=$(DEB_BUILD_GNU_TYPE) \
 	--prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
 	--with-platform=maemo
 
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
+else
+configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
 CFLAGS += -Wall -g
 CFLAGS += -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 # Use soft-float and thumb mode if it is enabled.

=== modified file 'src/Makefile.am'
--- a/src/Makefile.am	2008-07-04 13:23:38 +0000
+++ b/src/Makefile.am	2008-08-14 15:02:24 +0000
@@ -137,7 +137,8 @@
 endif 
 
 
-modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
+modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS) \
+	$(MODEST_WPEDITOR_CFLAGS)
 modest_LDFLAGS = -Wl,--version-script=export.map
 
 modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
@@ -153,7 +154,8 @@
 	$(MODEST_OGS_LIBS)				\
 	${easysetupmaybe}				\
 	$(MODEST_PLATFORM)/libmodest-ui.la		\
-	widgets/libmodest-widgets.la)
+	widgets/libmodest-widgets.la			\
+	$(MODEST_WPEDITOR_LIBS))
 
 
 if MODEST_HAVE_DBUS_API

=== modified file 'src/maemo/Makefile.am'
--- a/src/maemo/Makefile.am	2008-07-04 13:23:38 +0000
+++ b/src/maemo/Makefile.am	2008-08-14 15:02:24 +0000
@@ -111,6 +111,7 @@
 ui_DATA = $(UI_FILES)
 
 serviceentry_DATA   = com.nokia.modest.service
+desktopentrydir     = $(datadir)/applications/hildon
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
 

=== modified file 'src/maemo/modest-msg-edit-window.c'
--- a/src/maemo/modest-msg-edit-window.c	2008-07-04 13:23:38 +0000
+++ b/src/maemo/modest-msg-edit-window.c	2008-08-14 15:02:24 +0000
@@ -1044,7 +1044,7 @@
 			if (pixbuf != NULL) {
 				priv->images_count ++;
 				priv->images_size += stream_size;
-				wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
+				/*wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);*/
 				g_object_unref (pixbuf);
 			}
 		}