git: b806801c9862 - main - databases/evolution-data-server: update to 3.52.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Feb 2025 23:27:53 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b806801c986260d1ce994fca5ed8944b572d08dc
commit b806801c986260d1ce994fca5ed8944b572d08dc
Author: Igor Malyshev <bsd@itglob.ru>
AuthorDate: 2025-02-18 14:56:06 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-02-20 23:27:22 +0000
databases/evolution-data-server: update to 3.52.3
This update unbreaks viewing emails.
PR: 284752
Reported by: fuz
Approved by: gnome (fluffy)
---
databases/evolution-data-server/Makefile | 15 ++--
databases/evolution-data-server/distinfo | 6 +-
.../files/patch-CMakeLists.txt | 17 +---
databases/evolution-data-server/files/patch-icu61 | 31 --------
.../files/patch-sqlite-qds_camel-db.c | 13 ++++
.../files/patch-sqlite-qds_e-book-sqlite.c | 13 ++++
.../files/patch-sqlite-qds_e-cache.c | 13 ++++
.../files/patch-src_camel_camel-db.c | 36 ---------
databases/evolution-data-server/pkg-plist | 90 +++++++++++++++-------
9 files changed, 115 insertions(+), 119 deletions(-)
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index afd0c31274f5..a7a6319dd201 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,6 +1,5 @@
PORTNAME= evolution-data-server
-DISTVERSION= 3.44.4
-PORTREVISION= 10
+DISTVERSION= 3.52.3
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -21,7 +20,8 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libical.so:devel/libical \
libnss3.so:security/nss \
libicudata.so:devel/icu \
- libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
+ libwebkit2gtk-4.1.so:www/webkit2-gtk@41\
+ libwebkitgtk-6.0.so:www/webkit2-gtk@60 \
libjson-glib-1.0.so:devel/json-glib \
libp11-kit.so:security/p11-kit \
libnspr4.so:devel/nspr \
@@ -31,10 +31,10 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
PORTSCOUT= limitw:1,even
-USES= bdb:5 cmake compiler:c++17-lang cpe gettext gnome gperf \
+USES= bdb:5 cmake cpe gettext gnome gperf \
iconv:wchar_t localbase pathfix pkgconfig python:build \
sqlite tar:xz xorg
-USE_CXXSTD= gnu++11
+USE_CXXSTD= gnu++17
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
USE_XORG= x11
USE_LDCONFIG= yes
@@ -46,6 +46,7 @@ CMAKE_ARGS= -DENABLE_INTROSPECTION=ON \
-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5"
+
GLIB_SCHEMAS= org.gnome.evolution-data-server.addressbook.gschema.xml \
org.gnome.evolution-data-server.calendar.gschema.xml \
org.gnome.evolution-data-server.gschema.xml \
@@ -53,7 +54,7 @@ GLIB_SCHEMAS= org.gnome.evolution-data-server.addressbook.gschema.xml \
org.gnome.evolution.eds-shell.gschema.xml \
org.gnome.evolution.shell.network-config.gschema.xml
-PLIST_SUB= EVO_VERSION="1.2"
+PLIST_SUB= EVO_VERSION="1.2" CAL_API_VERSION="2.0"
OPTIONS_SUB= yes
OPTIONS_DEFINE= WEATHER KERBEROS LDAP VAPI
@@ -71,7 +72,7 @@ VAPI_USES= vala:build
VAPI_CMAKE_BOOL= ENABLE_VALA_BINDINGS
WEATHER_DESC= Weather calendar backend
-WEATHER_LIB_DEPENDS= libgweather-3.so:net/libgweather
+WEATHER_LIB_DEPENDS= libgweather-4.so:net/libgweather4
WEATHER_CMAKE_BOOL= ENABLE_WEATHER
.include <bsd.port.options.mk>
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index c2ea3323367a..1bb023da538c 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660527672
-SHA256 (gnome/evolution-data-server-3.44.4.tar.xz) = c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
-SIZE (gnome/evolution-data-server-3.44.4.tar.xz) = 4784388
+TIMESTAMP = 1739808035
+SHA256 (gnome/evolution-data-server-3.52.3.tar.xz) = e9f6c80c142033b1801bccaa6221c453de34ead4ea089b2086b19086f9a9c2e4
+SIZE (gnome/evolution-data-server-3.52.3.tar.xz) = 5055360
diff --git a/databases/evolution-data-server/files/patch-CMakeLists.txt b/databases/evolution-data-server/files/patch-CMakeLists.txt
index 54edf6edce36..79fcbf3fa017 100644
--- a/databases/evolution-data-server/files/patch-CMakeLists.txt
+++ b/databases/evolution-data-server/files/patch-CMakeLists.txt
@@ -1,15 +1,6 @@
---- CMakeLists.txt.orig 2022-08-05 07:45:35 UTC
-+++ CMakeLists.txt
-@@ -6,7 +6,7 @@ project(evolution-data-server
- project(evolution-data-server
- VERSION 3.44.4
- LANGUAGES C CXX)
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/")
-
- # Base Version: This is for API/version tracking for things like
-@@ -358,7 +358,7 @@ endif(WIN32)
+--- CMakeLists.txt.orig 2024-06-28 10:29:41.000000000 +0300
++++ CMakeLists.txt 2025-02-17 19:34:42.145248000 +0300
+@@ -374,7 +374,7 @@
# ICU started shipping pkg-config files but it's not present
# on many systems, if we don't find the pkg-config
# file then let's fallback on a manual check
@@ -18,7 +9,7 @@
if(NOT ICU_FOUND)
CHECK_INCLUDE_FILE(unicode/ucol.h HAVE_UNICODE_UCOL_H)
-@@ -526,6 +526,7 @@ set(CMAKE_REQUIRED_LIBRARIES "-liconv")
+@@ -549,6 +549,7 @@
# ******************************
set(CMAKE_REQUIRED_LIBRARIES "-liconv")
diff --git a/databases/evolution-data-server/files/patch-icu61 b/databases/evolution-data-server/files/patch-icu61
deleted file mode 100644
index e201fce291e3..000000000000
--- a/databases/evolution-data-server/files/patch-icu61
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/libedataserver/e-alphabet-index-private.cpp.orig 2021-10-29 07:18:27 UTC
-+++ src/libedataserver/e-alphabet-index-private.cpp
-@@ -77,7 +77,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex *alph
- const gchar *word)
- {
- UErrorCode status = U_ZERO_ERROR;
-- UnicodeString string;
-+ icu::UnicodeString string;
- gint index;
-
- g_return_val_if_fail (alphabet_index != NULL, -1);
-@@ -130,7 +130,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex *alp
-
- for (i = 0; alphabet_index->priv->nextBucket (status); i++) {
- UAlphabeticIndexLabelType label_type;
-- UnicodeString ustring;
-+ icu::UnicodeString ustring;
- std::string string;
-
- label_type = alphabet_index->priv->getBucketLabelType ();
---- src/libedataserver/e-transliterator-private.cpp.orig 2021-10-29 07:18:27 UTC
-+++ src/libedataserver/e-transliterator-private.cpp
-@@ -75,7 +75,7 @@ gchar *
- _e_transliterator_cxx_transliterate (ETransliterator *transliterator,
- const gchar *str)
- {
-- UnicodeString transform;
-+ icu::UnicodeString transform;
- std::string sourceUTF8;
- std::string targetUTF8;
-
diff --git a/databases/evolution-data-server/files/patch-sqlite-qds_camel-db.c b/databases/evolution-data-server/files/patch-sqlite-qds_camel-db.c
new file mode 100644
index 000000000000..096079056875
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-sqlite-qds_camel-db.c
@@ -0,0 +1,13 @@
+--- src/camel/camel-db.c.orig 2024-06-28 10:29:41.000000000 +0300
++++ src/camel/camel-db.c 2025-02-17 23:40:46.536455000 +0300
+@@ -842,6 +842,10 @@
+ cdb->priv->filename = g_strdup (filename);
+ d (g_print ("\nDatabase successfully opened \n"));
+
++ /*Enable Double-Quoted*/
++ sqlite3_db_config(db, SQLITE_DBCONFIG_DQS_DDL, 1, (void*)0);
++ sqlite3_db_config(db, SQLITE_DBCONFIG_DQS_DML, 1, (void*)0);
++
+ sqlite3_create_function (db, "MATCH", 2, SQLITE_UTF8, NULL, cdb_match_func, NULL, NULL);
+ sqlite3_create_function (db, "CAMELCOMPAREDATE", 2, SQLITE_UTF8, NULL, cdb_camel_compare_date_func, NULL, NULL);
+
diff --git a/databases/evolution-data-server/files/patch-sqlite-qds_e-book-sqlite.c b/databases/evolution-data-server/files/patch-sqlite-qds_e-book-sqlite.c
new file mode 100644
index 000000000000..e1cbb2b4d7d5
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-sqlite-qds_e-book-sqlite.c
@@ -0,0 +1,13 @@
+--- src/addressbook/libedata-book/e-book-sqlite.c.org 2024-06-28 10:29:41.000000000 +0300
++++ src/addressbook/libedata-book/e-book-sqlite.c 2025-02-17 23:44:47.262878000 +0300
+@@ -1888,6 +1888,10 @@
+ ebsql_check_cancel,
+ ebsql);
+
++ /*Enable Double-Quoted*/
++ sqlite3_db_config(ebsql->priv->db, SQLITE_DBCONFIG_DQS_DDL, 1, (void*)0);
++ sqlite3_db_config(ebsql->priv->db, SQLITE_DBCONFIG_DQS_DML, 1, (void*)0);
++
+ /* Install our custom functions */
+ for (i = 0; ret == SQLITE_OK && i < G_N_ELEMENTS (ebsql_custom_functions); i++)
+ ret = sqlite3_create_function (
diff --git a/databases/evolution-data-server/files/patch-sqlite-qds_e-cache.c b/databases/evolution-data-server/files/patch-sqlite-qds_e-cache.c
new file mode 100644
index 000000000000..6d1773ad94a8
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-sqlite-qds_e-cache.c
@@ -0,0 +1,13 @@
+--- src/libebackend/e-cache.c.orig 2024-06-28 10:29:41.000000000 +0300
++++ src/libebackend/e-cache.c 2025-02-17 23:37:07.031025000 +0300
+@@ -761,6 +761,10 @@
+ return FALSE;
+ }
+
++ /*Enable Double-Quoted*/
++ sqlite3_db_config(cache->priv->db, SQLITE_DBCONFIG_DQS_DDL, 1, (void*)0);
++ sqlite3_db_config(cache->priv->db, SQLITE_DBCONFIG_DQS_DML, 1, (void*)0);
++
+ /* Handle GCancellable */
+ sqlite3_progress_handler (
+ cache->priv->db,
diff --git a/databases/evolution-data-server/files/patch-src_camel_camel-db.c b/databases/evolution-data-server/files/patch-src_camel_camel-db.c
deleted file mode 100644
index 2ff44c2cb5e8..000000000000
--- a/databases/evolution-data-server/files/patch-src_camel_camel-db.c
+++ /dev/null
@@ -1,36 +0,0 @@
-Allow evolution to be used when databases/sqlite3 has been compiled
-with option DQS disabled.
-
---- src/camel/camel-db.c.orig 2024-04-08 09:37:09 UTC
-+++ src/camel/camel-db.c
-@@ -1823,8 +1823,8 @@ camel_db_migrate_folder_prepare (CamelDB *cdb,
- "mail_to , mail_cc , mlist , followup_flag , "
- "followup_completed_on , followup_due_by , "
- "part , labels , usertags , cinfo , bdata , '', '', "
-- "strftime(\"%%s\", 'now'), "
-- "strftime(\"%%s\", 'now') FROM %Q",
-+ "strftime('%%s', 'now'), "
-+ "strftime('%%s', 'now') FROM %Q",
- folder_name, folder_name);
- ret = camel_db_add_to_transaction (cdb, table_creation_query, error);
- sqlite3_free (table_creation_query);
-@@ -2093,8 +2093,8 @@ camel_db_write_message_info_record (CamelDB *cdb,
- "%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, "
- "%lld, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, "
- "%Q, %Q, %Q, %Q, %Q, %Q, %Q, "
-- "strftime(\"%%s\", 'now'), "
-- "strftime(\"%%s\", 'now') )",
-+ "strftime('%%s', 'now'), "
-+ "strftime('%%s', 'now') )",
- folder_name,
- record->uid,
- record->flags,
-@@ -2578,7 +2578,7 @@ camel_db_rename_folder (CamelDB *cdb,
- ret = camel_db_add_to_transaction (cdb, cmd, error);
- sqlite3_free (cmd);
-
-- cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime(\"%%s\", 'now'), created=strftime(\"%%s\", 'now')", new_folder_name);
-+ cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime('%%s', 'now'), created=strftime('%%s', 'now')", new_folder_name);
- ret = camel_db_add_to_transaction (cdb, cmd, error);
- sqlite3_free (cmd);
-
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 030417dc1716..b138e9e44b44 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -49,6 +49,7 @@ include/evolution-data-server/camel/camel-mime-filter-html.h
include/evolution-data-server/camel/camel-mime-filter-index.h
include/evolution-data-server/camel/camel-mime-filter-linewrap.h
include/evolution-data-server/camel/camel-mime-filter-pgp.h
+include/evolution-data-server/camel/camel-mime-filter-preview.h
include/evolution-data-server/camel/camel-mime-filter-progress.h
include/evolution-data-server/camel/camel-mime-filter-tohtml.h
include/evolution-data-server/camel/camel-mime-filter-windows.h
@@ -132,6 +133,7 @@ include/evolution-data-server/libebackend/e-backend-enums.h
include/evolution-data-server/libebackend/e-backend-enumtypes.h
include/evolution-data-server/libebackend/e-backend-factory.h
include/evolution-data-server/libebackend/e-backend.h
+include/evolution-data-server/libebackend/e-cache-keys.h
include/evolution-data-server/libebackend/e-cache-reaper.h
include/evolution-data-server/libebackend/e-cache.h
include/evolution-data-server/libebackend/e-collection-backend-factory.h
@@ -154,9 +156,11 @@ include/evolution-data-server/libebackend/e-user-prompter.h
include/evolution-data-server/libebackend/e-webdav-collection-backend.h
include/evolution-data-server/libebackend/libebackend.h
include/evolution-data-server/libebook-contacts/e-address-western.h
+include/evolution-data-server/libebook-contacts/e-book-contacts-autocleanups.h
include/evolution-data-server/libebook-contacts/e-book-contacts-enums.h
include/evolution-data-server/libebook-contacts/e-book-contacts-enumtypes.h
include/evolution-data-server/libebook-contacts/e-book-contacts-utils.h
+include/evolution-data-server/libebook-contacts/e-book-indices-updater.h
include/evolution-data-server/libebook-contacts/e-book-query.h
include/evolution-data-server/libebook-contacts/e-contact.h
include/evolution-data-server/libebook-contacts/e-name-western.h
@@ -164,6 +168,7 @@ include/evolution-data-server/libebook-contacts/e-phone-number.h
include/evolution-data-server/libebook-contacts/e-source-backend-summary-setup.h
include/evolution-data-server/libebook-contacts/e-vcard.h
include/evolution-data-server/libebook-contacts/libebook-contacts.h
+include/evolution-data-server/libebook/e-book-autocleanups.h
include/evolution-data-server/libebook/e-book-client-cursor.h
include/evolution-data-server/libebook/e-book-client-view.h
include/evolution-data-server/libebook/e-book-client.h
@@ -217,6 +222,9 @@ include/evolution-data-server/libedata-book/e-data-book-cursor-sqlite.h
include/evolution-data-server/libedata-book/e-data-book-cursor.h
include/evolution-data-server/libedata-book/e-data-book-direct.h
include/evolution-data-server/libedata-book/e-data-book-factory.h
+include/evolution-data-server/libedata-book/e-data-book-view-watcher-cache.h
+include/evolution-data-server/libedata-book/e-data-book-view-watcher-memory.h
+include/evolution-data-server/libedata-book/e-data-book-view-watcher-sqlite.h
include/evolution-data-server/libedata-book/e-data-book-view.h
include/evolution-data-server/libedata-book/e-data-book.h
include/evolution-data-server/libedata-book/e-subprocess-book-factory.h
@@ -247,12 +255,15 @@ include/evolution-data-server/libedataserver/e-extensible.h
include/evolution-data-server/libedataserver/e-extension.h
include/evolution-data-server/libedataserver/e-flag.h
include/evolution-data-server/libedataserver/e-free-form-exp.h
-include/evolution-data-server/libedataserver/e-gdata-oauth2-authorizer.h
+include/evolution-data-server/libedataserver/e-gdata-query.h
+include/evolution-data-server/libedataserver/e-gdata-session.h
include/evolution-data-server/libedataserver/e-iterator.h
+include/evolution-data-server/libedataserver/e-json-utils.h
include/evolution-data-server/libedataserver/e-list-iterator.h
include/evolution-data-server/libedataserver/e-list.h
include/evolution-data-server/libedataserver/e-memory.h
include/evolution-data-server/libedataserver/e-module.h
+include/evolution-data-server/libedataserver/e-named-parameters.h
include/evolution-data-server/libedataserver/e-network-monitor.h
include/evolution-data-server/libedataserver/e-oauth2-service-base.h
include/evolution-data-server/libedataserver/e-oauth2-service-google.h
@@ -261,11 +272,9 @@ include/evolution-data-server/libedataserver/e-oauth2-service-yahoo.h
include/evolution-data-server/libedataserver/e-oauth2-service.h
include/evolution-data-server/libedataserver/e-oauth2-services.h
include/evolution-data-server/libedataserver/e-operation-pool.h
-include/evolution-data-server/libedataserver/e-proxy.h
include/evolution-data-server/libedataserver/e-secret-store.h
include/evolution-data-server/libedataserver/e-sexp.h
include/evolution-data-server/libedataserver/e-soup-auth-bearer.h
-include/evolution-data-server/libedataserver/e-soup-logger.h
include/evolution-data-server/libedataserver/e-soup-session.h
include/evolution-data-server/libedataserver/e-soup-ssl-trust.h
include/evolution-data-server/libedataserver/e-source-address-book.h
@@ -325,6 +334,7 @@ include/evolution-data-server/libedataserver/eds-version.h
include/evolution-data-server/libedataserver/libedataserver.h
include/evolution-data-server/libedataserverui/e-buffer-tagger.h
include/evolution-data-server/libedataserverui/e-cell-renderer-color.h
+include/evolution-data-server/libedataserverui/e-certificate-widget.h
include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-oauth2.h
include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-password.h
include/evolution-data-server/libedataserverui/e-credentials-prompter-impl.h
@@ -333,6 +343,17 @@ include/evolution-data-server/libedataserverui/e-reminders-widget.h
include/evolution-data-server/libedataserverui/e-trust-prompt.h
include/evolution-data-server/libedataserverui/e-webdav-discover-widget.h
include/evolution-data-server/libedataserverui/libedataserverui.h
+include/evolution-data-server/libedataserverui4/e-buffer-tagger.h
+include/evolution-data-server/libedataserverui4/e-cell-renderer-color.h
+include/evolution-data-server/libedataserverui4/e-certificate-widget.h
+include/evolution-data-server/libedataserverui4/e-credentials-prompter-impl-oauth2.h
+include/evolution-data-server/libedataserverui4/e-credentials-prompter-impl-password.h
+include/evolution-data-server/libedataserverui4/e-credentials-prompter-impl.h
+include/evolution-data-server/libedataserverui4/e-credentials-prompter.h
+include/evolution-data-server/libedataserverui4/e-reminders-widget.h
+include/evolution-data-server/libedataserverui4/e-trust-prompt.h
+include/evolution-data-server/libedataserverui4/e-webdav-discover-widget.h
+include/evolution-data-server/libedataserverui4/libedataserverui4.h
lib/evolution-data-server/addressbook-backends/libebookbackendcarddav.so
lib/evolution-data-server/addressbook-backends/libebookbackendfile.so
%%LDAP%%lib/evolution-data-server/addressbook-backends/libebookbackendldap.so
@@ -370,48 +391,53 @@ lib/girepository-1.0/Camel-%%EVO_VERSION%%.typelib
lib/girepository-1.0/EBackend-%%EVO_VERSION%%.typelib
lib/girepository-1.0/EBook-%%EVO_VERSION%%.typelib
lib/girepository-1.0/EBookContacts-%%EVO_VERSION%%.typelib
-lib/girepository-1.0/ECal-2.0.typelib
+lib/girepository-1.0/ECal-%%CAL_API_VERSION%%.typelib
lib/girepository-1.0/EDataBook-%%EVO_VERSION%%.typelib
-lib/girepository-1.0/EDataCal-2.0.typelib
+lib/girepository-1.0/EDataCal-%%CAL_API_VERSION%%.typelib
lib/girepository-1.0/EDataServer-%%EVO_VERSION%%.typelib
lib/girepository-1.0/EDataServerUI-%%EVO_VERSION%%.typelib
+lib/girepository-1.0/EDataServerUI4-1.0.typelib
lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.63
-lib/libcamel-%%EVO_VERSION%%.so.6%%GTK3_VERSION%%
+lib/libcamel-%%EVO_VERSION%%.so.64
+lib/libcamel-%%EVO_VERSION%%.so.64.0.0
lib/libebackend-%%EVO_VERSION%%.so
-lib/libebackend-%%EVO_VERSION%%.so.10
-lib/libebackend-%%EVO_VERSION%%.so.10.0.0
+lib/libebackend-%%EVO_VERSION%%.so.11
+lib/libebackend-%%EVO_VERSION%%.so.11.0.0
lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.20
-lib/libebook-%%EVO_VERSION%%.so.20.1.3
+lib/libebook-%%EVO_VERSION%%.so.21
+lib/libebook-%%EVO_VERSION%%.so.21.1.3
lib/libebook-contacts-%%EVO_VERSION%%.so
-lib/libebook-contacts-%%EVO_VERSION%%.so.3
-lib/libebook-contacts-%%EVO_VERSION%%.so.%%GTK3_VERSION%%
-lib/libecal-2.0.so
-lib/libecal-2.0.so.1
-lib/libecal-2.0.so.1.0.0
+lib/libebook-contacts-%%EVO_VERSION%%.so.4
+lib/libebook-contacts-%%EVO_VERSION%%.so.4.0.0
+lib/libecal-%%CAL_API_VERSION%%.so
+lib/libecal-%%CAL_API_VERSION%%.so.3
+lib/libecal-%%CAL_API_VERSION%%.so.3.0.0
lib/libedata-book-%%EVO_VERSION%%.so
-lib/libedata-book-%%EVO_VERSION%%.so.26
-lib/libedata-book-%%EVO_VERSION%%.so.26.0.0
-lib/libedata-cal-2.0.so
-lib/libedata-cal-2.0.so.1
-lib/libedata-cal-2.0.so.1.0.0
+lib/libedata-book-%%EVO_VERSION%%.so.27
+lib/libedata-book-%%EVO_VERSION%%.so.27.0.0
+lib/libedata-cal-%%CAL_API_VERSION%%.so
+lib/libedata-cal-%%CAL_API_VERSION%%.so.2
+lib/libedata-cal-%%CAL_API_VERSION%%.so.2.0.0
lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.26
-lib/libedataserver-%%EVO_VERSION%%.so.26.0.0
+lib/libedataserver-%%EVO_VERSION%%.so.27
+lib/libedataserver-%%EVO_VERSION%%.so.27.0.0
lib/libedataserverui-%%EVO_VERSION%%.so
-lib/libedataserverui-%%EVO_VERSION%%.so.3
-lib/libedataserverui-%%EVO_VERSION%%.so.%%GTK3_VERSION%%
+lib/libedataserverui-%%EVO_VERSION%%.so.4
+lib/libedataserverui-%%EVO_VERSION%%.so.4.0.0
+lib/libedataserverui4-1.0.so
+lib/libedataserverui4-1.0.so.0
+lib/libedataserverui4-1.0.so.0.0.0
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc
libdata/pkgconfig/libebook-%%EVO_VERSION%%.pc
libdata/pkgconfig/libebook-contacts-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libecal-2.0.pc
+libdata/pkgconfig/libecal-%%CAL_API_VERSION%%.pc
libdata/pkgconfig/libedata-book-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libedata-cal-2.0.pc
+libdata/pkgconfig/libedata-cal-%%CAL_API_VERSION%%.pc
libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
+libdata/pkgconfig/libedataserverui4-1.0.pc
libexec/camel-gpg-photo-saver
libexec/camel-index-control-%%EVO_VERSION%%
@(,mail,2755) libexec/camel-lock-helper-%%EVO_VERSION%%
@@ -422,12 +448,14 @@ libexec/evolution-calendar-factory-subprocess
libexec/evolution-data-server/addressbook-export
libexec/evolution-data-server/csv2vcard
libexec/evolution-data-server/evolution-alarm-notify
+libexec/evolution-data-server/evolution-oauth2-handler
libexec/evolution-data-server/list-sources
libexec/evolution-scan-gconf-tree-xml
libexec/evolution-source-registry
libexec/evolution-user-prompter
share/GConf/gsettings/evolution-data-server.convert
share/applications/org.gnome.Evolution-alarm-notify.desktop
+share/applications/org.gnome.evolution-data-server.OAuth2-handler.desktop
share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook10.service
share/dbus-1/services/org.gnome.evolution.dataserver.Calendar8.service
share/dbus-1/services/org.gnome.evolution.dataserver.Sources5.service
@@ -461,11 +489,13 @@ share/gir-1.0/Camel-%%EVO_VERSION%%.gir
share/gir-1.0/EBackend-%%EVO_VERSION%%.gir
share/gir-1.0/EBook-%%EVO_VERSION%%.gir
share/gir-1.0/EBookContacts-%%EVO_VERSION%%.gir
-share/gir-1.0/ECal-2.0.gir
+share/gir-1.0/ECal-%%CAL_API_VERSION%%.gir
share/gir-1.0/EDataBook-%%EVO_VERSION%%.gir
-share/gir-1.0/EDataCal-2.0.gir
+share/gir-1.0/EDataCal-%%CAL_API_VERSION%%.gir
share/gir-1.0/EDataServer-%%EVO_VERSION%%.gir
share/gir-1.0/EDataServerUI-%%EVO_VERSION%%.gir
+share/gir-1.0/EDataServerUI4-1.0.gir
+share/icons/hicolor/scalable/apps/org.gnome.Evolution-alarm-notify.svg
share/locale/am/LC_MESSAGES/evolution-data-server.mo
share/locale/ar/LC_MESSAGES/evolution-data-server.mo
share/locale/as/LC_MESSAGES/evolution-data-server.mo
@@ -590,3 +620,5 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
%%VAPI%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
%%VAPI%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
%%VAPI%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libedataserverui4-1.0.deps
+%%VAPI%%share/vala/vapi/libedataserverui4-1.0.vapi