[evolution-rss/f18] Add patch for Red Hat bug #886881 (global variable clash with evolution-rspam) Add patch for Red Hat
Milan Crha
mcrha at fedoraproject.org
Thu May 2 12:53:56 UTC 2013
commit fcf14ede05e3e12e5cd88c079c1b7306aa72f011
Author: Milan Crha <mcrha at redhat.com>
Date: Thu May 2 14:53:30 2013 +0200
Add patch for Red Hat bug #886881 (global variable clash with evolution-rspam)
Add patch for Red Hat bug #887246 (.convert file touches evolution schema)
evolution-rss-0.3.92-globals-clash.patch | 221 ++++++++++++++++++++++++++++++
evolution-rss-0.3.93-convert-fix.patch | 10 ++
evolution-rss.spec | 11 ++-
3 files changed, 241 insertions(+), 1 deletions(-)
---
diff --git a/evolution-rss-0.3.92-globals-clash.patch b/evolution-rss-0.3.92-globals-clash.patch
new file mode 100644
index 0000000..5e2523e
--- /dev/null
+++ b/evolution-rss-0.3.92-globals-clash.patch
@@ -0,0 +1,221 @@
+diff -up evolution-rss-0.3.92/src/rss.c.globals-clash evolution-rss-0.3.92/src/rss.c
+--- evolution-rss-0.3.92/src/rss.c.globals-clash 2012-09-03 16:47:11.000000000 +0200
++++ evolution-rss-0.3.92/src/rss.c 2013-05-02 14:50:35.062997448 +0200
+@@ -277,9 +277,9 @@ guint upgrade = 0; // set to 2 when init
+ guint count = 0;
+ gchar *buffer = NULL;
+ #if EVOLUTION_VERSION < 30304
+-GConfClient *rss_gconf;
++static GConfClient *rss_gconf;
+ #else
+-GSettings *settings;
++static GSettings *rss_settings;
+ #endif
+
+ gboolean inhibit_read = FALSE; //prevent mail selection when deleting folder
+@@ -540,7 +540,7 @@ download_chunk(
+ rss_gconf, GCONF_KEY_ENCLOSURE_SIZE, NULL);
+ #else
+ guint encl_max_size = g_settings_get_double(
+- settings, CONF_ENCLOSURE_SIZE);
++ rss_settings, CONF_ENCLOSURE_SIZE);
+ #endif
+ if (progress->total > encl_max_size * 1024) { //TOLERANCE!!!
+ cancel_active_op((gpointer)CFL->file);
+@@ -826,7 +826,7 @@ network_timeout(void)
+ #if EVOLUTION_VERSION < 30304
+ rss_gconf = gconf_client_get_default();
+ #else
+- settings = g_settings_new(RSS_CONF_SCHEMA);
++ rss_settings = g_settings_new(RSS_CONF_SCHEMA);
+ #endif
+
+ if (nettime_id)
+@@ -837,7 +837,7 @@ network_timeout(void)
+ rss_gconf, GCONF_KEY_NETWORK_TIMEOUT, NULL);
+ #else
+ timeout = g_settings_get_double(
+- settings, CONF_NETWORK_TIMEOUT);
++ rss_settings, CONF_NETWORK_TIMEOUT);
+ #endif
+
+ if (!timeout)
+@@ -975,14 +975,14 @@ webkit_set_preferences(void)
+ if (gconf_client_get_bool (rss_gconf,
+ GCONF_KEY_CUSTOM_FONT, NULL)) {
+ #else
+- if (g_settings_get_boolean (settings, CONF_CUSTOM_FONT)) {
++ if (g_settings_get_boolean (rss_settings, CONF_CUSTOM_FONT)) {
+ #endif
+ g_object_set (settings, "minimum-font-size",
+ #if EVOLUTION_VERSION < 30304
+ (gint)gconf_client_get_float(rss_gconf,
+ GCONF_KEY_MIN_FONT_SIZE, NULL),
+ #else
+- (gint)g_settings_get_double(settings,
++ (gint)g_settings_get_double(rss_settings,
+ CONF_MIN_FONT_SIZE),
+ #endif
+ NULL);
+@@ -991,7 +991,7 @@ webkit_set_preferences(void)
+ (gint)gconf_client_get_float(rss_gconf,
+ GCONF_KEY_MIN_FONT_SIZE, NULL),
+ #else
+- (gint)g_settings_get_double(settings,
++ (gint)g_settings_get_double(rss_settings,
+ CONF_MIN_FONT_SIZE),
+ #endif
+ NULL);
+@@ -1004,7 +1004,7 @@ webkit_set_preferences(void)
+ gconf_client_get_bool(rss_gconf,
+ GCONF_KEY_EMBED_PLUGIN, NULL),
+ #else
+- g_settings_get_boolean(settings,
++ g_settings_get_boolean(rss_settings,
+ CONF_EMBED_PLUGIN),
+ #endif
+ NULL);
+@@ -1013,7 +1013,7 @@ webkit_set_preferences(void)
+ gconf_client_get_bool(rss_gconf,
+ GCONF_KEY_HTML_JAVA, NULL),
+ #else
+- g_settings_get_boolean(settings,
++ g_settings_get_boolean(rss_settings,
+ CONF_HTML_JAVA),
+ #endif
+ NULL);
+@@ -1022,7 +1022,7 @@ webkit_set_preferences(void)
+ gconf_client_get_bool(rss_gconf,
+ GCONF_KEY_HTML_JS, NULL),
+ #else
+- g_settings_get_boolean(settings,
++ g_settings_get_boolean(rss_settings,
+ CONF_HTML_JS),
+ #endif
+ NULL);
+@@ -1479,7 +1479,7 @@ void org_gnome_cooly_folder_icon(void *e
+ #if EVOLUTION_VERSION < 30304
+ rss_gconf = gconf_client_get_default();
+ #else
+- settings = g_settings_new(RSS_CONF_SCHEMA);
++ rss_settings = g_settings_new(RSS_CONF_SCHEMA);
+ #endif
+
+ if (t->folder_name == NULL
+@@ -1507,7 +1507,7 @@ void org_gnome_cooly_folder_icon(void *e
+ #if EVOLUTION_VERSION < 30304
+ if (gconf_client_get_bool (rss_gconf, GCONF_KEY_FEED_ICON, NULL)) {
+ #else
+- if (g_settings_get_boolean (settings, CONF_FEED_ICON)) {
++ if (g_settings_get_boolean (rss_settings, CONF_FEED_ICON)) {
+ #endif
+ // if (g_file_test(feed_file, G_FILE_TEST_EXISTS)) {
+ // unfortunately e_icon_factory_get_icon return broken image in case of error
+@@ -1928,7 +1928,7 @@ add:
+ #if EVOLUTION_VERSION < 30304
+ if (gconf_client_get_bool (rss_gconf, GCONF_KEY_SEARCH_RSS, NULL)) {
+ #else
+- if (g_settings_get_boolean (settings, CONF_SEARCH_RSS)) {
++ if (g_settings_get_boolean (rss_settings, CONF_SEARCH_RSS)) {
+ #endif
+ dp("searching new feed\n");
+ rssurl = search_rss(content->str, content->len);
+@@ -3329,13 +3329,13 @@ void org_gnome_cooly_rss_startup(void *e
+ #if EVOLUTION_VERSION < 30304
+ rss_gconf = gconf_client_get_default();
+ #else
+- settings = g_settings_new(RSS_CONF_SCHEMA);
++ rss_settings = g_settings_new(RSS_CONF_SCHEMA);
+ #endif
+
+ #if EVOLUTION_VERSION < 30304
+ if (gconf_client_get_bool (rss_gconf, GCONF_KEY_START_CHECK, NULL)) {
+ #else
+- if (g_settings_get_boolean (settings, CONF_START_CHECK)) {
++ if (g_settings_get_boolean (rss_settings, CONF_START_CHECK)) {
+ #endif
+ //as I don't know how to set this I'll setup a 10 secs timeout
+ //and return false for disableation
+@@ -3350,8 +3350,8 @@ void org_gnome_cooly_rss_startup(void *e
+ NULL);
+ if (gconf_client_get_bool (rss_gconf, GCONF_KEY_REP_CHECK, NULL)) {
+ #else
+- timeout = g_settings_get_double(settings, CONF_REP_CHECK_TIMEOUT);
+- if (g_settings_get_boolean (settings, CONF_REP_CHECK)) {
++ timeout = g_settings_get_double(rss_settings, CONF_REP_CHECK_TIMEOUT);
++ if (g_settings_get_boolean (rss_settings, CONF_REP_CHECK)) {
+ #endif
+ rf->rc_id = g_timeout_add (60 * 1000 * timeout,
+ (GSourceFunc) update_articles,
+@@ -3650,7 +3650,7 @@ fallback_engine(void)
+ guint engine = gconf_client_get_int(
+ rss_gconf, GCONF_KEY_HTML_RENDER, NULL);
+ #else
+- guint engine = g_settings_get_int(settings, CONF_HTML_RENDER);
++ guint engine = g_settings_get_int(rss_settings, CONF_HTML_RENDER);
+ #endif
+ #if !defined(HAVE_GECKO) && !defined (HAVE_WEBKIT)
+ engine = 0;
+@@ -3749,7 +3749,7 @@ e_plugin_lib_enable(EPlugin *ep, int ena
+ #if EVOLUTION_VERSION < 30304
+ rss_gconf = gconf_client_get_default();
+ #else
+- settings = g_settings_new(RSS_CONF_SCHEMA);
++ rss_settings = g_settings_new(RSS_CONF_SCHEMA);
+ #endif
+ upgrade = 1;
+ d = getenv("RSS_DEBUG");
+@@ -3787,7 +3787,7 @@ e_plugin_lib_enable(EPlugin *ep, int ena
+ #if EVOLUTION_VERSION < 30304
+ if (gconf_client_get_bool (rss_gconf, GCONF_KEY_STATUS_ICON, NULL))
+ #else
+- if (g_settings_get_boolean (settings, CONF_STATUS_ICON))
++ if (g_settings_get_boolean (rss_settings, CONF_STATUS_ICON))
+ #endif
+ create_status_icon();
+ //there is no shutdown for e-plugin yet.
+@@ -3798,7 +3798,7 @@ e_plugin_lib_enable(EPlugin *ep, int ena
+ GCONF_KEY_HTML_RENDER,
+ NULL));
+ #else
+- render = g_settings_get_int(settings, CONF_HTML_RENDER);
++ render = g_settings_get_int(rss_settings, CONF_HTML_RENDER);
+ #endif
+
+ if (!render) { // set render just in case it was forced in configure
+@@ -3809,7 +3809,7 @@ e_plugin_lib_enable(EPlugin *ep, int ena
+ GCONF_KEY_HTML_RENDER,
+ render, NULL);
+ #else
+- g_settings_set_int(settings,
++ g_settings_set_int(rss_settings,
+ CONF_HTML_RENDER, render);
+ #endif
+ }
+@@ -4488,7 +4488,7 @@ display_doc_finish (GObject *o, GAsyncRe
+ #if EVOLUTION_VERSION < 30304
+ GConfClient *client = gconf_client_get_default();
+ #else
+- settings = g_settings_new(RSS_CONF_SCHEMA);
++ rss_settings = g_settings_new(RSS_CONF_SCHEMA);
+ #endif
+
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+@@ -4496,7 +4496,7 @@ display_doc_finish (GObject *o, GAsyncRe
+ #if EVOLUTION_VERSION < 30304
+ if (gconf_client_get_bool (client, GCONF_KEY_STATUS_ICON, NULL)) {
+ #else
+- if (g_settings_get_boolean (settings, CONF_STATUS_ICON)) {
++ if (g_settings_get_boolean (rss_settings, CONF_STATUS_ICON)) {
+ #endif
+ update_status_icon(asyncr->status_msg);
+ }
+@@ -4516,7 +4516,7 @@ display_doc_finish (GObject *o, GAsyncRe
+ #if EVOLUTION_VERSION < 30304
+ g_object_unref(client);
+ #else
+- g_object_unref(settings);
++ g_object_unref(rss_settings);
+ #endif
+ }
+
diff --git a/evolution-rss-0.3.93-convert-fix.patch b/evolution-rss-0.3.93-convert-fix.patch
new file mode 100644
index 0000000..ad5f93f
--- /dev/null
+++ b/evolution-rss-0.3.93-convert-fix.patch
@@ -0,0 +1,10 @@
+diff -up evolution-rss-0.3.93/src/evolution-rss.convert.convert-fix evolution-rss-0.3.93/src/evolution-rss.convert
+--- evolution-rss-0.3.93/src/evolution-rss.convert.convert-fix 2013-05-02 14:38:36.653094318 +0200
++++ evolution-rss-0.3.93/src/evolution-rss.convert 2013-05-02 14:38:43.096174418 +0200
+@@ -1,6 +1,3 @@
+-[org.gnome.evolution]
+-version = /apps/evolution/version
+-
+ [org.gnome.evolution.plugin.rss]
+ display-summary = /apps/evolution/evolution-rss/display_summary
+ accept-cookies = /apps/evolution/evolution-rss/accept_cookies
diff --git a/evolution-rss.spec b/evolution-rss.spec
index 3d8edf7..f5d4f2b 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -8,7 +8,7 @@ Name: evolution-rss
Summary: Evolution RSS Reader
Epoch: 1
Version: 0.3.92
-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
@@ -16,6 +16,9 @@ Source: http://gnome.eu.org/%{tarfile}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: evolution
+Patch0: evolution-rss-0.3.93-convert-fix.patch
+Patch1: evolution-rss-0.3.92-globals-clash.patch
+
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun):GConf2
@@ -34,6 +37,8 @@ This is an evolution plugin which enables evolution to read rss feeds.
%prep
%setup -q -n evolution-rss-%{version}
+%patch0 -p1 -b .convert-fix
+%patch1 -p1 -b .globals-clash
%build
%configure --with-primary-render=webkit
@@ -96,6 +101,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_libdir}/evolution/*/modules/evolution-module-rss.so
%changelog
+* Thu May 02 2013 Milan Crha <mcrha at redhat.com> - 1:0.3.92-2
+- Add patch for Red Hat bug #886881 (global variable clash with evolution-rspam)
+- Add patch for Red Hat bug #887246 (.convert file touches evolution schema)
+
* Thu Sep 06 2012 Lucian Langa <cooly at gnome.eu.org> - 1:0.3.92-1
- add gsettings files
- add new evolution rss module
More information about the scm-commits
mailing list