diff options
author | Mart Raudsepp <leio@gentoo.org> | 2018-01-08 14:34:57 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2018-01-08 14:57:14 +0200 |
commit | 02a7d7bfd2ae6022b1e7590a7ae873c3b3f95933 (patch) | |
tree | c0428c747c436ce34c0a2efe6408a99a141e2bfa /gnome-extra/evolution-ews/files | |
parent | mail-client/evolution: bump to 3.24.6, fix fresh install sandbox violation, l... (diff) | |
download | gentoo-02a7d7bfd2ae6022b1e7590a7ae873c3b3f95933.tar.gz gentoo-02a7d7bfd2ae6022b1e7590a7ae873c3b3f95933.tar.bz2 gentoo-02a7d7bfd2ae6022b1e7590a7ae873c3b3f95933.zip |
gnome-extra/evolution-ews: bump to 3.24.6, fresh install fix, libical3 compat
Bump, patch to honor DESTDIR and not update caches when set (might cause sandbox
violation for us and is generally wrong), patches for libical:0/3 compatibility.
Bug: https://bugs.gentoo.org/628460
Closes: https://bugs.gentoo.org/639126
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'gnome-extra/evolution-ews/files')
-rw-r--r-- | gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch | 33 | ||||
-rw-r--r-- | gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch | 44 |
2 files changed, 77 insertions, 0 deletions
diff --git a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch new file mode 100644 index 000000000000..c74df6bce523 --- /dev/null +++ b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch @@ -0,0 +1,33 @@ +From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001 +From: Milan Crha <mcrha@redhat.com> +Date: Mon, 2 Oct 2017 19:24:57 +0200 +Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is + set + +(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f) +--- + cmake/modules/GLibTools.cmake | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake +index fc8eb82..f0be558 100644 +--- a/cmake/modules/GLibTools.cmake ++++ b/cmake/modules/GLibTools.cmake +@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0) + if(_install_code) + # Compile gsettings schemas and ensure that all of them are in the place. + install(CODE +- "execute_process(${_install_code} +- COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\" +- )") ++ "if(\"\$ENV{DESTDIR}\" STREQUAL \"\") ++ execute_process(${_install_code} ++ COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\" ++ ) ++ endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")") + endif(_install_code) + endmacro(add_gsettings_schemas) + +-- +2.15.1 + diff --git a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch new file mode 100644 index 000000000000..001e35630e91 --- /dev/null +++ b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch @@ -0,0 +1,44 @@ +From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Mon, 8 Jan 2018 14:23:49 +0200 +Subject: [PATCH] Use icaltime_is_utc() instead of icaltimetype::is_utc + +The structure member is going to be removed from libical3 and the +function is available for a long time, thus it's safe to replace +the usage in the code. + +(ported from commit 7c0f42604c16fe571168ea48f4628bc920359595) +--- + src/calendar/e-cal-backend-ews-utils.c | 2 +- + src/calendar/e-cal-backend-ews.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c +index 41d77b4..a46b1e3 100644 +--- a/src/calendar/e-cal-backend-ews-utils.c ++++ b/src/calendar/e-cal-backend-ews-utils.c +@@ -346,7 +346,7 @@ ewscal_set_time (ESoapMessage *msg, + gchar *tz_ident = NULL; + + if (with_timezone) { +- if (t->is_utc || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) { ++ if (icaltime_is_utc (*t) || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) { + tz_ident = g_strdup ("Z"); + } else { + gint offset, is_daylight, hrs, mins; +diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c +index 50dd5ae..29e488f 100644 +--- a/src/calendar/e-cal-backend-ews.c ++++ b/src/calendar/e-cal-backend-ews.c +@@ -1081,7 +1081,7 @@ e_cal_backend_ews_get_timezone_from_ical_component (ECalBackend *backend, + struct icaltimetype dtstart; + + dtstart = icalproperty_get_dtstart (prop); +- if (dtstart.is_utc) ++ if (icaltime_is_utc (dtstart)) + tzid = "UTC"; + } + } +-- +2.15.1 + |