Djam/evolution-data-server
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/evolution-data-server.git synced 2025-02-23 15:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 3.16.4

Browse source
This commit is contained in:
Tigro 2015-12-17 13:38:47 +03:00
commit ea99fc819d
5 changed files with 29 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
evolution-data-server-3.12.9.tar.xz: d8957c37ab6897c1d116fa253179a15828a331b3
evolution-data-server-3.16.4.tar.xz: 95c851903a62de9b5213ca5cc176238bb4b96b8c

12
evolution-data-server-3.8.5-cert-viewer-crash.patch
View file

@ -1,12 +0,0 @@
diff -up evolution-data-server-3.8.5/modules/trust-prompt/certificate-viewer.c.cert-viewer-crash evolution-data-server-3.8.5/modules/trust-prompt/certificate-viewer.c
--- evolution-data-server-3.8.5/modules/trust-prompt/certificate-viewer.c.cert-viewer-crash 2013-07-23 13:57:38.000000000 +0200
+++ evolution-data-server-3.8.5/modules/trust-prompt/certificate-viewer.c 2013-08-12 09:14:19.814379827 +0200
@@ -538,7 +538,7 @@ get_window_title (CERTCertificate *cert)
return title;
}
- return cert->subjectName;
+ return g_strdup (cert->subjectName);
}
GtkWidget *

156
evolution-data-server-3.8.5-imapx-summary-vanish.patch
View file

