From d38001818aa06ae711902fba6dbdde765d4dbf96 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 18 Jul 2010 22:30:39 +0000 Subject: balsa: Updated to version 2.4.7. Fixed infinite symlink error. Signed-off-by: Stanislav Brabec --- .../balsa-2.4.2/libbalsa-gpe-corruption.patch | 14 ---- recipes/balsa/balsa-2.4.7/obsolete-icon.patch | 15 ++++ recipes/balsa/balsa_2.4.2.bb | 96 ---------------------- recipes/balsa/balsa_2.4.7.bb | 96 ++++++++++++++++++++++ 4 files changed, 111 insertions(+), 110 deletions(-) delete mode 100644 recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch create mode 100644 recipes/balsa/balsa-2.4.7/obsolete-icon.patch delete mode 100644 recipes/balsa/balsa_2.4.2.bb create mode 100644 recipes/balsa/balsa_2.4.7.bb diff --git a/recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch b/recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch deleted file mode 100644 index aa6635abfb..0000000000 --- a/recipes/balsa/balsa-2.4.2/libbalsa-gpe-corruption.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.7/obsolete-icon.patch b/recipes/balsa/balsa-2.4.7/obsolete-icon.patch new file mode 100644 index 0000000000..afaf72a26b --- /dev/null +++ b/recipes/balsa/balsa-2.4.7/obsolete-icon.patch @@ -0,0 +1,15 @@ +fix infinite symlink in documentation +https://bugzilla.gnome.org/show_bug.cgi?id=624690 + +Index: balsa-2.4.7/doc/Makefile.am +=================================================================== +--- balsa-2.4.7.orig/doc/Makefile.am ++++ balsa-2.4.7/doc/Makefile.am +@@ -7,7 +7,6 @@ DOC_INCLUDES = + DOC_FIGURES = figures/address-book-ldap.png \ + figures/address-book-modify.png \ + figures/address-book.png \ +- figures/address-book-start.png \ + figures/address-book-vcard.png \ + figures/balsa_logo.png \ + figures/druid-start.png \ diff --git a/recipes/balsa/balsa_2.4.2.bb b/recipes/balsa/balsa_2.4.2.bb deleted file mode 100644 index 4b4f57cdaf..0000000000 --- a/recipes/balsa/balsa_2.4.2.bb +++ /dev/null @@ -1,96 +0,0 @@ -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://libbalsa-gpe-corruption.patch" -PR = "r1" - -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) - -# 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: desktop notification: -DEPENDS += "libnotify" - -# 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: 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 gtk-icon-cache - -EXTRA_OECONF="--with-ssl \ - --without-gnome \ - --disable-scrollkeeper \ - --enable-smime \ - --with-sqlite \ - --with-ssl \ - --with-webkit \ - --with-unique \ - --without-gtkspell \ - --without-nm \ -" -# Broken (does not compile, crashes after symbol fix): -# --enable-touch-ui \ -# Not enabled: -# --with-gtkspell \ -# --with-gpgme \ -# --with-gtksourceview \ -# --with-rubrica \ -# --with-gss \ -# --with-ldap \ -# --with-compface \ -# --with-canberra \ - -do_configure_prepend() { - # aclocal seems to insist on looking in here. Make sure it exists. - mkdir -p ${S}/m4 -} - -SRC_URI[md5sum] = "1eb90a92c089e194a595072a57c57394" -SRC_URI[sha256sum] = "48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090" diff --git a/recipes/balsa/balsa_2.4.7.bb b/recipes/balsa/balsa_2.4.7.bb new file mode 100644 index 0000000000..7cc0b7ad3b --- /dev/null +++ b/recipes/balsa/balsa_2.4.7.bb @@ -0,0 +1,96 @@ +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://obsolete-icon.patch" +PR = "r0" + +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) + +# 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(gtkhtml2) gtkhtml-3.0(gtkhtml3) webkit-gtk(webkit) NONE +DEPENDS += "webkit-gtk" + +# Optional dependencies (missing in OE): Spell checking +#DEPENDS += "gtkspell" + +# Optional dependencies: desktop notification: +DEPENDS += "libnotify" + +# 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: 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 gtk-icon-cache + +EXTRA_OECONF="--with-ssl \ + --without-gnome \ + --disable-scrollkeeper \ + --enable-smime \ + --with-sqlite \ + --with-ssl \ + --with-html-widget=webkit \ + --with-unique \ + --without-gtkspell \ + --without-nm \ +" +# Broken (does not compile, crashes after symbol fix): +# --enable-touch-ui \ +# Not enabled: +# --with-gtkspell \ +# --with-gpgme \ +# --with-gtksourceview \ +# --with-rubrica \ +# --with-gss \ +# --with-ldap \ +# --with-compface \ +# --with-canberra \ + +do_configure_prepend() { + # aclocal seems to insist on looking in here. Make sure it exists. + mkdir -p ${S}/m4 +} + +SRC_URI[md5sum] = "fb9597446dfe8adcfae4a0928da336f7" +SRC_URI[sha256sum] = "581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952" -- cgit v1.2.3