lucilanga pushed to evolution-rss (f20). "update to latest upstream"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 1 22:12:37 UTC 2015
>From 8fd02252d3adecfd53a67cbe5e16a55c89a75281 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga at gnome.org>
Date: Thu, 2 Apr 2015 00:12:26 +0200
Subject: update to latest upstream
diff --git a/.gitignore b/.gitignore
index c8d2841..ea1cb86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ evolution-rss-0.2.1-20100721.tar.gz
/evolution-rss-0.3.92.tar.xz
/evolution-rss-0.3.93.tar.xz
/evolution-rss-0.3.94.tar.xz
+/evolution-rss-0.3.95.tar.xz
diff --git a/crash-ui-non-mt.patch b/crash-ui-non-mt.patch
deleted file mode 100644
index afcd3e6..0000000
--- a/crash-ui-non-mt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/rss.c b/src/rss.c
-index 5ebf5e1..5211085 100644
---- a/src/rss.c
-+++ b/src/rss.c
-@@ -4124,9 +4124,7 @@ create_mail(create_feed *CF)
- #if EVOLUTION_VERSION < 30505
- mail_refresh_folder(mail_folder, NULL, NULL);
- #else
-- EShellContent *shell_content = e_shell_view_get_shell_content (rss_shell_view);
-- EMailReader *reader = E_MAIL_READER (shell_content);
-- e_mail_reader_refresh_folder(reader, mail_folder);
-+ camel_folder_refresh_info_sync(mail_folder, NULL, NULL);
- #endif
- }
- #if (DATASERVER_VERSION >= 2031001)
diff --git a/evolution-rss-0.3.93-convert-fix.patch b/evolution-rss-0.3.93-convert-fix.patch
deleted file mode 100644
index ad5f93f..0000000
--- a/evolution-rss-0.3.93-convert-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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 90397ed..34943d7 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -5,19 +5,14 @@
Name: evolution-rss
Summary: Evolution RSS Reader
Epoch: 1
-Version: 0.3.94
-Release: 3%{?dist}
+Version: 0.3.95
+Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2 and GPLv2+
URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
Source: http://gnome.eu.org/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: evolution
-Patch1: rss-runtime.patch
-Patch2: rss-proxy.patch
-Patch3: soup-deprec.patch
-Patch4: crash-ui-non-mt.patch
-
Requires(pre): GConf2
Requires(post): GConf2
@@ -37,10 +32,6 @@ This is an evolution plugin which enables evolution to read rss feeds.
%prep
%setup -q -n evolution-rss-%{version}
-%patch1 -p1 -b .rss-runtime
-%patch2 -p1 -b .rss-proxy
-%patch3 -p1 -b .soup-deprec
-%patch4 -p1 -b .crash-ui-non-mt
%build
%configure --with-primary-render=webkit
@@ -103,6 +94,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_libdir}/evolution/*/modules/evolution-module-rss.so
%changelog
+* Wed Apr 01 2015 Lucian Langa <lucilanga at gnome.eu.org> - 1:0.3.95-1
+- drop all patches - fixed upstream
+- update to latest upstream
+
* Fri Apr 04 2014 Lucian Langa <cooly at gnome.eu.org> - 1:0.3.94-3
- add patch to fix UI crash in non mainthread (#1082686)
diff --git a/rss-proxy.patch b/rss-proxy.patch
deleted file mode 100644
index b1b47b2..0000000
--- a/rss-proxy.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/rss-evo-common.c b/src/rss-evo-common.c
-index 0145b8c..1a96862 100644
---- a/src/rss-evo-common.c
-+++ b/src/rss-evo-common.c
-@@ -242,21 +242,28 @@ rss_ipv6_network_addr (const struct in6_addr *addr, const struct in6_addr *mask,
- gboolean
- rss_ep_need_proxy_http (EProxy* proxy, const gchar * host, SoupAddress *addr)
- {
-+ SoupAddress *myaddr = NULL;
- EProxyPrivate *priv = proxy->priv;
- ProxyHostAddr *p_addr = NULL;
- GSList *l;
-- gint addr_len;
-- struct sockaddr* so_addr = NULL;
-+ guint status;
-
- /* check for ignored first */
- if (rss_ep_is_in_ignored (proxy, host))
- return FALSE;
-
-+ myaddr = soup_address_new (host, 0);
-+ status = soup_address_resolve_sync (myaddr, NULL);
-+ if (status == SOUP_STATUS_OK) {
-+ gint addr_len;
-+ struct sockaddr* so_addr = NULL;
-+
- #ifdef HAVE_LIBSOUP_GNOME
-- so_addr = soup_address_get_sockaddr (addr, &addr_len);
-+ so_addr = soup_address_get_sockaddr (myaddr, &addr_len);
- #endif
-
- if (!so_addr)
-+ g_object_unref (myaddr);
- return TRUE;
-
- if (so_addr->sa_family == AF_INET) {
-@@ -307,8 +314,10 @@ rss_ep_need_proxy_http (EProxy* proxy, const gchar * host, SoupAddress *addr)
- }
- }
- }
-+ }
-
- d(g_print ("%s needs a proxy to connect to internet\n", host));
-+ g_object_unref (myaddr);
- return TRUE;
- }
-
diff --git a/rss-runtime.patch b/rss-runtime.patch
deleted file mode 100644
index 3d07a30..0000000
--- a/rss-runtime.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 07128e0eb85b47afbf1a3616d559638d6a97b4ce
-Author: Milan Crha <mcrha at redhat.com>
-Date: Thu Mar 6 19:39:06 2014 +0100
-
- Bug 720459 - evolution-rss fail to load with 3.8: Plugin Evolution RSS is missing a function named e_plugin_ui_init()
-
-diff --git a/src/misc.c b/src/misc.c
-index 3228d7a..513f0b9 100644
---- a/src/misc.c
-+++ b/src/misc.c
-@@ -31,6 +31,7 @@
- #include <camel/camel-mime-utils.h>
- #endif
-
-+#include <mail/e-mail-reader-utils.h>
-
- #include "rss.h"
- #include "parser.h"
-@@ -683,3 +684,9 @@ textcb(NetStatusType status, gpointer statusdata, gpointer data)
-
- #endif
-
-+gchar *
-+rss_component_peek_base_directory(void)
-+{
-+ return g_strdup_printf("%s" G_DIR_SEPARATOR_S "rss",
-+ mail_session_get_data_dir ());
-+}
-diff --git a/src/misc.h b/src/misc.h
-index 3503513..965b6f9 100644
---- a/src/misc.h
-+++ b/src/misc.h
-@@ -53,5 +53,6 @@ void write_feed_status_line(gchar *file, gchar *needle);
- void dup_auth_data(gchar *origurl, gchar *url);
- void sanitize_path_separator(gchar *);
- void textcb(NetStatusType status, gpointer statusdata, gpointer data);
-+gchar *rss_component_peek_base_directory(void);
-
- #endif
-diff --git a/src/rss-formatter.c b/src/rss-formatter.c
-index fda3488..a118ff3 100644
---- a/src/rss-formatter.c
-+++ b/src/rss-formatter.c
-@@ -172,11 +172,3 @@ rss_get_display(void)
- reader = E_MAIL_READER (shell_content);
- return e_mail_reader_get_mail_display (reader);
- }
--
--gchar *
--rss_component_peek_base_directory(void)
--{
-- return g_strdup_printf("%s" G_DIR_SEPARATOR_S "rss",
-- mail_session_get_data_dir ());
--}
--
-diff --git a/src/rss-formatter.h b/src/rss-formatter.h
-index 6a2fcf3..2884072 100644
---- a/src/rss-formatter.h
-+++ b/src/rss-formatter.h
-@@ -28,7 +28,6 @@ gchar *rss_process_feed(gchar *feed, guint len);
- gchar *rss_process_website(gchar *content, gchar *website);
- gboolean rss_get_current_view(void);
- void rss_set_current_view(gboolean value);
--gchar *rss_component_peek_base_directory(void);
- gboolean rss_get_changed_view(void);
- void rss_set_changed_view(gboolean value);
- gboolean rss_get_is_html(gchar *feedid);
diff --git a/soup-deprec.patch b/soup-deprec.patch
deleted file mode 100644
index 981db34..0000000
--- a/soup-deprec.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit 6a1bc452b329acfe75b487b214f664848282fe25
-Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
-Date: Sun Feb 16 16:02:54 2014 +0400
-
- fix deprecated soup functions
-
- Reference: https://bugzilla.gnome.org/show_bug.cgi?id=720459
- Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
-
-diff --git a/src/network-soup.c b/src/network-soup.c
-index e0034d1..e9551a2 100644
---- a/src/network-soup.c
-+++ b/src/network-soup.c
-@@ -288,7 +288,7 @@ proxify_webkit_session_async(EProxy *proxy, WEBKITNET *wknet)
- case 0:
- soup_session_add_feature_by_type (
- webkit_session,
-- SOUP_TYPE_PROXY_RESOLVER_GNOME);
-+ SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
- break;
- #endif
- }
-@@ -337,7 +337,7 @@ proxify_session(EProxy *proxy, SoupSession *session, gchar *uri)
- #ifdef HAVE_LIBSOUP_GNOME
- case 0:
- soup_session_add_feature_by_type (
-- session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-+ session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
- break;
- #endif
- }
-@@ -464,7 +464,7 @@ proxify_session_async(EProxy *proxy, STNET *stnet)
- #ifdef HAVE_LIBSOUP_GNOME
- case 0:
- soup_session_add_feature_by_type (
-- stnet->ss, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-+ stnet->ss, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
- break;
- #endif
- }
-@@ -1241,7 +1241,7 @@ rss_soup_init(void)
- g_free(feed_dir);
-
- rss_soup_jar =
-- soup_cookie_jar_sqlite_new (cookie_path, FALSE);
-+ soup_cookie_jar_db_new (cookie_path, FALSE);
-
- if (!g_file_test(moz_cookie_path, G_FILE_TEST_EXISTS|G_FILE_TEST_IS_SYMLINK)) {
- sync_gecko_cookies();
-diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
-index 7105d01..9ccf5f5 100644
---- a/src/rss-config-factory.c
-+++ b/src/rss-config-factory.c
-@@ -3027,7 +3027,7 @@ import_cookies(gchar *file)
- fclose(f);
- if (!g_ascii_strncasecmp(header, SQLITE_MAGIC, sizeof(SQLITE_MAGIC))) {
- #ifdef HAVE_LIBSOUP_GNOME
-- jar = soup_cookie_jar_sqlite_new(file, TRUE);
-+ jar = soup_cookie_jar_db_new(file, TRUE);
- #else
- g_print("Importing sqlite format requires libsoup-gnome\n");
- #endif
diff --git a/sources b/sources
index 4849f47..bea9922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77f38f8c98f64f181f74443f331c7336 evolution-rss-0.3.94.tar.xz
+41c303d15ea596a0603ecc936bd4d780 evolution-rss-0.3.95.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/evolution-rss.git/commit/?h=f20&id=8fd02252d3adecfd53a67cbe5e16a55c89a75281
More information about the scm-commits
mailing list