rpms/evolution-rss/F-12 evolution-rss-0.1.4-sanitize-icon.patch, NONE, 1.1 evolution-rss-0.1.4-icon-size.patch, 1.1, 1.2 evolution-rss.spec, 1.39, 1.40

Lucian Langa lucilanga at fedoraproject.org
Mon Nov 23 19:38:35 UTC 2009 

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22700

Modified Files:
	evolution-rss-0.1.4-icon-size.patch evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-sanitize-icon.patch 
Log Message:
upstream patch to fix a crash in displaying folder icons (#539649)

evolution-rss-0.1.4-sanitize-icon.patch:
 rss.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE evolution-rss-0.1.4-sanitize-icon.patch ---
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-11-23 21:18:15.000000000 +0200
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-11-23 21:17:18.000000000 +0200
@@ -4859,6 +4859,8 @@
 	gint *sizes;
 	gint size, i=0;
 
+	g_return_val_if_fail(tree_store, FALSE);
+
 	pixbuf = gdk_pixbuf_new_from_file(img_file, NULL);
 
 	if (pixbuf) {

evolution-rss-0.1.4-icon-size.patch:
 src/rss-icon-factory.c |    2 ++
 src/rss.c              |   40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

Index: evolution-rss-0.1.4-icon-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss-0.1.4-icon-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- evolution-rss-0.1.4-icon-size.patch	23 Oct 2009 16:35:08 -0000	1.1
+++ evolution-rss-0.1.4-icon-size.patch	23 Nov 2009 19:38:34 -0000	1.2
@@ -1,48 +1,3 @@
-diff -Naur evolution-rss-0.1.4/config.h evolution-rss-0.1.4-mod/config.h
-diff -Naur evolution-rss-0.1.4/config.log evolution-rss-0.1.4-mod/config.log
-diff -Naur evolution-rss-0.1.4/config.status evolution-rss-0.1.4-mod/config.status
-diff -Naur evolution-rss-0.1.4/evolution-rss.spec evolution-rss-0.1.4-mod/evolution-rss.spec
-diff -Naur evolution-rss-0.1.4/libtool evolution-rss-0.1.4-mod/libtool
-diff -Naur evolution-rss-0.1.4/Makefile evolution-rss-0.1.4-mod/Makefile
-diff -Naur evolution-rss-0.1.4/pixmaps/Makefile evolution-rss-0.1.4-mod/pixmaps/Makefile
-diff -Naur evolution-rss-0.1.4/po/Makefile evolution-rss-0.1.4-mod/po/Makefile
-diff -Naur evolution-rss-0.1.4/po/Makefile.in evolution-rss-0.1.4-mod/po/Makefile.in
-diff -Naur evolution-rss-0.1.4/po/POTFILES evolution-rss-0.1.4-mod/po/POTFILES
-diff -Naur evolution-rss-0.1.4/src/.deps/dbus.Plo evolution-rss-0.1.4-mod/src/.deps/dbus.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/evolution-import-rss.Po evolution-rss-0.1.4-mod/src/.deps/evolution-import-rss.Po
-diff -Naur evolution-rss-0.1.4/src/.deps/fetch.Plo evolution-rss-0.1.4-mod/src/.deps/fetch.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/file-gio.Plo evolution-rss-0.1.4-mod/src/.deps/file-gio.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/gecko-utils.Plo evolution-rss-0.1.4-mod/src/.deps/gecko-utils.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/misc.Plo evolution-rss-0.1.4-mod/src/.deps/misc.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/network-soup.Plo evolution-rss-0.1.4-mod/src/.deps/network-soup.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/parser.Plo evolution-rss-0.1.4-mod/src/.deps/parser.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/rss-config-factory.Plo evolution-rss-0.1.4-mod/src/.deps/rss-config-factory.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/rss-icon-factory.Plo evolution-rss-0.1.4-mod/src/.deps/rss-icon-factory.Plo
-diff -Naur evolution-rss-0.1.4/src/.deps/rss.Plo evolution-rss-0.1.4-mod/src/.deps/rss.Plo
-diff -Naur evolution-rss-0.1.4/src/.libs/dbus.o evolution-rss-0.1.4-mod/src/.libs/dbus.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/fetch.o evolution-rss-0.1.4-mod/src/.libs/fetch.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/file-gio.o evolution-rss-0.1.4-mod/src/.libs/file-gio.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/gecko-utils.o evolution-rss-0.1.4-mod/src/.libs/gecko-utils.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/liborg-gnome-evolution-rss.lai evolution-rss-0.1.4-mod/src/.libs/liborg-gnome-evolution-rss.lai
-diff -Naur evolution-rss-0.1.4/src/.libs/liborg-gnome-evolution-rss.so evolution-rss-0.1.4-mod/src/.libs/liborg-gnome-evolution-rss.so
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/misc.o evolution-rss-0.1.4-mod/src/.libs/misc.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/network-soup.o evolution-rss-0.1.4-mod/src/.libs/network-soup.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/parser.o evolution-rss-0.1.4-mod/src/.libs/parser.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/rss-config-factory.o evolution-rss-0.1.4-mod/src/.libs/rss-config-factory.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/rss-icon-factory.o evolution-rss-0.1.4-mod/src/.libs/rss-icon-factory.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/.libs/rss.o evolution-rss-0.1.4-mod/src/.libs/rss.o
-\ No newline at end of file
-diff -Naur evolution-rss-0.1.4/src/Makefile evolution-rss-0.1.4-mod/src/Makefile
 diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
 --- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
 +++ evolution-rss-0.1.4-mod/src/rss.c	2009-10-23 17:40:25.000000000 +0300


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- evolution-rss.spec	5 Nov 2009 19:36:24 -0000	1.39
+++ evolution-rss.spec	23 Nov 2009 19:38:34 -0000	1.40
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -20,6 +20,7 @@ Patch0:		evolution-rss-0.1.4-folder-rena
 Patch1:		evolution-rss-0.1.4-folder-properties.patch
 Patch2:		evolution-rss-0.1.4-icon-size.patch
 Patch3:		evolution-rss-0.1.4-recv-feeds2.patch
+Patch4:		evolution-rss-0.1.4-sanitize-icon.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -29,7 +30,7 @@ Requires(preun):GConf2
 
 BuildRequires:	gettext
 BuildRequires:	evolution-devel
-BuildRequires:	evolution-data-server-devel 
+BuildRequires:	evolution-data-server-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	xulrunner-devel-unstable
 BuildRequires:	WebKit-gtk-devel
@@ -47,6 +48,7 @@ This is an evolution plugin which enable
 %patch1 -p1 -b .folder-properties
 %patch2 -p1 -b .icon-size
 %patch3 -p1 -b .recv-feeds
+%patch4 -p1 -b .sanitize-icon
 
 %build
 %configure --with-primary-render=gecko
@@ -100,6 +102,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Mon Nov 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-8
+- upstream patch to fix a crash in displaying folder icons (#539649)
+
 * Thu Nov 05 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-7
 - add new upstream fix for feeds fetching for evolution > 2.28.1

More information about the fedora-extras-commits mailing list