Browse Source

evolution-data-server package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
master
guibuilder_pel7x64builder0 6 years ago
parent
commit
2fb8bab854
  1. 56
      SOURCES/evolution-data-server-1.11.5-fix-64bit-acinclude.patch
  2. 150
      SOURCES/evolution-data-server-3.22.6-coverity-scan-issues.patch
  3. 12
      SOURCES/evolution-data-server-3.22.6-maybe-uninitialized-variable.patch
  4. 57
      SOURCES/evolution-data-server-3.22.7-caldav-oauth2-refresh-deadlock.patch
  5. 35
      SOURCES/evolution-data-server-3.22.7-correct-libecal-tests.patch
  6. 11
      SOURCES/evolution-data-server-3.22.7-imapx-idle-server-leak.patch
  7. 26
      SOURCES/evolution-data-server-3.22.7-imapx-subscriptions.patch
  8. 31
      SOURCES/evolution-data-server-3.22.7-use-after-free-component-summary-set.patch
  9. 62
      SOURCES/evolution-data-server-3.28.2-cmake-version.patch
  10. 20
      SOURCES/evolution-data-server-3.28.2-sqlite-deterministic.patch
  11. 2049
      SPECS/evolution-data-server.spec

56
SOURCES/evolution-data-server-1.11.5-fix-64bit-acinclude.patch

