summaryrefslogtreecommitdiff
path: root/recipes/balsa
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/balsa')
-rw-r--r--recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch27
-rw-r--r--recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch14
-rw-r--r--recipes/balsa/balsa_2.4.2.bb (renamed from recipes/balsa/balsa_2.4.1.bb)13
3 files changed, 24 insertions, 30 deletions
diff --git a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch b/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch
deleted file mode 100644
index 7e16171ecc..0000000000
--- a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=596309
-Index: balsa-2.4.1/src/balsa-app.c
-===================================================================
---- balsa-2.4.1.orig/src/balsa-app.c
-+++ balsa-2.4.1/src/balsa-app.c
-@@ -436,6 +436,9 @@ balsa_app_init(void)
- /* Message filing */
- balsa_app.folder_mru=NULL;
- balsa_app.fcc_mru=NULL;
-+
-+ g_object_set (gtk_settings_get_default (),
-+ "gtk-fallback-icon-theme", "gnome", NULL);
- }
-
- void
-Index: balsa-2.4.1/configure.in
-===================================================================
---- balsa-2.4.1.orig/configure.in
-+++ balsa-2.4.1/configure.in
-@@ -329,6 +329,7 @@ glib-2.0 >= 2.16.0
- gtk+-2.0 >= 2.14.0
- gmime-2.4
- gio-2.0
-+gnome-icon-theme
- $gnome_extras
- ])
-
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.1.bb b/recipes/balsa/balsa_2.4.2.bb
index 59b0b10ac0..8cd91740b8 100644
--- a/recipes/balsa/balsa_2.4.1.bb
+++ b/recipes/balsa/balsa_2.4.2.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/"
SECTION = "x11/network"
LICENSE = "GPL"
SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \
- file://gnome-icon-theme.patch;patch=1"
+ file://libbalsa-gpe-corruption.patch;patch=1"
PR = "r1"
-DEPENDS = "glib-2.0 libgmime-2.4 gnome-icon-theme 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)
@@ -23,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"
@@ -45,6 +48,9 @@ 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"
@@ -56,7 +62,7 @@ DEPENDS += "gconf libgnome libgnomeui"
# FIXME: doc build requires docbook4 and gnome-doc-utils
-inherit autotools
+inherit autotools gtk-icon-cache
EXTRA_OECONF="--with-ssl \
--without-gnome \
@@ -67,6 +73,7 @@ EXTRA_OECONF="--with-ssl \
--with-webkit \
--with-unique \
--without-gtkspell \
+ --without-nm \
"
# Broken (does not compile, crashes after symbol fix):
# --enable-touch-ui \