[maemo-commits] [maemo-commits] r16682 - in projects/haf/trunk/libhildonmime: . debian libhildonmime

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-11-17 10:21:57 +0200 (Mon, 17 Nov 2008)
New Revision: 16682

Modified:
   projects/haf/trunk/libhildonmime/ChangeLog
   projects/haf/trunk/libhildonmime/debian/changelog
   projects/haf/trunk/libhildonmime/debian/rules
   projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
Log:
NB#87567

Modified: projects/haf/trunk/libhildonmime/ChangeLog
===================================================================
--- projects/haf/trunk/libhildonmime/ChangeLog	2008-11-17 07:26:28 UTC (rev 16681)
+++ projects/haf/trunk/libhildonmime/ChangeLog	2008-11-17 08:21:57 UTC (rev 16682)
@@ -1,3 +1,8 @@
+2008-11-17  Richard Hult  <richard at imendio.com>
+
+	* libhildonmime/hildon-uri.c: Fix build when warning about format
+	strings and building with -Werror.
+
 2008-02-29  Richard Hult  <richard at imendio.com>
 
 	* Release 2.0.1.

Modified: projects/haf/trunk/libhildonmime/debian/changelog
===================================================================
--- projects/haf/trunk/libhildonmime/debian/changelog	2008-11-17 07:26:28 UTC (rev 16681)
+++ projects/haf/trunk/libhildonmime/debian/changelog	2008-11-17 08:21:57 UTC (rev 16682)
@@ -1,3 +1,10 @@
+libhildonmime (2.0.2-2) stable; urgency=low
+
+  * Fixes: NB#87567, libhildonmime fails to build due to variable format
+  * Don't build the debian package with -Werror
+
+ -- Richard Hult <richard at imendio.com>  Mon, 17 Nov 2008 09:16:00 +0100
+
 libhildonmime (2.0.2-1) stable; urgency=low
 
   * Use 255 max. arguments for a D-Bus message instead of 256. Fixes: NB#76269

Modified: projects/haf/trunk/libhildonmime/debian/rules
===================================================================
--- projects/haf/trunk/libhildonmime/debian/rules	2008-11-17 07:26:28 UTC (rev 16681)
+++ projects/haf/trunk/libhildonmime/debian/rules	2008-11-17 08:21:57 UTC (rev 16682)
@@ -36,7 +36,8 @@
 	./configure $(confflags) \
 		--prefix=/usr --sysconfdir=/etc \
 		--localstatedir=/var \
-		--disable-update-categorydb
+		--disable-update-categorydb \
+		--with-compile-warnings=yes
 	touch configure-stamp
 
 build: build-stamp

Modified: projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
===================================================================
--- projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2008-11-17 07:26:28 UTC (rev 16681)
+++ projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2008-11-17 08:21:57 UTC (rev 16682)
@@ -1711,6 +1711,7 @@
 	g_set_error (error,
 		     HILDON_URI_ERROR,
 		     HILDON_URI_INVALID_URI,
+		     "%s",
 		     error_str);
 
 	return NULL;
@@ -2292,6 +2293,7 @@
 		g_set_error (error,
 			     HILDON_URI_ERROR,
 			     HILDON_URI_DBUS_FAILED,
+			     "%s",
 			     str);
 
 		return FALSE;
@@ -2348,6 +2350,7 @@
 				g_set_error (error,
 					     HILDON_URI_ERROR,
 					     HILDON_URI_NO_ACTIONS,
+					     "%s",
 					     error_str);
 
 				g_free (error_str);
@@ -2376,6 +2379,7 @@
 		g_set_error (error,
 			     HILDON_URI_ERROR,
 			     HILDON_URI_DBUS_FAILED,
+			     "%s",
 			     str);
 	}