@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
diff -up evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-data-server-2.27.91/m4/evo_ldap_check.m4
--- evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude 2009-08-24 12:45:52.000000000 +0200
+++ evolution-data-server-2.27.91/m4/evo_ldap_check.m4 2009-08-24 12:48:08.000000000 +0200
@@ -14,6 +14,18 @@ AC_DEFUN([EVO_LDAP_CHECK],[
[AS_HELP_STRING([--with-static-ldap],
[Link LDAP support statically into evolution])])
AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
+
+ AC_MSG_CHECKING(for multilib subdirectory)
+ if test "$GCC" = "yes" ; then
+ multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+ fi
+ multilibsubdir=${multilibsubdir:-.}
+ AC_MSG_RESULT($multilibsubdir)
+ AC_MSG_CHECKING(for lib subdirectory)
+ libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+ libsubdir=${libsubdir:-lib}
+ AC_MSG_RESULT($libsubdir)
+
case $ac_cv_with_openldap in
no|"")
with_openldap=no
@@ -24,7 +36,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
*)
with_openldap=$ac_cv_with_openldap
LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
- LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+ LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
;;
esac
@@ -60,20 +72,20 @@ AC_DEFUN([EVO_LDAP_CHECK],[
AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
AC_CHECK_LIB(lber, ber_get_tag, [
if test "$with_static_ldap" = "yes"; then
- LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+ LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
# libldap might depend on OpenSSL... We need to pull
# in the dependency libs explicitly here since we're
# not using libtool for the configure test.
- if test -f $with_openldap/lib/libldap.la; then
- LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+ if test -f $with_openldap/$libsubdir/libldap.la; then
+ LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
fi
else
LDAP_LIBS="-llber $LDAP_LIBS"
fi
AC_CHECK_LIB(ldap, ldap_open, [
if test $with_static_ldap = "yes"; then
- LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+ LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
else
LDAP_LIBS="-lldap $LDAP_LIBS"
fi],

150
SOURCES/evolution-data-server-3.22.6-coverity-scan-issues.patch

@ -0,0 +1,150 @@ @@ -0,0 +1,150 @@
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 93d5f8a..8cb1cd8 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -3822,7 +3822,11 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl,
}
e_sexp_input_text (sexp, query, strlen (query));
- e_sexp_parse (sexp);
+ if (e_sexp_parse (sexp) == -1) {
+ g_warning ("%s: Error in parsing '%s': %s", G_STRFUNC, query, e_sexp_get_error (sexp));
+ g_object_unref (sexp);
+ return NULL;
+ }
r = e_sexp_eval (sexp);
diff --git a/addressbook/libebook-contacts/e-book-query.c b/addressbook/libebook-contacts/e-book-query.c
index 3604bae..38a3ec3 100644
--- a/addressbook/libebook-contacts/e-book-query.c
+++ b/addressbook/libebook-contacts/e-book-query.c
@@ -777,6 +777,7 @@ e_book_query_from_string (const gchar *query_string)
if (e_sexp_parse (sexp) == -1) {
g_warning ("%s: Error in parsing: %s", G_STRFUNC, e_sexp_get_error (sexp));
+ g_object_unref (sexp);
return NULL;
}
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 2f51d2d..18568c8 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -3318,6 +3318,7 @@ e_book_backend_sqlitedb_check_summary_query_locked (EBookBackendSqliteDB *ebsdb,
if (esexp_error == -1) {
if (invalid_query)
*invalid_query = TRUE;
+ g_object_unref (sexp);
return FALSE;
}
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index 2275548..ba59c9f 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -1273,6 +1273,7 @@ e_book_backend_summary_search (EBookBackendSummary *summary,
esexp_error = e_sexp_parse (sexp);
if (esexp_error == -1) {
+ g_object_unref (sexp);
return NULL;
}
diff --git a/camel/camel-db.c b/camel/camel-db.c
index f21c359..71b06a6 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -2263,7 +2263,7 @@ cdb_delete_ids (CamelDB *cdb,
GError **error)
{
gchar *tmp;
- gint ret = 0;
+ gint ret;
gboolean first = TRUE;
GString *str = g_string_new ("DELETE FROM ");
GList *iterator;
@@ -2294,7 +2294,7 @@ cdb_delete_ids (CamelDB *cdb,
g_string_append (str, ")");
- ret = ret == -1 ? ret : camel_db_add_to_transaction (cdb, str->str, error);
+ ret = camel_db_add_to_transaction (cdb, str->str, error);
if (ret == -1)
camel_db_abort_transaction (cdb, NULL);
diff --git a/libedataserverui/e-webdav-discover-widget.c b/libedataserverui/e-webdav-discover-widget.c
index 984455f..3fe9dc7 100644
--- a/libedataserverui/e-webdav-discover-widget.c
+++ b/libedataserverui/e-webdav-discover-widget.c
@@ -646,7 +646,7 @@ e_webdav_discover_content_trust_prompt_done_cb (GObject *source_object,
e_webdav_discover_content_refresh_done_cb, rd);
} else {
g_cancellable_cancel (rd->cancellable);
- g_cancellable_set_error_if_cancelled (rd->cancellable, &local_error);
+ g_warn_if_fail (g_cancellable_set_error_if_cancelled (rd->cancellable, &local_error));
g_simple_async_result_take_error (rd->simple, local_error);
local_error = NULL;
g_simple_async_result_complete (rd->simple);
diff --git a/tools/addressbook-export/addressbook-export.c b/tools/addressbook-export/addressbook-export.c
index 7c19614..0ce10b0 100644
--- a/tools/addressbook-export/addressbook-export.c
+++ b/tools/addressbook-export/addressbook-export.c
@@ -80,7 +80,7 @@ action_list_folders_init (ActionContext *p_actctx)
EBookClient *book_client;
EBookQuery *query;
ESource *source;
- GSList *contacts;
+ GSList *contacts = NULL;
const gchar *display_name;
const gchar *uid;
gchar *query_str;
@@ -110,8 +110,8 @@ action_list_folders_init (ActionContext *p_actctx)
query_str = e_book_query_to_string (query);
e_book_query_unref (query);
- e_book_client_get_contacts_sync (
- book_client, query_str, &contacts, NULL, NULL);
+ if (!e_book_client_get_contacts_sync (book_client, query_str, &contacts, NULL, NULL))
+ contacts = NULL;
display_name = e_source_get_display_name (source);
uid = e_source_get_uid (source);
@@ -125,9 +125,7 @@ action_list_folders_init (ActionContext *p_actctx)
"\"%s\",\"%s\",%d\n",
uid, display_name, g_slist_length (contacts));
- g_slist_foreach (contacts, (GFunc) g_object_unref, NULL);
- g_slist_free (contacts);
-
+ g_slist_free_full (contacts, g_object_unref);
g_object_unref (book_client);
}
@@ -806,7 +804,7 @@ action_list_cards_init (ActionContext *p_actctx)
EBookClient *book_client;
EBookQuery *query;
ESource *source;
- GSList *contacts;
+ GSList *contacts = NULL;
const gchar *uid;
gchar *query_str;
GError *error = NULL;
@@ -853,13 +851,11 @@ action_list_cards_init (ActionContext *p_actctx)
query_str = e_book_query_to_string (query);
e_book_query_unref (query);
- e_book_client_get_contacts_sync (
- book_client, query_str, &contacts, NULL, &error);
-
- action_list_cards (contacts, p_actctx);
+ if (e_book_client_get_contacts_sync (book_client, query_str, &contacts, NULL, &error)) {
+ action_list_cards (contacts, p_actctx);
+ g_slist_free_full (contacts, g_object_unref);
+ }
- g_slist_foreach (contacts, (GFunc) g_object_unref, NULL);
- g_slist_free (contacts);
g_object_unref (book_client);
if (error != NULL) {

12
SOURCES/evolution-data-server-3.22.6-maybe-uninitialized-variable.patch

@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
diff -up evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c.maybe-uninitialized-variable evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c
--- evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c.maybe-uninitialized-variable 2017-03-14 15:24:48.131584612 +0100
+++ evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c 2017-03-14 15:25:42.541580816 +0100
@@ -409,7 +409,7 @@ pop3_folder_get_message_internal_sync (C
CamelPOP3Command *pcr;
CamelPOP3FolderInfo *fi;
gchar buffer[1];
- gint i, last;
+ gint i = -1, last;
CamelStream *stream = NULL;
CamelService *service;
CamelSettings *settings;

57
SOURCES/evolution-data-server-3.22.7-caldav-oauth2-refresh-deadlock.patch

@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
diff -up evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-oauth2-refresh-deadlock evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c
--- evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-oauth2-refresh-deadlock 2017-03-20 10:07:46.000000000 +0100
+++ evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c 2017-04-10 10:58:07.970110715 +0200
@@ -362,6 +362,7 @@ caldav_ensure_bearer_auth_usage (ECalBac
static gboolean
caldav_setup_bearer_auth (ECalBackendCalDAV *cbdav,
+ gboolean is_in_authenticate,
ESoupAuthBearer *bearer,
GCancellable *cancellable,
GError **error)
@@ -381,7 +382,8 @@ caldav_setup_bearer_auth (ECalBackendCal
if (success) {
e_soup_auth_bearer_set_access_token (bearer, access_token, expires_in_seconds);
- caldav_ensure_bearer_auth_usage (cbdav, bearer);
+ if (!is_in_authenticate)
+ caldav_ensure_bearer_auth_usage (cbdav, bearer);
}
g_free (access_token);
@@ -419,7 +421,7 @@ caldav_maybe_prepare_bearer_auth (ECalBa
g_free (auth_method);
if (cbdav->priv->using_bearer_auth) {
- success = caldav_setup_bearer_auth (cbdav, cbdav->priv->using_bearer_auth, cancellable, error);
+ success = caldav_setup_bearer_auth (cbdav, FALSE, cbdav->priv->using_bearer_auth, cancellable, error);
} else {
ESourceWebdav *extension;
SoupAuth *soup_auth;
@@ -432,7 +434,7 @@ caldav_maybe_prepare_bearer_auth (ECalBa
E_TYPE_SOUP_AUTH_BEARER,
SOUP_AUTH_HOST, soup_uri->host, NULL);
- success = caldav_setup_bearer_auth (cbdav, E_SOUP_AUTH_BEARER (soup_auth), cancellable, error);
+ success = caldav_setup_bearer_auth (cbdav, FALSE, E_SOUP_AUTH_BEARER (soup_auth), cancellable, error);
if (success)
cbdav->priv->using_bearer_auth = g_object_ref (soup_auth);
@@ -1134,7 +1136,7 @@ soup_authenticate_bearer (SoupSession *s
{
GError *local_error = NULL;
- caldav_setup_bearer_auth (cbdav, E_SOUP_AUTH_BEARER (auth), NULL, &local_error);
+ caldav_setup_bearer_auth (cbdav, TRUE, E_SOUP_AUTH_BEARER (auth), NULL, &local_error);
/* Stash the error to be picked up by caldav_credentials_required_sync().
* There's no way to explicitly propagate a GError directly
@@ -1266,7 +1268,7 @@ send_and_handle_redirection (ECalBackend
e_soup_auth_bearer_is_expired (cbdav->priv->using_bearer_auth)) {
GError *local_error = NULL;
- if (!caldav_setup_bearer_auth (cbdav, cbdav->priv->using_bearer_auth, cancellable, &local_error)) {
+ if (!caldav_setup_bearer_auth (cbdav, FALSE, cbdav->priv->using_bearer_auth, cancellable, &local_error)) {
if (local_error) {
soup_message_set_status_full (msg, SOUP_STATUS_BAD_REQUEST, local_error->message);
g_propagate_error (error, local_error);

35
SOURCES/evolution-data-server-3.22.7-correct-libecal-tests.patch

@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
From 3f638b527fc46625d9dc791a07eea573c66f5d3c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 10 Apr 2017 21:02:53 +0200
Subject: Correct two libecal/client tests

The main loop should be passed always as a user_data, because
the function called from the callback expects it and there is
no guarantee in which order the callbacks will be called.

diff --git a/tests/libecal/client/test-cal-client-get-view.c b/tests/libecal/client/test-cal-client-get-view.c
index 47514cc..2280646 100644
--- a/tests/libecal/client/test-cal-client-get-view.c
+++ b/tests/libecal/client/test-cal-client-get-view.c
@@ -206,7 +206,7 @@ test_get_view_sync (ETestServerFixture *fixture,
g_signal_connect (view, "objects_added", G_CALLBACK (objects_added_cb), fixture->loop);
g_signal_connect (view, "objects_modified", G_CALLBACK (objects_modified_cb), fixture->loop);
g_signal_connect (view, "objects_removed", G_CALLBACK (objects_removed_cb), fixture->loop);
- g_signal_connect (view, "complete", G_CALLBACK (complete_cb), NULL);
+ g_signal_connect (view, "complete", G_CALLBACK (complete_cb), fixture->loop);
e_cal_client_view_set_fields_of_interest (view, NULL, &error);
if (error)
diff --git a/tests/libecal/client/test-cal-client-revision-view.c b/tests/libecal/client/test-cal-client-revision-view.c
index 0e25114..fdb386c 100644
--- a/tests/libecal/client/test-cal-client-revision-view.c
+++ b/tests/libecal/client/test-cal-client-revision-view.c
@@ -250,7 +250,7 @@ test_get_revision_view_sync (ETestServerFixture *fixture,
g_signal_connect (view, "objects_added", G_CALLBACK (objects_added_cb), fixture->loop);
g_signal_connect (view, "objects_modified", G_CALLBACK (objects_modified_cb), fixture->loop);
g_signal_connect (view, "objects_removed", G_CALLBACK (objects_removed_cb), fixture->loop);
- g_signal_connect (view, "complete", G_CALLBACK (complete_cb), NULL);
+ g_signal_connect (view, "complete", G_CALLBACK (complete_cb), fixture->loop);
field_list = g_slist_prepend (NULL, (gpointer) "UID");
field_list = g_slist_prepend (field_list, (gpointer) "RECURRENCE-ID");

11
SOURCES/evolution-data-server-3.22.7-imapx-idle-server-leak.patch

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
diff -up evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c.imapx-idle-server-leak evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c
--- evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c.imapx-idle-server-leak 2017-03-20 10:07:46.000000000 +0100
+++ evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c 2017-06-05 16:08:13.983713415 +0200
@@ -6318,6 +6318,7 @@ imapx_server_run_idle_thread_cb (gpointe
}
g_mutex_unlock (&is->priv->idle_lock);
+ g_object_unref (is);
return FALSE;
}

26
SOURCES/evolution-data-server-3.22.7-imapx-subscriptions.patch

@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
diff -up evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c.imapx-subscriptions evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c
--- evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c.imapx-subscriptions 2017-04-12 15:10:11.507183207 +0200
+++ evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c 2017-04-12 15:12:39.367181163 +0200
@@ -1449,14 +1449,21 @@ imapx_store_remove_unknown_mailboxes_cb
g_return_val_if_fail (CAMEL_IS_IMAPX_STORE (imapx_store), FALSE);
if (camel_imapx_mailbox_get_state (mailbox) == CAMEL_IMAPX_MAILBOX_STATE_CREATED) {
+ CamelSettings *settings;
CamelFolderInfo *fi;
gchar *folder_path;
+ gboolean use_subscriptions;
+
+ settings = camel_service_ref_settings (CAMEL_SERVICE (imapx_store));
+ use_subscriptions = camel_imapx_settings_get_use_subscriptions (CAMEL_IMAPX_SETTINGS (settings));
+ g_object_unref (settings);
folder_path = camel_imapx_mailbox_dup_folder_path (mailbox);
fi = imapx_store_build_folder_info (imapx_store, folder_path,
(CamelFolderInfoFlags) imapx_store_mailbox_attributes_to_flags (mailbox));
camel_store_folder_created (CAMEL_STORE (imapx_store), fi);
- camel_subscribable_folder_subscribed (CAMEL_SUBSCRIBABLE (imapx_store), fi);
+ if ((fi->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) != 0 || !use_subscriptions)
+ camel_subscribable_folder_subscribed (CAMEL_SUBSCRIBABLE (imapx_store), fi);
camel_folder_info_free (fi);
g_free (folder_path);
}

31
SOURCES/evolution-data-server-3.22.7-use-after-free-component-summary-set.patch

@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
diff -up evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c.use-after-free-component-summary-set evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c
--- evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c.use-after-free-component-summary-set 2017-03-20 10:07:46.000000000 +0100
+++ evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c 2017-04-12 12:37:17.319310071 +0200
@@ -4468,7 +4468,7 @@ e_cal_component_get_summary (ECalCompone
}
typedef struct {
- const gchar *old_summary;
+ gchar *old_summary;
const gchar *new_summary;
} SetAlarmDescriptionData;
@@ -4559,7 +4559,8 @@ e_cal_component_set_summary (ECalCompone
g_return_if_fail (summary->value != NULL);
if (priv->summary.prop) {
- sadd.old_summary = icalproperty_get_summary (priv->summary.prop);
+ /* Make a copy, to avoid use-after-free */
+ sadd.old_summary = g_strdup (icalproperty_get_summary (priv->summary.prop));
icalproperty_set_summary (priv->summary.prop, (gchar *) summary->value);
} else {
sadd.old_summary = NULL;
@@ -4589,6 +4590,8 @@ e_cal_component_set_summary (ECalCompone
/* look for alarms that need a description */
sadd.new_summary = summary->value;
g_hash_table_foreach (priv->alarm_uid_hash, set_alarm_description_cb, &sadd);
+
+ g_free (sadd.old_summary);
}
/**

62
SOURCES/evolution-data-server-3.28.2-cmake-version.patch

@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
diff -up evolution-data-server-3.28.2/CMakeLists.txt.cmake-version evolution-data-server-3.28.2/CMakeLists.txt
--- evolution-data-server-3.28.2/CMakeLists.txt.cmake-version 2018-05-07 04:03:27.000000000 -0400
+++ evolution-data-server-3.28.2/CMakeLists.txt 2018-06-01 02:47:48.476438577 -0400
@@ -1,12 +1,16 @@
# Evolution-Data-Server build script
-cmake_minimum_required(VERSION 3.1)
-cmake_policy(VERSION 3.1)
+cmake_minimum_required(VERSION 2.8)
+cmake_policy(VERSION 2.8)
-project(evolution-data-server
- VERSION 3.28.5
- LANGUAGES C CXX)
-set(CMAKE_CXX_STANDARD 14)
+project(evolution-data-server C CXX)
+set(PROJECT_VERSION_MAJOR 3)
+set(PROJECT_VERSION_MINOR 28)
+set(PROJECT_VERSION_PATCH 5)
+set(PROJECT_VERSION_TWEAK 0)
+set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+
+#set(CMAKE_CXX_STANDARD 14)
set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/")
# Base Version: This is for API/version tracking for things like
diff -up evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake.cmake-version evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake
--- evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake.cmake-version 2018-06-01 02:55:49.695451836 -0400
+++ evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake 2018-06-01 02:56:39.955247217 -0400
@@ -92,7 +92,7 @@ macro(intltool_add_pot_file_target)
endif(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${GETTEXT_PACKAGE}.pot
- COMMAND ${CMAKE_COMMAND} -E env INTLTOOL_EXTRACT="${INTLTOOL_EXTRACT}" XGETTEXT="${XGETTEXT}" srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
+ COMMAND env INTLTOOL_EXTRACT="${INTLTOOL_EXTRACT}" XGETTEXT="${XGETTEXT}" srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
)
add_custom_target(pot-file
diff -up evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake.cmake-version evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake
--- evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake.cmake-version 2018-05-07 04:03:27.000000000 -0400
+++ evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake 2018-06-01 02:58:26.538809013 -0400
@@ -116,7 +116,7 @@ macro(gir_add_introspection gir)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
add_custom_command(
- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
+ COMMAND env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
${INTROSPECTION_SCANNER_ENV}
${G_IR_SCANNER}
${INTROSPECTION_SCANNER_ARGS}
diff -up evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake.cmake-version evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake
--- evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake.cmake-version 2018-06-01 02:55:38.599497013 -0400
+++ evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake 2018-06-01 02:56:22.587317927 -0400
@@ -60,7 +60,7 @@ macro(add_gtkdoc _module _namespace _dep
set(_mkhtml_prefix "")
if(APPLE)
- set(_mkhtml_prefix "${CMAKE_COMMAND} -E env XML_CATALOG_FILES=\"/usr/local/etc/xml/catalog\"")
+ set(_mkhtml_prefix "env XML_CATALOG_FILES=\"/usr/local/etc/xml/catalog\"")
endif(APPLE)
add_custom_command(OUTPUT html/index.html

20
SOURCES/evolution-data-server-3.28.2-sqlite-deterministic.patch

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
diff -up evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c.sqlite-deterministic evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c
--- evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c.sqlite-deterministic 2018-06-18 10:48:43.000000000 +0200
+++ evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c 2018-06-18 12:24:16.018228889 +0200
@@ -1730,14 +1730,14 @@ ecc_init_sqlite_functions (ECalCache *ca
/* check_sexp(sexp_id, icalstring) */
ret = sqlite3_create_function (sqlitedb,
- "check_sexp", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
+ "check_sexp", 2, SQLITE_UTF8 /*| SQLITE_DETERMINISTIC*/,
cal_cache, ecc_check_sexp_func,
NULL, NULL);
if (ret == SQLITE_OK) {
/* negate(x) */
ret = sqlite3_create_function (sqlitedb,
- "negate", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
+ "negate", 1, SQLITE_UTF8 /*| SQLITE_DETERMINISTIC*/,
NULL, ecc_negate_func,
NULL, NULL);
}

2049
SPECS/evolution-data-server.spec

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save