@ -1,156 +0,0 @@
diff -up evolution-data-server-3.8.5/camel/camel-imapx-command.c.imapx-summary-vanish evolution-data-server-3.8.5/camel/camel-imapx-command.c
--- evolution-data-server-3.8.5/camel/camel-imapx-command.c.imapx-summary-vanish 2013-08-02 16:57:28.000000000 +0200
+++ evolution-data-server-3.8.5/camel/camel-imapx-command.c 2013-10-09 12:49:22.007984356 +0200
@@ -42,6 +42,9 @@ struct _CamelIMAPXRealCommand {
/* For building the part. */
GString *buffer;
+ /* For network/parse errors. */
+ GError *error;
+
/* Used for running some commands synchronously. */
GCond done_sync_cond;
GMutex done_sync_mutex;
@@ -141,6 +144,8 @@ camel_imapx_command_unref (CamelIMAPXCom
g_string_free (real_ic->buffer, TRUE);
+ g_clear_error (&real_ic->error);
+
g_cond_clear (&real_ic->done_sync_cond);
g_mutex_clear (&real_ic->done_sync_mutex);
@@ -577,12 +582,50 @@ camel_imapx_command_done (CamelIMAPXComm
g_mutex_unlock (&real_ic->done_sync_mutex);
}
+/**
+ * camel_imapx_command_failed:
+ * @ic: a #CamelIMAPXCommand
+ * @error: the error which caused the failure
+ *
+ * Copies @error to be returned in camel_imapx_command_set_error_if_failed().
+ * Call this function if a networking or parsing error occurred to force all
+ * active IMAP commands to abort processing.
+ *
+ * Since: 3.10
+ **/
+void
+camel_imapx_command_failed (CamelIMAPXCommand *ic,
+ const GError *error)
+{
+ CamelIMAPXRealCommand *real_ic;
+
+ g_return_if_fail (CAMEL_IS_IMAPX_COMMAND (ic));
+ g_return_if_fail (error != NULL);
+
+ real_ic = (CamelIMAPXRealCommand *) ic;
+ g_return_if_fail (real_ic->error == NULL);
+
+ real_ic->error = g_error_copy (error);
+}
+
gboolean
camel_imapx_command_set_error_if_failed (CamelIMAPXCommand *ic,
GError **error)
{
+ CamelIMAPXRealCommand *real_ic;
+
g_return_val_if_fail (CAMEL_IS_IMAPX_COMMAND (ic), FALSE);
+ real_ic = (CamelIMAPXRealCommand *) ic;
+
+ /* Check for a networking or parsing error. */
+ if (real_ic->error != NULL) {
+ g_propagate_error (error, real_ic->error);
+ real_ic->error = NULL;
+ return TRUE;
+ }
+
+ /* Check if the IMAP server rejected the command. */
if (ic->status != NULL && ic->status->result != IMAPX_OK) {
/* FIXME Map IMAP response codes to more
diff -up evolution-data-server-3.8.5/camel/camel-imapx-command.h.imapx-summary-vanish evolution-data-server-3.8.5/camel/camel-imapx-command.h
--- evolution-data-server-3.8.5/camel/camel-imapx-command.h.imapx-summary-vanish 2013-07-23 13:57:42.000000000 +0200
+++ evolution-data-server-3.8.5/camel/camel-imapx-command.h 2013-10-09 12:49:22.008984356 +0200
@@ -120,6 +120,8 @@ void camel_imapx_command_add_part (Came
void camel_imapx_command_close (CamelIMAPXCommand *ic);
void camel_imapx_command_wait (CamelIMAPXCommand *ic);
void camel_imapx_command_done (CamelIMAPXCommand *ic);
+void camel_imapx_command_failed (CamelIMAPXCommand *ic,
+ const GError *error);
gboolean camel_imapx_command_set_error_if_failed
(CamelIMAPXCommand *ic,
GError **error);
diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-summary-vanish evolution-data-server-3.8.5/camel/camel-imapx-server.c
--- evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-summary-vanish 2013-07-23 13:57:58.000000000 +0200
+++ evolution-data-server-3.8.5/camel/camel-imapx-server.c 2013-10-09 12:49:22.011984355 +0200
@@ -6795,10 +6795,9 @@ imapx_job_sync_changes_matches (CamelIMA
return camel_imapx_job_has_folder (job, folder);
}
-/* we cancel all the commands and their jobs, so associated jobs will be notified */
static void
-cancel_all_jobs (CamelIMAPXServer *is,
- GError *error)
+imapx_abort_all_commands (CamelIMAPXServer *is,
+ const GError *error)
{
CamelIMAPXCommandQueue *queue;
GList *head, *link;
@@ -6819,7 +6818,6 @@ cancel_all_jobs (CamelIMAPXServer *is,
for (link = head; link != NULL; link = g_list_next (link)) {
CamelIMAPXCommand *ic = link->data;
- CamelIMAPXJob *job;
/* Sanity check the CamelIMAPXCommand before proceeding.
* XXX We are actually getting reports of crashes here...
@@ -6827,17 +6825,15 @@ cancel_all_jobs (CamelIMAPXServer *is,
if (ic == NULL)
continue;
- /* Similarly with the CamelIMAPXJob contained within. */
- job = camel_imapx_command_get_job (ic);
- if (!CAMEL_IS_IMAPX_JOB (job))
- continue;
-
- camel_imapx_job_cancel (job);
-
- /* Send a NULL GError since we already cancelled
- * the job and we're not interested in individual
- * command errors. */
- ic->complete (is, ic, camel_imapx_job_get_cancellable (job), NULL);
+ /* Insert an error into the CamelIMAPXCommand to be
+ * propagated when the completion callback function
+ * calls camel_imapx_command_set_error_if_failed(). */
+ camel_imapx_command_failed (ic, error);
+
+ /* Invoke the completion callback function so it can
+ * perform any cleanup processing and unregister its
+ * CamelIMAPXJob. */
+ ic->complete (is, ic, NULL, NULL);
}
camel_imapx_command_queue_free (queue);
@@ -6963,7 +6959,7 @@ imapx_parser_thread (gpointer d)
is->state = IMAPX_SHUTDOWN;
QUEUE_UNLOCK (is);
- cancel_all_jobs (is, local_error);
+ imapx_abort_all_commands (is, local_error);
g_clear_error (&local_error);
diff -up evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt.imapx-summary-vanish evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt
--- evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt.imapx-summary-vanish 2013-08-11 13:26:25.000000000 +0200
+++ evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt 2013-10-09 12:49:22.012984355 +0200
@@ -754,6 +754,7 @@ camel_imapx_command_add_part
camel_imapx_command_close
camel_imapx_command_wait
camel_imapx_command_done
+camel_imapx_command_failed
camel_imapx_command_set_error_if_failed
CamelIMAPXCommandQueue
camel_imapx_command_queue_new

18
evolution-data-server-3.8.5-maildir-tmp-autocreate.patch
View file

@ -1,18 +0,0 @@
diff -up evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c.maildir-tmp-autocreate evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c
--- evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c.maildir-tmp-autocreate 2013-07-23 13:57:51.000000000 +0200
+++ evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c 2013-08-12 10:31:18.600063994 +0200
@@ -506,9 +506,11 @@ scan_fi (CamelStore *store,
cur = g_build_filename (path, dir_name, "cur", NULL);
new = g_build_filename (path, dir_name, "new", NULL);
- if (!(g_stat (tmp, &st) == 0 && S_ISDIR (st.st_mode)
- && g_stat (cur, &st) == 0 && S_ISDIR (st.st_mode)
- && g_stat (new, &st) == 0 && S_ISDIR (st.st_mode)))
+ if (!(g_stat (cur, &st) == 0 && S_ISDIR (st.st_mode)
+ && g_stat (new, &st) == 0 && S_ISDIR (st.st_mode)
+ /* Create 'tmp' dir on demand, if other directories are there,
+ because some backup tools can drop the 'tmp' directory. */
+ && ((g_stat (tmp, &st) == 0 && S_ISDIR (st.st_mode)) || g_mkdir (tmp, 0700) == 0)))
fi->flags |= CAMEL_FOLDER_NOSELECT;
g_free (new);

40
evolution-data-server.spec
View file

@ -1,6 +1,8 @@
%define url_ver %(echo %{version}|cut -d. -f1,2)
%define api 1.2
%define base_version 3.0
%define dir_version 3.12
%define dir_version 3.16
%define oldmajor 6
%define oldlibname %mklibname %{name} %{oldmajor}
@ -8,35 +10,35 @@
%define oldmajor2006 4
%define oldlibname2006 %mklibname %{name} %{oldmajor2006}
%define camelmajor 49
%define camelmajor 52
%define camel_libname %mklibname camel %{camelmajor}
%define camel_devel %mklibname camel -d
%define ebackendmajor 7
%define ebackendmajor 10
%define ebackend_libname %mklibname ebackend %{ebackendmajor}
%define ebackend_devel %mklibname ebackend -d
%define ebookmajor 14
%define ebookmajor 16
%define ebook_libname %mklibname ebook %{ebookmajor}
%define ebook_devel %mklibname ebook -d
%define ebookcontactsmajor 0
%define ebookcontactsmajor 1
%define ebookcontacts_libname %mklibname ebook-contacts %{ebookcontactsmajor}
%define ebookcontacts_devel %mklibname ebook-contacts -d
%define ecalmajor 16
%define ecalmajor 18
%define ecal_libname %mklibname ecal %{ecalmajor}
%define ecal_devel %mklibname ecal -d
%define edatabookmajor 20
%define edatabookmajor 25
%define edatabook_libname %mklibname edata-book %{edatabookmajor}
%define edatabook_devel %mklibname edata-book -d
%define edatacalmajor 23
%define edatacalmajor 27
%define edatacal_libname %mklibname edata-cal %{edatacalmajor}
%define edatacal_devel %mklibname edata-cal -d
%define edataservermajor 18
%define edataservermajor 20
%define edataserver_libname %mklibname edataserver %{edataservermajor}
%define edataserver_devel %mklibname -d edataserver
@ -45,12 +47,12 @@
Name: evolution-data-server
Summary: Evolution Data Server
Version: 3.12.9
Version: 3.16.4
Release: 2
License: LGPLv2+
Group: System/Libraries
URL: http://www.gnome.org/projects/evolution/
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/3.12/%{name}-%{version}.tar.xz
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
Source10: %{name}.rpmlintrc
BuildRequires: bison
@ -67,7 +69,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.0
BuildRequires: pkgconfig(gconf-2.0) >= 2.0.0
BuildRequires: pkgconfig(libxml-2.0) >= 2.0.0
BuildRequires: pkgconfig(libsoup-2.4) >= 2.31.2
BuildRequires: pkgconfig(libgdata) >= 0.7.0
BuildRequires: pkgconfig(libgdata) >= 0.16.1
BuildRequires: pkgconfig(goa-1.0) >= 3.12.0
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gnome-keyring-1) >= 3.12.0
@ -81,6 +83,13 @@ BuildRequires: pkgconfig(gcr-base-3) >= 3.12
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: vala-devel vala-tools
# workaround for libedbus-private library
%ifarch x86_64
Provides: devel(libedbus-private(64bit))
%else
Provides: devel(libedbus-private)
%endif
Obsoletes: %oldlibname
%description
@ -277,6 +286,8 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \;
%{_libexecdir}/evolution-user-prompter
%{_libexecdir}/evolution-scan-gconf-tree-xml
%{_libexecdir}/evolution-source-registry
%{_libexecdir}/evolution-addressbook-factory-subprocess
%{_libexecdir}/evolution-calendar-factory-subprocess
%attr(2755,root,mail) %{_libexecdir}/camel-lock-helper-%{api}
%{_datadir}/%{name}
@ -293,6 +304,7 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.addressbook.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.calendar.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.gschema.xml
%files -n %{camel_libname}
%{_libdir}/libcamel-%{api}.so.%{camelmajor}*
@ -317,6 +329,7 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \;
%files -n %{edataserver_libname}
%{_libdir}/libedataserver-%{api}.so.%{edataservermajor}*
%{_libdir}/libedataserverui-%{api}.so.*
%files -n %{girname}
%{_libdir}/girepository-1.0/EDataServer-%{girmajor}.typelib
@ -369,9 +382,12 @@ find %{buildroot} -name '*.so.*' -exec chmod +x {} \;
%files -n %{edataserver_devel}
%{_includedir}/%{name}/libedataserver/
%{_includedir}/%{name}/libedataserverui/
%{_libdir}/pkgconfig/libedataserver-%{api}.pc
%{_libdir}/pkgconfig/libedataserverui-%{api}.pc
%{_libdir}/pkgconfig/evolution-data-server-%{api}.pc
%{_libdir}/libedataserver-%{api}.so
%{_libdir}/libedataserverui-%{api}.so
%{_datadir}/gir-1.0/EDataServer-%{girmajor}.gir
%{_datadir}/vala/vapi/libedataserver-1.2.deps
%{_datadir}/vala/vapi/libedataserver-1.2.vapi