./modest/debian r20: New patch, optional-hildon-fm, allows building without libhildonfm as this
Loïc Minier
lool at dooz.org
Thu Aug 28 01:47:11 UTC 2008
------------------------------------------------------------
revno: 20
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Thu 2008-08-28 03:47:11 +0200
message:
New patch, optional-hildon-fm, allows building without libhildonfm as this
wont build with Gtk+ >= 2.13; disabled for now in Debian.
added:
debian/patches/optional-hildon-fm.patch
modified:
debian/changelog
debian/patches/series
------------------------------------------------------------
revno: 1.1.1
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Thu 2008-08-28 03:44:30 +0200
message:
New patch, optional-hildon-fm, allows building without libhildonfm as this
wont build with Gtk+ >= 2.13; disabled for now in Debian.
added:
debian/patches/optional-hildon-fm.patch
modified:
debian/changelog
debian/patches/series
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-08-14 15:02:24 +0000
+++ b/debian/changelog 2008-08-28 01:47:11 +0000
@@ -44,6 +44,8 @@
* 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.
+ * New patch, optional-hildon-fm, allows building without libhildonfm as this
+ wont build with Gtk+ >= 2.13; disabled for now in Debian.
-- Jonny Lamb <jonnylamb at jonnylamb.com> Fri, 27 Jun 2008 21:00:21 +0100
=== added file 'debian/patches/optional-hildon-fm.patch'
--- a/debian/patches/optional-hildon-fm.patch 1970-01-01 00:00:00 +0000
+++ b/debian/patches/optional-hildon-fm.patch 2008-08-28 01:44:30 +0000
@@ -0,0 +1,131 @@
+Index: src/maemo/modest-msg-edit-window.c
+===================================================================
+--- src/maemo/modest-msg-edit-window.c (revision 1099)
++++ src/maemo/modest-msg-edit-window.c (working copy)
+@@ -2153,7 +2153,11 @@
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
++#ifdef MODEST_HAVE_HILDON_FM
+ dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
++#else
++ dialog = gtk_file_chooser_dialog_new (NULL, GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN, NULL);
++#endif
+ gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ia_select_inline_image_title"));
+ gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+
+@@ -2271,7 +2275,11 @@
+ if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE))
+ return;
+
++#ifdef MODEST_HAVE_HILDON_FM
+ dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
++#else
++ dialog = gtk_file_chooser_dialog_new (NULL, GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN, NULL);
++#endif
+ gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
+ gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
+Index: src/maemo/modest-hildon-includes.h
+===================================================================
+--- src/maemo/modest-hildon-includes.h (revision 1099)
++++ src/maemo/modest-hildon-includes.h (working copy)
+@@ -65,7 +65,9 @@
+ #include <hildon-widgets/hildon-caption.h>
+ #include <hildon-widgets/hildon-number-editor.h>
+ #include <hildon-widgets/hildon-note.h>
++#ifdef MODEST_HAVE_HILDON_FM
+ #include <hildon-widgets/hildon-file-chooser-dialog.h>
++#endif
+ #include <hildon-widgets/hildon-font-selection-dialog.h>
+ #include <hildon-widgets/hildon-find-toolbar.h>
+ #include <hildon-widgets/hildon-sort-dialog.h>
+@@ -75,7 +77,9 @@
+
+ #ifdef MODEST_HAVE_HILDON1_WIDGETS
+ #include <hildon/hildon-helper.h>
++#ifdef MODEST_HAVE_HILDON_FM
+ #include <hildon/hildon-file-chooser-dialog.h>
++#endif
+ #include <hildon/hildon-color-chooser.h>
+ #include <hildon/hildon-banner.h>
+ #include <hildon/hildon-color-button.h>
+Index: src/maemo/modest-msg-view-window.c
+===================================================================
+--- src/maemo/modest-msg-view-window.c (revision 1099)
++++ src/maemo/modest-msg-view-window.c (working copy)
+@@ -2844,8 +2844,15 @@
+ tny_list_get_length (mime_parts));
+ }
+
++#ifdef MODEST_HAVE_HILDON_FM
+ save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window),
+ GTK_FILE_CHOOSER_ACTION_SAVE);
++#else
++ save_dialog = gtk_file_chooser_dialog_new (NULL,
++ GTK_WINDOW (window),
++ GTK_FILE_CHOOSER_ACTION_SAVE,
++ NULL);
++#endif
+
+ /* set folder */
+ folder = g_build_filename (g_get_home_dir (), DEFAULT_FOLDER, NULL);
+Index: src/modest-tny-account.c
+===================================================================
+--- src/modest-tny-account.c (revision 1099)
++++ src/modest-tny-account.c (working copy)
+@@ -47,7 +47,7 @@
+ #include <tny-merge-folder.h>
+ #include <modest-debug.h>
+ #include <string.h>
+-#ifdef MODEST_PLATFORM_MAEMO
++#if defined(MODEST_PLATFORM_MAEMO) && defined(MODEST_HAVE_HILDON_FM)
+ #ifdef MODEST_HAVE_HILDON0_WIDGETS
+ #include <hildon-widgets/hildon-file-system-info.h>
+ #else
+@@ -642,7 +642,7 @@
+
+
+
+-#ifdef MODEST_PLATFORM_MAEMO
++#if defined(MODEST_PLATFORM_MAEMO) && defined(MODEST_HAVE_HILDON_FM)
+ /* Gets the memory card name: */
+ static void
+ on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
+@@ -683,7 +683,7 @@
+
+ void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data)
+ {
+-#ifdef MODEST_PLATFORM_MAEMO
++#if defined(MODEST_PLATFORM_MAEMO) && defined(MODEST_HAVE_HILDON_FM)
+ /* Just use the hard-coded path for the single memory card,
+ * rather than try to figure out the path to the specific card by
+ * looking at the maildir URI:
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 1099)
++++ configure.ac (working copy)
+@@ -345,11 +345,18 @@
+ #
+ # check the version of the widgets on maemo
+ #
+-if test "x$with_platform" == "xmaemo"; then
+-PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS, hildon-1 >= 0.9.9 hildon-fm-2, have_hildon1=true,have_hildon1=false)
+-if test "x$have_hildon1" == "xfalse"; then
+- PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS, hildon-libs >= 0.12.0 hildon-fm, have_hildon0=true,have_hildon0=false)
+- if test "x$have_hildon0" == "xtrue"; then
++if test "x$with_platform" = "xmaemo"; then
++PKG_CHECK_MODULES(MODEST_HILDON_FM, hildon-fm-2, hildon_fm=hildon-fm-2, hildon_fm="")
++if test "x$hildon_fm" = "x"; then
++ PKG_CHECK_MODULES(MODEST_HILDON_FM, hildon-fm, hildon_fm=hildon-fm, hildon_fm="")
++fi
++if test "x$hildon_fm" != "x"; then
++ AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_FM, 1, ["Whether hildon-fm is used."])
++fi
++PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS, hildon-1 >= 0.9.9 $hildon_fm, have_hildon1=true,have_hildon1=false)
++if test "x$have_hildon1" = "xfalse"; then
++ PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS, hildon-libs >= 0.12.0 $hildon_fm, have_hildon0=true,have_hildon0=false)
++ if test "x$have_hildon0" = "xtrue"; then
+ AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON0_WIDGETS, 1, ["Whether hildon0 widgets are used."])
+ else
+ AC_MSG_ERROR([hildon widgets and/or hildon-fm not found])
=== modified file 'debian/patches/series'
--- a/debian/patches/series 2008-07-04 13:23:38 +0000
+++ b/debian/patches/series 2008-08-28 01:44:30 +0000
@@ -3,3 +3,4 @@
include-wpeditor-cflags-and-libs.diff
use-gtkhtml3.14.diff
set-desktopentrydir.diff
+#optional-hildon-fm.patch -p0
More information about the pkg-maemo-commits
mailing list