Package: modest
Version: 1.0+svn1091.debian-2
Severity: important
Tags: patch
Justification: fails to build from source
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu karmic ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following:
* Fix FTBFS with libtinymail 0.0.9+svn3897-2 (LP: #426175):
+ 0007-Migrated-to-the-new-tinymail-API.patch: new patch, adapted
from upstream.
We thought you might be interested in doing the same.
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500,
'jaunty-proposed'), (500, 'jaunty-backports'), (500, 'jaunty')
Architecture: i386 (i686)
Kernel: Linux 2.6.28-15-generic (SMP w/2 CPU cores)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u modest-1.0+svn1091.debian/debian/patches/series modest-1.0+svn1091.debian/debian/patches/series
--- modest-1.0+svn1091.debian/debian/patches/series
+++ modest-1.0+svn1091.debian/debian/patches/series
@@ -6,0 +7 @@
+0007-Migrated-to-the-new-tinymail-API.patch
only in patch2:
unchanged:
--- modest-1.0+svn1091.debian.orig/debian/patches/0007-Migrated-to-the-new-tinymail-API.patch
+++ modest-1.0+svn1091.debian/debian/patches/0007-Migrated-to-the-new-tinymail-API.patch
@@ -0,0 +1,162 @@
+This patch is adapted from upstream git repository
+https://git.maemo.org/projects/modest,
+commits 6f7aa1b5e15f3024db75ccfe3138f520c607dc5d
+and f0fb7bbb8a0f9760741a88daacb3363b3e5b4551.
+
+Index: modest-1.0+svn1091.debian/src/dbus_api/modest-dbus-callbacks.c
+===================================================================
+--- modest-1.0+svn1091.debian.orig/src/dbus_api/modest-dbus-callbacks.c 2009-09-08 12:40:44.000000000 +0400
++++ modest-1.0+svn1091.debian/src/dbus_api/modest-dbus-callbacks.c 2009-09-08 12:58:44.000000000 +0400
+@@ -1569,6 +1569,7 @@
+ tny_folder_store_get_folders (folder_store,
+ all_folders,
+ NULL /* query */,
++ FALSE,
+ NULL /* error */);
+
+ TnyIterator *iter = tny_list_create_iterator (all_folders);
+Index: modest-1.0+svn1091.debian/src/modest-mail-operation.c
+===================================================================
+--- modest-1.0+svn1091.debian.orig/src/modest-mail-operation.c 2009-09-08 12:40:44.000000000 +0400
++++ modest-1.0+svn1091.debian/src/modest-mail-operation.c 2009-09-08 12:58:44.000000000 +0400
+@@ -1483,7 +1483,7 @@
+ /* Add pending call */
+ info->pending_calls++;
+
+- tny_folder_store_get_folders_async (folder, folders, NULL,
++ tny_folder_store_get_folders_async (folder, folders, NULL, FALSE,
+ recurse_folders_async_cb,
+ NULL, info);
+ g_object_unref (folders);
+@@ -1634,7 +1634,7 @@
+ /* Get all folders and continue in the callback */
+ folders = tny_simple_list_new ();
+ tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account),
+- folders, NULL,
++ folders, NULL, FALSE,
+ recurse_folders_async_cb,
+ NULL, info);
+ g_object_unref (folders);
+Index: modest-1.0+svn1091.debian/src/modest-search.c
+===================================================================
+--- modest-1.0+svn1091.debian.orig/src/modest-search.c 2009-09-08 12:40:44.000000000 +0400
++++ modest-1.0+svn1091.debian/src/modest-search.c 2009-09-08 12:58:44.000000000 +0400
+@@ -612,7 +612,7 @@
+ TnyList *children = tny_simple_list_new ();
+ helper->pending_calls++;
+ tny_folder_store_get_folders_async (TNY_FOLDER_STORE (folder), children, NULL,
+- modest_search_account_get_folders_cb,
++ FALSE, modest_search_account_get_folders_cb,
+ NULL, helper);
+ }
+
+@@ -654,7 +654,7 @@
+
+ /* Get folders */
+ tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account), folders, NULL,
+- modest_search_account_get_folders_cb,
++ FALSE, modest_search_account_get_folders_cb,
+ NULL, helper);
+ }
+
+Index: modest-1.0+svn1091.debian/src/modest-tny-account-store.c
+===================================================================
+--- modest-1.0+svn1091.debian.orig/src/modest-tny-account-store.c 2009-09-08 12:40:44.000000000 +0400
++++ modest-1.0+svn1091.debian/src/modest-tny-account-store.c 2009-09-08 12:58:44.000000000 +0400
+@@ -1619,7 +1619,7 @@
+
+ /* Get the outbox folder */
+ folders = tny_simple_list_new ();
+- tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), folders, NULL, NULL);
++ tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), folders, NULL, FALSE, NULL);
+ if (tny_list_get_length (folders) != 1) {
+ g_warning ("%s: > 1 outbox found (%d)?!", __FUNCTION__,
+ tny_list_get_length (folders));
+@@ -1948,7 +1948,7 @@
+ TnyAccount *account = TNY_ACCOUNT (tny_iterator_get_current (acc_iter));
+ TnyIterator *folders_iter = NULL;
+
+- tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, NULL);
++ tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, FALSE, NULL);
+ folders_iter = tny_list_create_iterator (folders);
+
+ while (msg == NULL && !tny_iterator_is_done (folders_iter)) {
+Index: modest-1.0+svn1091.debian/src/modest-tny-account.c
+===================================================================
+--- modest-1.0+svn1091.debian.orig/src/modest-tny-account.c 2009-09-08 12:58:44.000000000 +0400
++++ modest-1.0+svn1091.debian/src/modest-tny-account.c 2009-09-08 12:58:44.000000000 +0400
+@@ -115,7 +115,7 @@
+ /* There is no need to do this _async, as these are local folders. */
+ /* TODO: However, this seems to fail sometimes when the network is busy,
+ * returning an empty list. murrayc. */
+- tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, &error);
++ tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, FALSE, &error);
+ if (error) {
+ g_warning ("%s: tny_folder_store_get_folders() failed:%s\n", __FUNCTION__, error->message);
+ g_error_free (error);
+@@ -924,7 +924,7 @@
+ TnyIterator *iter;
+ TnyList *folders = tny_simple_list_new ();
+
+- tny_folder_store_get_folders (store, folders, query, NULL);
++ tny_folder_store_get_folders (store, folders, query, FALSE, NULL);
+ iter = tny_list_create_iterator (folders);
+
+ helper->folders += tny_list_get_length (folders);
+Index: modest-1.0+svn1091.debian/src/modest-tny-folder.c
+===================================================================
+--- modest-1.0+svn1091.debian.orig/src/modest-tny-folder.c 2009-09-08 12:40:44.000000000 +0400
++++ modest-1.0+svn1091.debian/src/modest-tny-folder.c 2009-09-08 12:58:44.000000000 +0400
+@@ -395,7 +395,7 @@
+
+ /* Get direct subfolders */
+ subfolders = tny_simple_list_new ();
+- tny_folder_store_get_folders (parent, subfolders, NULL, &err);
++ tny_folder_store_get_folders (parent, subfolders, NULL, FALSE, &err);
+
+ /* Check names */
+ iter = tny_list_create_iterator (subfolders);
+Index: modest-1.0+svn1091.debian/src/modest-tny-local-folders-account.c
+===================================================================
+--- modest-1.0+svn1091.debian.orig/src/modest-tny-local-folders-account.c 2009-09-08 12:40:44.000000000 +0400
++++ modest-1.0+svn1091.debian/src/modest-tny-local-folders-account.c 2009-09-08 12:59:57.000000000 +0400
+@@ -57,7 +57,8 @@
+
+ static void get_folders (TnyFolderStore *self,
+ TnyList *list,
+- TnyFolderStoreQuery *query,
++ TnyFolderStoreQuery *query,
++ gboolean refresh,
+ GError **err);
+
+ static TnyFolder* create_folder (TnyFolderStore *self,
+@@ -147,14 +148,18 @@
+ }
+
+ static void
+-get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err)
++get_folders (TnyFolderStore *self,
++ TnyList *list,
++ TnyFolderStoreQuery *query,
++ gboolean refresh,
++ GError **err)
+ {
+ TnyCamelStoreAccountClass *parent_class;
+ ModestTnyLocalFoldersAccountPrivate *priv;
+
+ /* Call the base class implementation: */
+ parent_class = g_type_class_peek_parent (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT_GET_CLASS (self));
+- parent_class->get_folders (self, list, query, err);
++ parent_class->get_folders (self, list, query, refresh, err);
+
+ /* Add our extra folder only if it passes the query */
+ priv = TNY_LOCAL_FOLDERS_ACCOUNT_GET_PRIVATE (self);
+@@ -175,7 +180,7 @@
+
+ /* If the folder name is been used by our extra folders */
+ if (modest_tny_local_folders_account_folder_name_in_use (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (self), name)) {
+- g_set_error (err, TNY_SERVICE_ERROR,
++ g_set_error (err, TNY_ERROR_DOMAIN,
+ TNY_SERVICE_ERROR_FOLDER_CREATE,
+ "Folder name already in use");
+ return NULL;
