balsa: Updated to version 2.4.0.

3 files changed, 144 insertions, 0 deletions

diff --git a/recipes/balsa/balsa-2.4.0/balsa-no-spell.patch b/recipes/balsa/balsa-2.4.0/balsa-no-spell.patch
new file mode 100644
index 0000000000..52780040a9
--- /dev/null
+++ b/recipes/balsa/balsa-2.4.0/balsa-no-spell.patch
@@ -0,0 +1,53 @@
+WARNING! This patch is buggy!
+It fixes compilation without gtkspell and breaks compilation with gtkspell.
+Index: balsa-2.4.0/src/Makefile.am
+===================================================================
+--- balsa-2.4.0.orig/src/Makefile.am
++++ balsa-2.4.0/src/Makefile.am
+@@ -87,13 +87,13 @@ balsa_print_source = print-gtk.c	\
+ 	balsa-print-object-text.h
+ 
+ if BUILD_WITH_GTKSPELL
+-balsa_gtkspell_extra =
+-balsa_gtkspell_extra_dist =	\
++balsa_gtkspell_extra_dist =
++balsa_gtkspell_extra =		\
+ 		spell-check.c		\
+ 		spell-check.h
+ else
+-balsa_gtkspell_extra_dist =
+-balsa_gtkspell_extra =		\
++balsa_gtkspell_extra =
++balsa_gtkspell_extra_dist =	\
+ 		spell-check.c		\
+ 		spell-check.h
+ endif
+Index: balsa-2.4.0/src/sendmsg-window.c
+===================================================================
+--- balsa-2.4.0.orig/src/sendmsg-window.c
++++ balsa-2.4.0/src/sendmsg-window.c
+@@ -366,7 +366,7 @@ static const GtkActionEntry entries[] =
+      NULL, G_CALLBACK(insert_signature_cb)},
+     {"QuoteMessages", NULL, N_("_Quote Message(s)"), NULL,
+      NULL, G_CALLBACK(quote_messages_cb)},
+-#if !HAVE_GTKSPELL
++#if HAVE_GTKSPELL
+     {"CheckSpelling", GTK_STOCK_SPELL_CHECK, N_("C_heck Spelling"), NULL,
+      N_("Check the spelling of the message"),
+      G_CALLBACK(spell_check_cb)},
+@@ -6559,7 +6559,6 @@ spell_check_menu_cb(GtkToggleAction * ac
+         sw_spell_detach(bsmsg);
+ }
+ 
+-#else                           /* HAVE_GTKSPELL */
+ /* spell_check_cb
+  * 
+  * Start the spell check
+@@ -6605,6 +6604,7 @@ spell_check_cb(GtkAction * action, Balsa
+     balsa_spell_check_start(sc, GTK_WINDOW(bsmsg->window));
+ }
+ 
++#else                           /* HAVE_GTKSPELL */
+ static void
+ sw_spell_check_response(BalsaSpellCheck * spell_check, gint response, 
+                         BalsaSendmsg * bsmsg)
diff --git a/recipes/balsa/balsa-2.4.0/balsa-touch.patch b/recipes/balsa/balsa-2.4.0/balsa-touch.patch
new file mode 100644
index 0000000000..16b0a68eeb
--- /dev/null
+++ b/recipes/balsa/balsa-2.4.0/balsa-touch.patch
@@ -0,0 +1,11 @@
+--- balsa-2.4.0/src/main-window.c
++++ balsa-2.4.0/src/main-window.c
+@@ -375,7 +375,7 @@
+      G_CALLBACK(mailbox_conf_add_mbox_cb)},
+     {"NewMaildir", GTK_STOCK_ADD, N_("New \"Maildir\" mailbox..."), NULL,
+      N_("Add a new Maildir style mailbox"),
+-     G_CALLBACK(bw_mailbox_conf_add_maildir_cb)},
++     G_CALLBACK(mailbox_conf_add_maildir_cb)},
+     {"NewMH", GTK_STOCK_ADD, N_("New \"MH\" mailbox..."), NULL,
+      N_("Add a new MH style mailbox"), G_CALLBACK(mailbox_conf_add_mh_cb)},
+ #endif /* ENABLE_TOUCH_UI */
diff --git a/recipes/balsa/balsa_2.4.0.bb b/recipes/balsa/balsa_2.4.0.bb
new file mode 100644
index 0000000000..9fc3736a66
--- /dev/null
+++ b/recipes/balsa/balsa_2.4.0.bb
@@ -0,0 +1,80 @@
+DESCRIPTION = "Robust and configurable e-mail client for GNOME"
+HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/"
+SECTION = "x11/network"
+LICENSE = "GPL"
+SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \
+           file://balsa-touch.patch;patch=1 \
+           file://balsa-no-spell.patch;patch=1"
+
+DEPENDS = "glib-2.0 libgmime-2.4 gtk+ intltool-native libesmtp libxml-parser-perl-native"
+# FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML),
+# standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face)
+
+# Options for regular expressions are: NONE (POSIX) glib-2.0 (GRegex) libpcre (PCRE)
+DEPENDS += ""
+
+# Options for remote activation are: libbonobo libunique
+DEPENDS += "libunique"
+
+# Options for HTML view are: gtkhtml-2.0 gtkhtml-3.0 webkit-gtk NONE
+DEPENDS += "webkit-gtk"
+
+# Optional dependencies (missing in OE): Spell checking
+#DEPENDS += "gtkspell"
+
+# Optional dependencies: SSL support:
+DEPENDS += "openssl"
+
+# Optional dependencies: GPE addressbook:
+DEPENDS += "sqlite"
+
+# Optional dependencies: GNOME:
+DEPENDS += "gconf libgnome libgnomeui"
+#DEPENDS += "gnome-keyring"
+
+# Optional dependencies: PGP support:
+#DEPENDS += "gpgme"
+
+# Optional dependencies: view source:
+#DEPENDS += "gtksourceview2"
+
+# Optional dependencies: LDAP:
+#DEPENDS += "openldap"
+
+# Options for optional Kerberos 5: heimdal (not in OE) krb5
+#DEPENDS += "krb5"
+
+# Optional dependencies: Rubrica addressbook:
+#DEPENDS += "libxml2"
+
+# Optional dependencies (not yet in OE): X-Face support:
+#DEPENDS += "compface"
+
+# FIXME: doc build requires docbook4 and gnome-doc-utils
+
+inherit autotools
+
+EXTRA_OECONF="--with-ssl \
+	      --without-gnome \
+	      --enable-touch-ui \
+	      --disable-scrollkeeper \
+	      --enable-smime \
+	      --with-sqlite \
+	      --with-ssl \
+	      --with-webkit \
+	      --with-unique \
+#	      --without-gtkspell \
+"
+# Not enabled:
+#	      --with-gtkspell \
+#	      --with-gpgme \
+#	      --with-gtksourceview \
+#	      --with-rubrica \
+#	      --with-gss \
+#	      --with-ldap \
+#	      --with-compface \
+
+do_configure_prepend() {
+	# aclocal seems to insist on looking in here.  Make sure it exists.
+	mkdir -p ${S}/m4
+}