Hello community, here is the log from the commit of package evolution-rss for openSUSE:Factory checked in at Sun Oct 2 10:00:20 CEST 2011.
-------- --- openSUSE:Factory/evolution-rss/evolution-rss.changes 2011-09-23 01:57:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution-rss/evolution-rss.changes 2011-09-28 10:38:39.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 28 08:38:27 UTC 2011 - [email protected] + +- Add evolution-rss-evo315.patch: fix build with evolution 3.1.5, + taken from git. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- evolution-rss-evo315.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-rss.spec ++++++ --- /var/tmp/diff_new_pack.hmGiTv/_old 2011-10-02 10:00:17.000000000 +0200 +++ /var/tmp/diff_new_pack.hmGiTv/_new 2011-10-02 10:00:17.000000000 +0200 @@ -37,6 +37,8 @@ Patch1: evolution-rss-evo314.patch # PATCH-FIX-UPSTREAM evolution-rss-gtk_hvbox_new.patch bgo#656126 [email protected] -- Stop using depracted gtk_[hv]box_new calls. Patch2: evolution-rss-gtk_hvbox_new.patch +# PATCH-FIX-UPSTREAM evolution-rss-evo315.patch [email protected] -- Fix build with evo >= 3.1.5, taken from git +Patch3: evolution-rss-evo315.patch BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: pkgconfig(evolution-data-server-1.2) @@ -55,7 +57,6 @@ %package -n %{_name} - Summary: Evolution Plugin for RSS Feeds Support Group: Productivity/Networking/Email/Clients Provides: %{name} = %{version} @@ -71,6 +72,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --disable-schemas-install ++++++ evolution-rss-evo315.patch ++++++ commit a7d886e3e383484ded07d9808eb8ada16ab1ca9c Author: Lucian Langa <[email protected]> Date: Thu Aug 11 22:34:50 2011 +0300 adapt to latest evolution changes diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c index 427d3d5..4a5b4c2 100644 --- a/src/rss-config-factory.c +++ b/src/rss-config-factory.c @@ -465,6 +465,9 @@ folder_cb (GtkWidget *widget, gpointer data) GError *error = NULL; EMFolderSelector *selector; EMFolderTree *folder_tree; +#if EVOLUTION_VERSION >= 30101 + EMFolderTreeModel *model; +#endif #else GtkWidget *folder_tree; #endif @@ -482,10 +485,16 @@ folder_cb (GtkWidget *widget, gpointer data) window = e_mail_reader_get_window (reader); +#if EVOLUTION_VERSION >= 30103 + model = em_folder_tree_model_get_default (); +#endif dialog = em_folder_selector_new ( window, #if EVOLUTION_VERSION >= 30101 backend, +#if EVOLUTION_VERSION >= 30103 + model, +#endif #else EM_FOLDER_TREE (folder_tree), #endif commit 8617cf7ade6b86532a43111c5feab16a8da18834 Author: Lucian Langa <[email protected]> Date: Thu Aug 18 00:18:32 2011 +0300 got the evo versions wrong diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c index 4a5b4c2..a08f1a4 100644 --- a/src/rss-config-factory.c +++ b/src/rss-config-factory.c @@ -465,7 +465,7 @@ folder_cb (GtkWidget *widget, gpointer data) GError *error = NULL; EMFolderSelector *selector; EMFolderTree *folder_tree; -#if EVOLUTION_VERSION >= 30101 +#if EVOLUTION_VERSION >= 30105 EMFolderTreeModel *model; #endif #else @@ -485,14 +485,14 @@ folder_cb (GtkWidget *widget, gpointer data) window = e_mail_reader_get_window (reader); -#if EVOLUTION_VERSION >= 30103 +#if EVOLUTION_VERSION >= 30105 model = em_folder_tree_model_get_default (); #endif dialog = em_folder_selector_new ( window, #if EVOLUTION_VERSION >= 30101 backend, -#if EVOLUTION_VERSION >= 30103 +#if EVOLUTION_VERSION >= 30105 model, #endif #else continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
