- try to add gtkhtml-4.0 support

Changed files:
    balsa-gtkhtml4.patch -> 1.1
    balsa.spec -> 1.164

diff --git a/balsa-gtkhtml4.patch b/balsa-gtkhtml4.patch
new file mode 100644 (file)
index 0000000..56b093e
--- /dev/null
+++ b/balsa-gtkhtml4.patch
@@ -0,0 +1,42 @@
+--- balsa-2.4.9/configure.in~  2010-11-18 23:18:23.000000000 +0100
++++ balsa-2.4.9/configure.in   2011-04-06 16:06:54.083684399 +0200
+@@ -124,10 +124,10 @@
+                   [with_gss=$withval],[with_gss=no])
+ 
+ AC_ARG_WITH(html-widget,
+-            AC_HELP_STRING([--with-html-widget=(no|gtkhtml2|gtkhtml3|webkit)],
+-                           [select the HTML renderer (default gtkhtml3)]),
++            AC_HELP_STRING([--with-html-widget=(no|gtkhtml2|gtkhtml3|gtkhtml4|webkit)],
++                           [select the HTML renderer (default gtkhtml4)]),
+             [use_html_widget=$withval],
+-            [use_html_widget=gtkhtml3])
++            [use_html_widget=gtkhtml4])
+ 
+ AC_ARG_WITH([gtksourceview],
+    AC_HELP_STRING([--with-gtksourceview],
+@@ -385,6 +385,11 @@
+         PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.14 ])
+         AC_DEFINE(HAVE_GTKHTML3,1,[Defined when GtkHtml-3 can be used.])
+     ;;
++    gtkhtml4)
++        AC_MSG_RESULT([$use_html_widget])
++      PKG_CHECK_MODULES(HTML, [ libgtkhtml-4.0 ])
++      AC_DEFINE(HAVE_GTKHTML4,1,[Defined when GtkHtml-4 can be used.])
++    ;;
+     webkit)
+         AC_MSG_RESULT([$use_html_widget])
+         if ! $PKG_CONFIG --atleast-version=1.1.14 webkit-1.0; then
+--- balsa-2.4.9/libbalsa/html.c~       2010-11-18 21:55:32.000000000 +0100
++++ balsa-2.4.9/libbalsa/html.c        2011-04-06 16:10:07.390356929 +0200
+@@ -745,9 +745,9 @@
+     requisition->height = gtk_adjustment_get_upper(adjustment);
+ }
+ 
+-# ifdef HAVE_GTKHTML3
++# ifdef HAVE_GTKHTML3 || HAVE_GTKHTML4
+ 
+-/* Code for GtkHTML-3 */
++/* Code for GtkHTML-3 and GtkHTML-4*/
+ 
+ #  include <gtkhtml/gtkhtml.h>
+ #  include <gtkhtml/gtkhtml-stream.h>

diff --git a/balsa.spec b/balsa.spec
index df73030477c1367149c6d38314ee9b2720566366..bee11abbfad4b8910d43d7d31dba93ddb4e074d7 100644 (file)
--- a/balsa.spec
+++ b/balsa.spec
@@ -25,6 +25,7 @@ Group:                X11/Applications
 Source0:       http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2
 # Source0-md5: bd7ac44f0cf3117a5fdb46d17dac2b51
 Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-gtkhtml4.patch
 URL:           http://balsa.gnome.org/
 BuildRequires: ORBit2-devel >= 1:2.12.4
 BuildRequires: aspell-devel >= 2:0.50
@@ -85,6 +86,7 @@ Suporta caixas de correio locais, POP3 a IMAP.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}