Attachment 863692 Details for Bug 1062586 – [PATCH] fix soup deprecated funcs, other fixes

[patch] [PATCH] fix soup deprecated funcs, other fixes

0001-fix-soup-deprecated-funcs-other-fixes.patch (text/plain), 5.67 KB, created by Igor Gnatenko on 2014-02-16 12:31:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Gnatenko

Created: 2014-02-16 12:31:08 UTC

Size: 5.67 KB

patch

obsolete

>From b0dc569c10ee693ca8b8e5c7e40209cac0b58d1b Mon Sep 17 00:00:00 2001
>From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>Date: Sun, 16 Feb 2014 16:30:06 +0400
>Subject: [PATCH] fix soup deprecated funcs, other fixes
>
>Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>---
> 0001-fix-deprecated-soup-functions.patch | 68 ++++++++++++++++++++++++++++++++
> evolution-rss.spec                       | 34 ++++++++--------
> 2 files changed, 86 insertions(+), 16 deletions(-)
> create mode 100644 0001-fix-deprecated-soup-functions.patch
>
>diff --git a/0001-fix-deprecated-soup-functions.patch b/0001-fix-deprecated-soup-functions.patch
>new file mode 100644
>index 0000000..e5fe3f6
>--- /dev/null
>+++ b/0001-fix-deprecated-soup-functions.patch
>@@ -0,0 +1,68 @@
>+From 5ad2e2e1b2a72da5cfdfcd7deefbc51139b62a18 Mon Sep 17 00:00:00 2001
>+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>+Date: Sun, 16 Feb 2014 16:02:54 +0400
>+Subject: [PATCH] fix deprecated soup functions
>+
>+Reference: https://bugzilla.gnome.org/show_bug.cgi?id=720459
>+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>+---
>+ src/network-soup.c       | 8 ++++----
>+ src/rss-config-factory.c | 2 +-
>+ 2 files changed, 5 insertions(+), 5 deletions(-)
>+
>+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
>+-- 
>+1.8.5.3
>+
>diff --git a/evolution-rss.spec b/evolution-rss.spec
>index 7e0c27e..16130bb 100644
>--- a/evolution-rss.spec
>+++ b/evolution-rss.spec
>@@ -4,9 +4,8 @@
> 
> Name:		evolution-rss
> Summary:	Evolution RSS Reader
>-Epoch:		1
> Version:	0.3.94
>-Release:	5%{?dist}
>+Release:	6%{?dist}
> Group:		Applications/Internet
> License:	GPLv2 and GPLv2+
> URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
>@@ -19,6 +18,8 @@ Patch01: evolution-rss-0.3.94-camel-api-changes.patch
> 
> Patch02: eds-evo-3.11.2-changes.patch
> Patch03: evo-3.11.3-changes.patch
>+# https://bugzilla.gnome.org/show_bug.cgi?id=720459#c5
>+Patch04: 0001-fix-deprecated-soup-functions.patch
> 
> Requires(pre):	GConf2
> Requires(post):	GConf2
>@@ -32,6 +33,7 @@ BuildRequires:	perl(XML::Parser)
> BuildRequires:	libtool
> BuildRequires:	intltool
> BuildRequires:	gnome-common
>+BuildRequires:	GConf2
> 
> %description
> This is an evolution plugin which enables evolution to read rss feeds.
>@@ -41,6 +43,7 @@ This is an evolution plugin which enables evolution to read rss feeds.
> %patch01 -p1 -b .camel-api-changes
> %patch02 -p1 -b .eds-evo-3.11.2-changes
> %patch03 -p1 -b .evo-3.11.3-changes
>+%patch04 -p1 -b .soup-deprecated-functions
> 
> %build
> %configure --with-primary-render=webkit
>@@ -58,30 +61,23 @@ find %{buildroot} -name \*\.la -print | xargs rm -f
> rm -rf %{buildroot}
> 
> %pre
>-if [ "$1" -gt 1 ]; then
>-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>-	gconftool-2 --makefile-uninstall-rule \
>-		%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
>-fi
>+%gconf_schema_prepare %{name}
> 
>-%post -p /sbin/ldconfig
>+%post
>+/sbin/ldconfig
>+%gconf_schema_upgrade aisleriot
> 
> %preun
>-if [ "$1" -eq 0 ]; then
>-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>-	gconftool-2 --makefile-uninstall-rule \
>-		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
>-fi
>+%gconf_schema_remove %{name}
> 
> %postun
> /sbin/ldconfig
> if [ $1 -eq 0 ] ; then
>-	glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
>+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
> fi
> 
> %posttrans
>-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
>-
>+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
> 
> %files -f %{name}.lang
> %defattr(-,root,root,-)
>@@ -103,6 +99,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
> %{_libdir}/evolution/*/modules/evolution-module-rss.so
> 
> %changelog
>+* Sun Feb 16 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.3.94-6
>+- Use macroses for gconf schemas
>+- Fix glib schemas macroses
>+- RHBZ #1062586
>+- Fix deprecated soup functions (RHBZ #1032649)
>+
> * Mon Feb 03 2014 Milan Crha <mcrha@redhat.com> - 1:0.3.94-5
> - Rebuild against newer evolution-data-server
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1062586: 863692