commit evolution-rss for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package evolution-rss for openSUSE:Factory checked in at 2014-05-05 21:14:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-rss (Old) and /work/SRC/openSUSE:Factory/.evolution-rss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-rss" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-rss/evolution-rss.changes 2013-09-09 19:43:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-rss.new/evolution-rss.changes 2014-05-05 21:15:01.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Mar 4 21:02:09 UTC 2014 - dimstar@opensuse.org + +- Add evolution-rss-evo3.11.91.patch: Fix build with evolution + 3.11.91. +- Drop evolution-rss-soup-linking.patch: obsoleted by above patch. + +------------------------------------------------------------------- +Sat Jan 11 23:55:00 UTC 2014 - dimstar@opensuse.org + +- Add evolution-rss-evo3.11.3.patch: Fix build with evolution + 3.11.3. + +------------------------------------------------------------------- +Mon Dec 2 18:17:13 UTC 2013 - dimstar@opensuse.org + +- Add evolution-rss-evo3.11.patch: Fix build with evolution 3.11.2. + +------------------------------------------------------------------- Old: ---- evolution-rss-soup-linking.patch New: ---- evolution-rss-evo3.11.3.patch evolution-rss-evo3.11.91.patch evolution-rss-evo3.11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-rss.spec ++++++ --- /var/tmp/diff_new_pack.uvoEfz/_old 2014-05-05 21:15:02.000000000 +0200 +++ /var/tmp/diff_new_pack.uvoEfz/_new 2014-05-05 21:15:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package evolution-rss # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ %define _evo_branch %(pkg-config --variable execversion evolution-shell-3.0) -%define _evo_plugindir %(pkg-config --variable plugindir evolution-plugin-3.0) -%define _evo_errordir %(pkg-config --variable errordir evolution-plugin-3.0) +%define _evo_plugindir %(pkg-config --variable privlibdir evolution-shell-3.0)/plugins +%define _evo_errordir %(pkg-config --variable errordir evolution-shell-3.0) %define _evo_imagesdir %(pkg-config --variable imagesdir evolution-shell-3.0) Name: evolution-rss @@ -31,14 +31,18 @@ Group: Productivity/Networking/Email/Clients Url: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Source: http://gnome.eu.org/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM evolution-rss-soup-linking.patch bgo#695586 dimstar@opensuse.org -- Link the plugin against libsoup. -Patch0: evolution-rss-soup-linking.patch # PATCH-FIX-UPSTREAM evolution-rss-remove-EShellSettings-requirements.patch dimstar@opensuse.org -- Remove EShellSettings requirement, taken from git. Patch1: evolution-rss-remove-EShellSettings-requirements.patch # PATCH-FIX-UPSTREAM evolution-rss-EMailPart.patch dimstar@opensuse.org -- Adapt to EMailPart changes of evolution 3.9.3, taken from git. Patch2: evolution-rss-EMailPart.patch # PATCH-FIX-UPSTREAM evolution-rss-ESEvent.patch dimstar@opensuse.org -- Adapt to ESEvent changes in Evolution 3.9; taken frmo git. Patch3: evolution-rss-ESEvent.patch +# PATCH-FIX-UPSTREAM evolution-rss-evo3.11.patch dimstar@opensuse.org -- Fix build with evolution 3.11.2 +Patch4: evolution-rss-evo3.11.patch +# PATCH-FIX-UPSTREAM evolution-rss-evo3.11.3.patch bgo#720966 dimstar@opensuse.org -- Fix build with evolution 3.11.3 +Patch5: evolution-rss-evo3.11.3.patch +# PATCH-FIX-UPSTREAM evolution-rss-evo3.11.91 bgo#720459 bgo#725573 dimstar@opensuse.org -- Fix build with evolution 3.11.91 +Patch6: evolution-rss-evo3.11.91.patch BuildRequires: gcc-c++ # Needed only for patch0, in order to bootstrap BuildRequires: gconf2-devel @@ -47,7 +51,6 @@ BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: pkgconfig(evolution-data-server-1.2) -BuildRequires: pkgconfig(evolution-plugin-3.0) BuildRequires: pkgconfig(evolution-shell-3.0) BuildRequires: pkgconfig(glib-2.0) >= 2.26 BuildRequires: pkgconfig(gtk+-3.0) @@ -75,10 +78,12 @@ %lang_package -n %{_name} %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build # Needed for patch0 and patch2 ++++++ evolution-rss-evo3.11.3.patch ++++++
From e7b34dc4e36d7e40a8db06d289b655bca79a6624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?=
Date: Sun, 12 Jan 2014 00:36:06 +0100 Subject: [PATCH] Bug #720966 - Evo 3.11.3 - em_folder_tree_model_lookup_store_info() now private
---
src/rss-image.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/rss-image.c b/src/rss-image.c
index 9dfb636..3a3bd86 100644
--- a/src/rss-image.c
+++ b/src/rss-image.c
@@ -539,7 +539,6 @@ display_folder_icon(GtkTreeStore *tree_store, gchar *key)
GtkTreePath *path;
GtkTreeRowReference *row;
EMFolderTreeModel *mod = (EMFolderTreeModel *)tree_store;
- struct _EMFolderTreeModelStoreInfo *si;
CamelStore *store = rss_component_peek_local_store();
CamelFolderInfo *rssi = NULL;
gint i=0, size;
@@ -589,9 +588,8 @@ display_folder_icon(GtkTreeStore *tree_store, gchar *key)
icon);
g_free(sizes);
- si = em_folder_tree_model_lookup_store_info (
- EM_FOLDER_TREE_MODEL (mod), store);
- row = g_hash_table_lookup (si->full_hash, full_name);
+ row = em_folder_tree_model_get_row_reference (
+ EM_FOLDER_TREE_MODEL (mod), store, full_name);
if (!row) goto out;
path = gtk_tree_row_reference_get_path (row);
gtk_tree_model_get_iter (
--
1.8.4.2
++++++ evolution-rss-evo3.11.91.patch ++++++
Index: evolution-rss-0.3.93/configure.ac
===================================================================
--- evolution-rss-0.3.93.orig/configure.ac
+++ evolution-rss-0.3.93/configure.ac
@@ -92,11 +92,17 @@ if test "$EVOLUTION_BASE_VERSION_S" = "-
EVOLUTION_ADDITIONAL="libemail-engine"
fi
+EVOLUTION_PLUGIN_CHECK="evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED"
+
+if test "$evolution_version_int" -ge "31191"; then
+ EVOLUTION_PLUGIN_CHECK=
+fi
+
PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
[ glib-2.0 >= $LIBGLIB_REQUIRED dnl
gtk+-$LIBGTK_VERSION.0 >= $LIBGTK_REQUIRED dnl
libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
- evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
+ $EVOLUTION_PLUGIN_CHECK dnl
evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
$EVOLUTION_ADDITIONAL dnl
libebook-1.2 dnl
Index: evolution-rss-0.3.93/m4/evolution.m4
===================================================================
--- evolution-rss-0.3.93.orig/m4/evolution.m4
+++ evolution-rss-0.3.93/m4/evolution.m4
@@ -78,10 +78,17 @@ AC_SUBST(MINOR_VERSION)
dnl Evolution plugin install directory
AC_ARG_WITH(plugin-install-dir, [ --with-plugin-install-dir=PATH path to evolution plugin directory])
if test "x$with_plugin_install_dir" = "x"; then
- PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin$EVOLUTION_BASE_VERSION_S`
- if test "x$PLUGIN_INSTALL_DIR" = "x"; then
- AC_MSG_ERROR(Unable to find plugin directory)
- break;
+ if test "$evolution_version_int" -ge "031191"; then
+ PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-shell$EVOLUTION_BASE_VERSION_S`
+ if test "x$PLUGIN_INSTALL_DIR" = "x"; then
+ PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=privlibdir evolution-shell$EVOLUTION_BASE_VERSION_S`/plugins
+ fi
+ else
+ PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+ if test "x$PLUGIN_INSTALL_DIR" = "x"; then
+ AC_MSG_ERROR(Unable to find plugin directory)
+ break;
+ fi
fi
fi
AC_SUBST(PLUGIN_INSTALL_DIR)
@@ -97,7 +104,11 @@ fi
AC_SUBST(ICON_DIR)
dnl Evolution e-error install directory
-ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+if test "$evolution_version_int" -ge "031191"; then
+ ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-shell$EVOLUTION_BASE_VERSION_S`
+else
+ ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+fi
if test "x$ERROR_DIR" = "x"; then
AC_MSG_ERROR(Unable to find error file directory)
fi
@@ -107,7 +118,7 @@ dnl test required for bonobo server inst
dnl dnl user might specify wrong prefix or not specify at all
AC_ARG_WITH(bonobo-servers-dir, [ --with-bonobo-servers-dir=PATH path to bonobo servers directory])
if test "x$with_bonobo_servers_dir" = "x" ; then
- BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+ BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-shell$EVOLUTION_BASE_VERSION_S`
if test "x$BONOBO_LIBDIR" = "x"; then
AC_MSG_ERROR(Unable to find bonobo servers file directory)
fi
Index: evolution-rss-0.3.93/src/network-soup.c
===================================================================
--- evolution-rss-0.3.93.orig/src/network-soup.c
+++ evolution-rss-0.3.93/src/network-soup.c
@@ -288,7 +288,7 @@ proxify_webkit_session_async(EProxy *pro
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, SoupSessi
#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, STN
#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
}
@@ -1240,7 +1240,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();
Index: evolution-rss-0.3.93/src/rss-config-factory.c
===================================================================
--- evolution-rss-0.3.93.orig/src/rss-config-factory.c
+++ evolution-rss-0.3.93/src/rss-config-factory.c
@@ -3016,7 +3016,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
Index: evolution-rss-0.3.93/src/misc.c
===================================================================
--- evolution-rss-0.3.93.orig/src/misc.c
+++ evolution-rss-0.3.93/src/misc.c
@@ -31,6 +31,7 @@
#include From 87ae939abd5ef896130bab49d84660309a1826d1 Mon Sep 17 00:00:00 2001
From: Lucian Langa ---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 10b4301..84a1d6e 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -1273,7 +1273,11 @@ rss_delete_folders (CamelStore *store,
d("call rss_delete_rec()\n");
rss_delete_rec (store, fi, error);
+#if (DATASERVER_VERSION >= 3011001)
+ camel_folder_info_free (fi);
+#else
camel_store_free_folder_info (store, fi);
+#endif
}
void
diff --git a/src/rss-image.c b/src/rss-image.c
index 5169cb2..12ab7fc 100644
--- a/src/rss-image.c
+++ b/src/rss-image.c
@@ -509,7 +509,11 @@ display_folder_icon(GtkTreeStore *tree_store, gchar *key)
COL_STRING_ICON_NAME, key,
-1);
g_free(full_name);
+#if (DATASERVER_VERSION >= 3011001)
+ camel_folder_info_free (rssi);
+#else
camel_store_free_folder_info (store, rssi);
+#endif
g_object_unref(pixbuf);
result = TRUE;
}
diff --git a/src/rss.c b/src/rss.c
index 4c9b06b..1dcf192 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -4134,7 +4134,11 @@ create_mail(create_feed *CF)
camel_object_unref(new);
camel_object_unref(mail_folder);
#endif
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
camel_message_info_free(info);
+#endif
g_free(buf);
}
@@ -4593,7 +4597,12 @@ delete_oldest_article(CamelFolder *folder, guint unread)
}
// d("uid:%d j:%d/%d, absdate:%d, date:%s, imax:%d\n",
// i, j, q, min_date, ctime(&min_date), imax);
-out: camel_message_info_free(info);
+out:
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
+ camel_message_info_free(info);
+#endif
}
camel_folder_freeze(folder);
if (min_date) {
@@ -4689,7 +4698,11 @@ get_feed_age(RDF *r, gpointer name)
feedid);
g_free(feed_name);
}
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
camel_folder_free_message_info(folder, info);
+#endif
}
#if (DATASERVER_VERSION >= 2031001)
g_object_unref (message);
@@ -4728,7 +4741,11 @@ get_feed_age(RDF *r, gpointer name)
}
}
}
+#if (DATASERVER_VERSION >= 3011001)
+ camel_message_info_unref(info);
+#else
camel_folder_free_message_info(folder, info);
+#endif
}
camel_folder_free_uids (folder, uids);
#if (DATASERVER_VERSION >= 2033001)
--
cgit v0.9.2 From a9805199c18b1a8b6b2c48d83b3c78be21b2ab91 Mon Sep 17 00:00:00 2001
From: Milan Crha ---
diff --git a/src/parser.c b/src/parser.c
index d3b3ed6..ef20856 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -25,11 +25,16 @@
#include
participants (1)
-
root@hilbert.suse.de