diff options
Diffstat (limited to 'recipes/balsa')
| -rw-r--r-- | recipes/balsa/balsa-2.4.0/balsa-no-spell.patch | 53 | ||||
| -rw-r--r-- | recipes/balsa/balsa-2.4.0/balsa-touch.patch | 11 | ||||
| -rw-r--r-- | recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch | 14 | ||||
| -rw-r--r-- | recipes/balsa/balsa_2.4.2.bb (renamed from recipes/balsa/balsa_2.4.0.bb) | 25 |
4 files changed, 33 insertions, 70 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 deleted file mode 100644 index 52780040a9..0000000000 --- a/recipes/balsa/balsa-2.4.0/balsa-no-spell.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index 16b0a68eeb..0000000000 --- a/recipes/balsa/balsa-2.4.0/balsa-touch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.2/libbalsa-gpe-corruption.patch b/recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch new file mode 100644 index 0000000000..aa6635abfb --- /dev/null +++ b/recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch @@ -0,0 +1,14 @@ +https://bugzilla.gnome.org/show_bug.cgi?id=606676 +Index: balsa-2.4.2/libbalsa/address-book-gpe.c +=================================================================== +--- balsa-2.4.2.orig/libbalsa/address-book-gpe.c ++++ balsa-2.4.2/libbalsa/address-book-gpe.c +@@ -792,7 +792,7 @@ libbalsa_address_book_gpe_alias_complete + #endif /* HAVE_SQLITE3 */ + if(err) { + printf("r=%d err=%s\n", r, err); +- free(err); ++ sqlite3_free(err); + } + return gcc.res; + } diff --git a/recipes/balsa/balsa_2.4.0.bb b/recipes/balsa/balsa_2.4.2.bb index 9fc3736a66..8cd91740b8 100644 --- a/recipes/balsa/balsa_2.4.0.bb +++ b/recipes/balsa/balsa_2.4.2.bb @@ -3,10 +3,11 @@ 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" + file://libbalsa-gpe-corruption.patch;patch=1" +PR = "r1" -DEPENDS = "glib-2.0 libgmime-2.4 gtk+ intltool-native libesmtp libxml-parser-perl-native" +DEPENDS = "glib-2.0 gmime gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native" +RDEPENDS_${PN} = "gnome-icon-theme" # 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) @@ -22,6 +23,9 @@ DEPENDS += "webkit-gtk" # Optional dependencies (missing in OE): Spell checking #DEPENDS += "gtkspell" +# Optional dependencies: desktop notification: +DEPENDS += "libnotify" + # Optional dependencies: SSL support: DEPENDS += "openssl" @@ -44,27 +48,35 @@ DEPENDS += "gconf libgnome libgnomeui" # Options for optional Kerberos 5: heimdal (not in OE) krb5 #DEPENDS += "krb5" +# Optional dependencies: automatic online/offline with NetworkManager: +#DEPENDS += "networkmanager" + # Optional dependencies: Rubrica addressbook: #DEPENDS += "libxml2" # Optional dependencies (not yet in OE): X-Face support: #DEPENDS += "compface" +# Optional dependencies: sound support: +#DEPENDS += "libcanberra" + # FIXME: doc build requires docbook4 and gnome-doc-utils -inherit autotools +inherit autotools gtk-icon-cache EXTRA_OECONF="--with-ssl \ --without-gnome \ - --enable-touch-ui \ --disable-scrollkeeper \ --enable-smime \ --with-sqlite \ --with-ssl \ --with-webkit \ --with-unique \ -# --without-gtkspell \ + --without-gtkspell \ + --without-nm \ " +# Broken (does not compile, crashes after symbol fix): +# --enable-touch-ui \ # Not enabled: # --with-gtkspell \ # --with-gpgme \ @@ -73,6 +85,7 @@ EXTRA_OECONF="--with-ssl \ # --with-gss \ # --with-ldap \ # --with-compface \ +# --with-canberra \ do_configure_prepend() { # aclocal seems to insist on looking in here. Make sure it exists. |