From 6f8038813c460b4f0572d5ef595cdfa94af3a94d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2019 10:20:03 +0100 Subject: gentoo resync : 21.05.2019 --- gnome-extra/evolution-ews/Manifest | 4 -- .../evolution-ews/evolution-ews-3.24.6.ebuild | 66 ---------------------- .../files/3.24.6-DESTDIR-honoring.patch | 33 ----------- .../files/3.24.6-libical3-compat.patch | 44 --------------- 4 files changed, 147 deletions(-) delete mode 100644 gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild delete mode 100644 gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch delete mode 100644 gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch (limited to 'gnome-extra/evolution-ews') diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest index 95409157e74c..1bc8d46d7f87 100644 --- a/gnome-extra/evolution-ews/Manifest +++ b/gnome-extra/evolution-ews/Manifest @@ -1,8 +1,4 @@ -AUX 3.24.6-DESTDIR-honoring.patch 1196 BLAKE2B e6996ff088f5e5f3b1e4db6b1f85524d61ba35798d76cf46f07c9efe8587dadeab08b78f3a8d0ad8602ebe6899c72e0d0804e2835ba634afddf610ec0ff54488 SHA512 dc837d7150a42e9e03856b36a1f417ac1b850722f1475efacfa00bf724d45fddc03eb61d3f8f4c7e74884c672dd1f18bed86987cd3f22bbefa6ad7f514368a07 -AUX 3.24.6-libical3-compat.patch 1623 BLAKE2B f8fc567f2c86cbe6392de5750e8a01155d49a9bb79912d1e3f066be0b03eae90be4d39b72d3fa2eb92129d378d5647a697c3813d253f26980bed5a51e838a811 SHA512 2f1a607cf44d69bdd7a14551f0b95cc01c34a86f92741fce848b3d90e6e4bc8c35e9bf02426c742da3ab8bb4bc01c4533bac8c95894f11bb57290da19dec95bb -DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1 DIST evolution-ews-3.30.5-certificate-validation.patch.xz 6928 BLAKE2B eb1f070797231f14cc71cce2f19a0dc925edc0f67eca9267568c835e878d9f1567aaad7dd8a14c88abb047af8db8220239c78d62387329c9d38e5c5eda21822b SHA512 2d4fa5f9c24bf92ab4e5105cc5d265907e8af760d7c969ffdf74d090795948e1f9e0e84f5d051c2a6c4324ed49cc2c23f23ebdccf67fa8baab965c612ad807e6 DIST evolution-ews-3.30.5.tar.xz 525252 BLAKE2B 510666cdf6bdb95e73799256daa9b4c753ed70de71798d3acb73eb55c30158a7b6b56fe7617150ec0a1f5ce20676da8a3ab4608fca06f009ea16fbc234770736 SHA512 6b17fd73b461e0ddd725ee87c854fca45fbc14f10922a60aff5a9a25b56728f1f16a0d3196b4bc3cba83e75655c15244c3bf2442fa17449c7466ab95371e93d7 -EBUILD evolution-ews-3.24.6.ebuild 1306 BLAKE2B f82629ba467605d6c359c1b2c0db19a912332e6c1c32126a70919131d15b639bac496004c344a9078932fe262c5c84ff669aa2a3e30cdc5fd76ae969e9bd0675 SHA512 b270f0ec8019b39bd49157c393be0ba1bf305fe4dba9bb7a0e18e89c6095b6c0b5af662b21b9f4cb87c9f4ea629ebe36e339125976977afbc31601f516df2a7d EBUILD evolution-ews-3.30.5-r1.ebuild 1499 BLAKE2B 5164332cda7bf860bb5abc8299c55dea3d1c8dc1d46d2ebd8d4f007f1aa068dcf2d42f46080062c599fa019078882094d8edad35e4ea83deb7eb0d77675dc9b7 SHA512 cc9331a17d6efaedea8a14e6f00c0438a27f45d40a3c42f5ff06eafd941ce70972ee94755134aa06c7beee9ff0efb3aacc350f8e5b0fceb536821fc7842227d1 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild deleted file mode 100644 index dd21ac33a3b7..000000000000 --- a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit cmake-utils gnome2 - -DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -RDEPEND=" - dev-db/sqlite:3= - >=dev-libs/glib-2.46:2 - dev-libs/libical:0= - >=dev-libs/libmspack-0.4 - >=dev-libs/libxml2-2 - >=gnome-extra/evolution-data-server-3.24.7:0= - >=mail-client/evolution-${PV}:2.0 - >=net-libs/libsoup-2.42:2.4 - >=x11-libs/gtk+-3.10:3 -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.35.5 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig - test? ( net-libs/uhttpmock ) -" - -# Unittests fail to find libevolution-ews.so -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PV}-DESTDIR-honoring.patch - "${FILESDIR}"/${PV}-libical3-compat.patch -) - -src_prepare() { - gnome2_src_prepare # default from inherit order, but be explicit; needed for xdg_src_prepare, env_reset and co -} - -src_configure() { - local mycmakeargs=( - -DWITH_MSPACK=ON - -DENABLE_TESTS=$(usex test) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install -} 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 deleted file mode 100644 index c74df6bce523..000000000000 --- a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001 -From: Milan Crha -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 deleted file mode 100644 index 001e35630e91..000000000000 --- a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -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 - -- cgit v1.2.3