[evolution-rss/f14/master] add upstream patch to fix export issues (#677374)
Lucian Langa
lucilanga at fedoraproject.org
Mon Mar 7 18:55:14 UTC 2011
commit 6c5590602cba9fa49f52ed29d1fe48e3cd791216
Author: Lucian Langa <lucilanga at gnome.org>
Date: Mon Mar 7 17:09:48 2011 +0200
add upstream patch to fix export issues (#677374)
evo-rss-0.2.4-default-export-name.patch | 24 +++++++++
evo-rss-0.2.4-export-crash.patch | 82 +++++++++++++++++++++++++++++++
evo-rss-0.2.4-opml-default.patch | 48 ++++++++++++++++++
evolution-rss.spec | 12 ++++-
4 files changed, 165 insertions(+), 1 deletions(-)
---
diff --git a/evo-rss-0.2.4-default-export-name.patch b/evo-rss-0.2.4-default-export-name.patch
new file mode 100644
index 0000000..c26468b
--- /dev/null
+++ b/evo-rss-0.2.4-default-export-name.patch
@@ -0,0 +1,24 @@
+From cf2db0be9af71c2a1924b4578118af5aa2ec3ce8 Mon Sep 17 00:00:00 2001
+From: Lucian Langa <lucilanga at gnome.org>
+Date: Mon, 7 Mar 2011 11:16:46 +0200
+Subject: [PATCH 2/3] add default export file name
+
+---
+ src/rss-config-factory.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
+index 5bb71ff..a851f50 100644
+--- a/src/rss-config-factory.c
++++ b/src/rss-config-factory.c
+@@ -2987,6 +2987,7 @@ decorate_export_fs (gpointer data)
+ GTK_DIALOG (data),
+ GTK_RESPONSE_OK);
+ gtk_file_chooser_set_local_only (data, FALSE);
++ gtk_file_chooser_set_current_name (data, "evolution-rss.opml");
+
+ gtk_file_filter_add_pattern (
+ GTK_FILE_FILTER(file_filter),
+--
+1.7.4
+
diff --git a/evo-rss-0.2.4-export-crash.patch b/evo-rss-0.2.4-export-crash.patch
new file mode 100644
index 0000000..be54831
--- /dev/null
+++ b/evo-rss-0.2.4-export-crash.patch
@@ -0,0 +1,82 @@
+From 05edcd407ade99abdbf11b3cbba5eeb740be5992 Mon Sep 17 00:00:00 2001
+From: Lucian Langa <lucilanga at gnome.org>
+Date: Mon, 7 Mar 2011 10:49:44 +0200
+Subject: [PATCH 1/3] Bug 644100 - Crash when exporting feeds
+
+---
+ src/rss-config-factory.c | 36 +++++++++++++++++++++---------------
+ 1 files changed, 21 insertions(+), 15 deletions(-)
+
+diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
+index 5f174ac..5bb71ff 100644
+--- a/src/rss-config-factory.c
++++ b/src/rss-config-factory.c
+@@ -2428,8 +2428,10 @@ gen_folder_list(gpointer key, gpointer value, gpointer user)
+ gchar *tmp = g_hash_table_lookup(
+ rf->reversed_feed_folders, key);
+ gchar *folder;
++ d("mf:%s\n", mf);
+
+ if (tmp) {
++ d("tmp:%s\n", tmp);
+ tmp = g_path_get_dirname(tmp);
+ if (tmp && *tmp != '.')
+ folder = g_build_path(G_DIR_SEPARATOR_S, mf, tmp, NULL);
+@@ -2438,6 +2440,7 @@ gen_folder_list(gpointer key, gpointer value, gpointer user)
+ g_free(mf);
+ g_free(tmp);
+ if (!g_list_find_custom(flist, folder, (GCompareFunc)strcmp)) {
++ d("append folder:%s\n", folder);
+ flist = g_list_append(flist, folder);
+ }
+ }
+@@ -2552,28 +2555,31 @@ create_xml(GtkWidget *progress)
+ rf->hrname,
+ gen_folder_list,
+ NULL);
+- list = flist;
+
+- tmp = list->data;
+- //generate mssing parents
+- while ((list = g_list_next(list))) {
+- p = gen_folder_parents(p, list, tmp);
++ if (list) {
++ list = flist;
+ tmp = list->data;
+- }
+- list = flist;
+- //get parents into main list
+- for (p = g_list_first(p); p != NULL; p = g_list_next(p)) {
+- if (!g_list_find_custom(list, p->data, (GCompareFunc)strcmp)) {
+- list = g_list_append(list, p->data);
++ //generate mssing parents
++ while ((list = g_list_next(list))) {
++ p = gen_folder_parents(p, list, tmp);
++ tmp = list->data;
+ }
+- }
+- list = flist;
+- list = flist = g_list_sort(list, (GCompareFunc)strcmp);
++ list = flist;
++ //get parents into main list
++ for (p = g_list_first(p); p != NULL; p = g_list_next(p)) {
++ if (!g_list_find_custom(list, p->data, (GCompareFunc)strcmp)) {
++ list = g_list_append(list, p->data);
++ }
++ }
++ list = flist;
++ list = flist = g_list_sort(list, (GCompareFunc)strcmp);
++ } else
++ flist = g_list_append(flist, get_main_folder());
+
+ list = flist;
+ tmp = list->data;
+ strbuf = g_strdup_printf(
+- "<outline title=\"%s\" text=\"%s\" description=\"%s\" type=\"folder\">\n",
++ "<outline title=\"%s\" text=\"%s\" description=\"%s\" type=\"folder\">\n",
+ tmp, tmp, tmp);
+ result = append_buffer(result, strbuf);
+ strbuf = create_folder_feeds(tmp);
+--
+1.7.4
+
diff --git a/evo-rss-0.2.4-opml-default.patch b/evo-rss-0.2.4-opml-default.patch
new file mode 100644
index 0000000..3870191
--- /dev/null
+++ b/evo-rss-0.2.4-opml-default.patch
@@ -0,0 +1,48 @@
+From 1e206bb0f275db097aa283c1880f5cc757c79bde Mon Sep 17 00:00:00 2001
+From: Lucian Langa <lucilanga at gnome.org>
+Date: Mon, 7 Mar 2011 11:19:52 +0200
+Subject: [PATCH 3/3] make opml filter default when exporting
+
+---
+ src/rss-config-factory.c | 16 +++++++++++-----
+ 1 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
+index a851f50..9a5edcb 100644
+--- a/src/rss-config-factory.c
++++ b/src/rss-config-factory.c
+@@ -3001,20 +3001,26 @@ decorate_export_fs (gpointer data)
+ file_filter = gtk_file_filter_new ();
+ gtk_file_filter_add_pattern (
+ GTK_FILE_FILTER(file_filter),
+- "*.opml");
++ "*.xml");
+ gtk_file_filter_set_name (
+ GTK_FILE_FILTER(file_filter),
+- _("OPML Files"));
++ _("XML Files"));
+ gtk_file_chooser_add_filter (
+ GTK_FILE_CHOOSER (data),
+ GTK_FILE_FILTER(file_filter));
+
+ file_filter = gtk_file_filter_new ();
+- gtk_file_filter_add_pattern (GTK_FILE_FILTER(file_filter), "*.xml");
+- gtk_file_filter_set_name (GTK_FILE_FILTER(file_filter), _("XML Files"));
+- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (data),
++ gtk_file_filter_add_pattern (
++ GTK_FILE_FILTER(file_filter),
++ "*.opml");
++ gtk_file_filter_set_name (
++ GTK_FILE_FILTER(file_filter),
++ _("OPML Files"));
++ gtk_file_chooser_add_filter (
++ GTK_FILE_CHOOSER (data),
+ GTK_FILE_FILTER(file_filter));
+
++
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (data),
+ GTK_FILE_FILTER(file_filter));
+
+--
+1.7.4
+
diff --git a/evolution-rss.spec b/evolution-rss.spec
index 59f04b5..2d1060d 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -2,10 +2,13 @@ Name: evolution-rss
Summary: Evolution RSS Reader
Epoch: 1
Version: 0.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Internet
License: GPLv2 and GPLv2+
URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
+Patch0: evo-rss-0.2.4-export-crash.patch
+Patch1: evo-rss-0.2.4-default-export-name.patch
+Patch2: evo-rss-0.2.4-opml-default.patch
Source0: http://gnome.eu.org/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: evolution
@@ -27,6 +30,9 @@ This is an evolution plugin which enables evolution to read rss feeds.
%prep
%setup -q -n evolution-rss-%{version}
+%patch0 -p1 -b .export-crash
+%patch1 -p1 -b .default-name
+%patch2 -p1 -b .default-filter
%build
%configure --with-primary-render=webkit
@@ -81,6 +87,10 @@ fi
%{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so
%changelog
+* Mon Mar 07 2011 Lucian Langa <cooly at gnome.eu.org> - 1:0.2.4-2
+- add upstream patch for default export settings
+- add upstream patch for crash on export (677374)
+
* Sun Mar 06 2011 Lucian Langa <cooly at gnome.eu.org> - 1:0.2.4-1
- drop patch - fixed upstream
- new upstream release
More information about the scm-commits
mailing list