r1099 - in /unstable/evolution-rss/debian: changelog patches/64_xul-crash.patch patches/65_firefox-import.patch patches/99_autoconf.patch

ember-guest at users.alioth.debian.org ember-guest at users.alioth.debian.org
Tue Jul 22 13:04:49 UTC 2008 

Author: ember-guest
Date: Tue Jul 22 13:04:49 2008
New Revision: 1099

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1099
Log:
* debian/patches/64_xul-crash.patch:
  - Ugly workaround to prevent evolution segfaulting
    on exit (Closes: #491703)
* debian/patches/65_firefox-import.patch:
  - Fix importing feeds from firefox
* debian/patches/99_autoconf.patch:
  - To apply the changes

Added:
    unstable/evolution-rss/debian/patches/64_xul-crash.patch
    unstable/evolution-rss/debian/patches/65_firefox-import.patch
    unstable/evolution-rss/debian/patches/99_autoconf.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=1099&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Tue Jul 22 13:04:49 2008
@@ -1,3 +1,15 @@
+evolution-rss (0.1.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/64_xul-crash.patch:
+    - Ugly workaround to prevent evolution segfaulting
+      on exit (Closes: #491703)
+  * debian/patches/65_firefox-import.patch:
+    - Fix importing feeds from firefox
+  * debian/patches/99_autoconf.patch:
+    - To apply the changes
+
+ -- Pedro Fragoso <ember at ubuntu.com>  Tue, 22 Jul 2008 03:12:46 +0100
+
 evolution-rss (0.1.0-1) unstable; urgency=medium
 
   [ Heikki Henriksen ]

Added: unstable/evolution-rss/debian/patches/64_xul-crash.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/64_xul-crash.patch?rev=1099&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/64_xul-crash.patch (added)
+++ unstable/evolution-rss/debian/patches/64_xul-crash.patch Tue Jul 22 13:04:49 2008
@@ -1,0 +1,11 @@
+--- configure.ac	(revision 339)
++++ configure.ac	(working copy)
+@@ -181,6 +181,8 @@
+ 	if test $GECKO = libxul-embedding; then
+ 		PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies  >= $gecko_min_version])
+ 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
++			AC_DEFINE_UNQUOTED(HAVE_BUGGY_GECKO, 1, [workarund for a bug in shutdown gecko])
++			AC_SUBST(HAVE_BUGGY_GECKO)
+ 	elif test $GECKO = firefox; then
+ 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags firefox-xpcom)"
+     		PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])

Added: unstable/evolution-rss/debian/patches/65_firefox-import.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/65_firefox-import.patch?rev=1099&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/65_firefox-import.patch (added)
+++ unstable/evolution-rss/debian/patches/65_firefox-import.patch Tue Jul 22 13:04:49 2008
@@ -1,0 +1,44 @@
+Index: src/misc.c
+===================================================================
+--- src/misc.c	(.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/misc.c)	(revision 333)
++++ src/misc.c	(.../src/misc.c)	(working copy)
+@@ -65,6 +65,8 @@
+ {
+ 	if (strstr(text, "feed//"))
+ 		text = strextr(text, "feed//");
++	if (strstr(text, "feed:"))
++		text = strextr(text, "feed:");
+ 	if (strstr(text, "feed://"))
+ 		text = strextr(text, "feed://");
+  	if (!strstr (text, "http://") 
+Index: src/network-soup.c
+===================================================================
+--- src/network-soup.c	(.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/network-soup.c)	(revision 333)
++++ src/network-soup.c	(.../src/network-soup.c)	(working copy)
+@@ -488,7 +488,7 @@
+ 
+ 	if (!rf->b_session)
+ 		rf->b_session = soup_sess = 
+-			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);
++			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);		
+ 	else
+ 		soup_sess = rf->b_session;
+ 
+@@ -499,14 +499,14 @@
+             G_CALLBACK (reauthenticate), soup_sess);
+ #endif
+ 
+-	suri = soup_uri_new(url);
+-	if (!suri)
++	req = soup_message_new(SOUP_METHOD_GET, url);
++	if (!req)
+ 	{
+ 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
+ 				soup_status_get_phrase(2));			//invalid url
+ 		goto out;
+ 	}
+-	req = soup_message_new_from_uri(SOUP_METHOD_GET, suri);
++	d(g_print("request ok :%d\n", req->status_code));
+ 	g_signal_connect(G_OBJECT(req), "got-chunk",
+ 			G_CALLBACK(got_chunk_blocking_cb), &info);
+ 	for (; headers; headers = headers->next) {

Added: unstable/evolution-rss/debian/patches/99_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/99_autoconf.patch?rev=1099&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/99_autoconf.patch (added)
+++ unstable/evolution-rss/debian/patches/99_autoconf.patch Tue Jul 22 13:04:49 2008
@@ -1,0 +1,40 @@
+diff -Nur -x '*.orig' -x '*~' evolution-rss-0.1.0/configure evolution-rss-0.1.0.new/configure
+--- evolution-rss-0.1.0/configure	2008-07-22 12:41:56.000000000 +0000
++++ evolution-rss-0.1.0.new/configure	2008-07-22 12:42:04.000000000 +0000
+@@ -950,10 +950,10 @@
+ GECKO_XPCOM
+ GECKO_CFLAGS
+ GECKO_LIBS
++HAVE_BUGGY_GECKO
+ HAVE_RENDERKIT
+ HAVE_GTKMOZEMEBED
+ GECKO_RPATH
+-HAVE_BUGGY_GECKO
+ HAVE_XULRUNNER
+ HAVE_GECKO_1_9
+ HAVE_XPCOM_GLUE_TRUE
+@@ -22946,6 +22946,12 @@
+ 	:
+ fi
+ 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_BUGGY_GECKO 1
++_ACEOF
++
++
+ 	elif test $GECKO = firefox; then
+ 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags firefox-xpcom)"
+ 
+@@ -26459,10 +26465,10 @@
+ GECKO_XPCOM!$GECKO_XPCOM$ac_delim
+ GECKO_CFLAGS!$GECKO_CFLAGS$ac_delim
+ GECKO_LIBS!$GECKO_LIBS$ac_delim
++HAVE_BUGGY_GECKO!$HAVE_BUGGY_GECKO$ac_delim
+ HAVE_RENDERKIT!$HAVE_RENDERKIT$ac_delim
+ HAVE_GTKMOZEMEBED!$HAVE_GTKMOZEMEBED$ac_delim
+ GECKO_RPATH!$GECKO_RPATH$ac_delim
+-HAVE_BUGGY_GECKO!$HAVE_BUGGY_GECKO$ac_delim
+ HAVE_XULRUNNER!$HAVE_XULRUNNER$ac_delim
+ HAVE_GECKO_1_9!$HAVE_GECKO_1_9$ac_delim
+ HAVE_XPCOM_GLUE_TRUE!$HAVE_XPCOM_GLUE_TRUE$ac_delim

More information about the pkg-evolution-commits mailing list