r1061 - in /unstable/evolution-rss/debian: changelog patches/sr-popup.patch patches/xulrunner-1.9.patch

[ember-guest at users.alioth.debian.org]

Author: ember-guest
Date: Sat May 24 18:38:19 2008
New Revision: 1061

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1061
Log:
* debian/patches/xulrunner-1.9.patch: Add support for xulrunner-1.9
* debian/patches/sr-popup.patch: Don't crash on Send/Received
  especialy on x86_64

Added:
    unstable/evolution-rss/debian/patches/sr-popup.patch
    unstable/evolution-rss/debian/patches/xulrunner-1.9.patch
Modified:
    unstable/evolution-rss/debian/changelog

Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=1061&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Sat May 24 18:38:19 2008
@@ -1,11 +1,17 @@
 evolution-rss (0.0.8-3) experimental; urgency=low
 
+  [ Heikki Henriksen ]
   * Change in build-depend due to xulrunner transition:
     - use xulrunner-dev (1.9~b5-4) instead of libxul-dev
     (closes: #480793)
   * Upload to experimental until the new xulrunner appears in unstable.
 
- -- Heikki Henriksen <heikkih at gmail.com>  Sat, 24 May 2008 11:35:38 +0200
+  [ Pedro Fragoso ]
+  * debian/patches/xulrunner-1.9.patch: Add support for xulrunner-1.9
+  * debian/patches/sr-popup.patch: Don't crash on Send/Received
+    especialy on x86_64
+
+ -- Pedro Fragoso <emberez at gmail.com>  Sat, 24 May 2008 18:44:01 +0100
 
 evolution-rss (0.0.8-2) unstable; urgency=low
 

Added: unstable/evolution-rss/debian/patches/sr-popup.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/sr-popup.patch?rev=1061&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/sr-popup.patch (added)
+++ unstable/evolution-rss/debian/patches/sr-popup.patch Sat May 24 18:38:19 2008
@@ -1,0 +1,13 @@
+--- evolution-rss-0.0.8/src/rss.c	2008-03-03 15:26:04.000000000 +0200
++++ evolution-rss-0.0.8-mod/src/rss.c	2008-05-24 16:32:37.000000000 +0300
+@@ -2264,8 +2264,8 @@
+                 if (rf->info->cancel_button)
+                         gtk_widget_set_sensitive(rf->info->cancel_button, FALSE);
+ 
+-                g_hash_table_remove(rf->info->data->active, rf->info->uri);
+-//                rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
++		g_hash_table_steal(rf->info->data->active, rf->info->uri);
++                rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
+ 
+                 if (g_hash_table_size(rf->info->data->active) == 0) {
+                         if (rf->info->data->gd)

Added: unstable/evolution-rss/debian/patches/xulrunner-1.9.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/xulrunner-1.9.patch?rev=1061&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/xulrunner-1.9.patch (added)
+++ unstable/evolution-rss/debian/patches/xulrunner-1.9.patch Sat May 24 18:38:19 2008
@@ -1,0 +1,53 @@
+Index: evolution-rss-patch/src/rss.c
+===================================================================
+--- evolution-rss-patch/src/rss.c	(.../http://svn.gnome.oorg/svn/evolution-rss/trunk)	(revision 231)
++++ evolution-rss-patch/src/rss.c	(.../evolution-rss-patch)	(working copy)
+@@ -85,8 +85,12 @@
+ #ifdef HAVE_RENDERKIT
+ 
+ #ifdef HAVE_GTKMOZEMBED
++#ifdef HAVE_LIBXUL
++#include <gtkembedmoz/gtkmozembed.h>
++#else
+ #include <gtkmozembed.h>
+ #endif
++#endif
+ 
+ #ifdef HAVE_OLD_WEBKIT
+ #include "webkitgtkglobal.h"
+@@ -1512,7 +1516,7 @@
+ 				gtk_widget_set_size_request((GtkWidget *)data, width, height);
+ // apparently resizing gtkmozembed widget won't redraw if using xulrunner
+ // there is no point in reload for the rest
+-#ifdef HAVE_XULRUNNER
++#if defined(HAVE_XULRUNNER) || defined(HAVE_LIBXUL)
+ 				gtk_moz_embed_reload(rf->mozembed, GTK_MOZ_EMBED_FLAG_RELOADNORMAL);
+ #endif
+ 			}
+@@ -1527,7 +1531,13 @@
+        	g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
+ 	g_unsetenv("MOZILLA_FIVE_HOME");
+ 
++// this means xulrunner at least 1.9
++#ifdef HAVE_LIBXUL
++	gtk_moz_embed_set_path(GECKO_HOME);
++#else
+ 	gtk_moz_embed_set_comp_path(GECKO_HOME);
++#endif
++
+ 	gchar *profile_dir = g_build_filename (g_get_home_dir (),
+                                               ".evolution",
+                                               "mail",
+Index: evolution-rss-patch/src/Makefile.am
+===================================================================
+--- evolution-rss-patch/src/Makefile.am	(.../http://svn.gnome.oorg/svn/evolution-rss/trunk)	(revision 231)
++++ evolution-rss-patch/src/Makefile.am	(.../evolution-rss-patch)	(working copy)
+@@ -3,6 +3,7 @@
+ 	-I$(EVOLUTION_SOURCE)					\
+ 	-I$(top_srcdir)						\
+ 	$(GECKO_CFLAGS)						\
++	-I$(GECKO_INCLUDE_ROOT)					\
+ 	$(WEBKIT_CFLAGS)					\
+ 	$(DBUS_CFLAGS)						\
+ 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""		\
+