[oe-commits] Stanislav Brabec : balsa: Updated to version 2.4.7. Fixed infinite symlink error.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: d38001818aa06ae711902fba6dbdde765d4dbf96
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d38001818aa06ae711902fba6dbdde765d4dbf96

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Sun Jul 18 22:30:39 2010 +0000

balsa: Updated to version 2.4.7. Fixed infinite symlink error.

Signed-off-by: Stanislav Brabec <utx at penguin.cz>

---

 .../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 => balsa_2.4.7.bb}   |   12 ++++++------
 3 files changed, 21 insertions(+), 20 deletions(-)

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 aa6635a..0000000
--- 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 0000000..afaf72a
--- /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.7.bb
similarity index 88%
rename from recipes/balsa/balsa_2.4.2.bb
rename to recipes/balsa/balsa_2.4.7.bb
index 4b4f57c..7cc0b7a 100644
--- a/recipes/balsa/balsa_2.4.2.bb
+++ b/recipes/balsa/balsa_2.4.7.bb
@@ -3,8 +3,8 @@ 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"
+           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"
@@ -17,7 +17,7 @@ DEPENDS += ""
 # Options for remote activation are: libbonobo libunique
 DEPENDS += "libunique"
 
-# Options for HTML view are: gtkhtml-2.0 gtkhtml-3.0 webkit-gtk NONE
+# 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
@@ -70,7 +70,7 @@ EXTRA_OECONF="--with-ssl \
 	      --enable-smime \
 	      --with-sqlite \
 	      --with-ssl \
-	      --with-webkit \
+	      --with-html-widget=webkit \
 	      --with-unique \
 	      --without-gtkspell \
 	      --without-nm \
@@ -92,5 +92,5 @@ do_configure_prepend() {
 	mkdir -p ${S}/m4
 }
 
-SRC_URI[md5sum] = "1eb90a92c089e194a595072a57c57394"
-SRC_URI[sha256sum] = "48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090"
+SRC_URI[md5sum] = "fb9597446dfe8adcfae4a0928da336f7"
+SRC_URI[sha256sum] = "581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952"