1 |
commit: 02a7d7bfd2ae6022b1e7590a7ae873c3b3f95933 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 8 12:34:57 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 8 12:57:14 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a7d7bf |
7 |
|
8 |
gnome-extra/evolution-ews: bump to 3.24.6, fresh install fix, libical3 compat |
9 |
|
10 |
Bump, patch to honor DESTDIR and not update caches when set (might cause sandbox |
11 |
violation for us and is generally wrong), patches for libical:0/3 compatibility. |
12 |
|
13 |
Bug: https://bugs.gentoo.org/628460 |
14 |
Closes: https://bugs.gentoo.org/639126 |
15 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
16 |
|
17 |
gnome-extra/evolution-ews/Manifest | 1 + |
18 |
.../evolution-ews/evolution-ews-3.24.6.ebuild | 66 ++++++++++++++++++++++ |
19 |
.../files/3.24.6-DESTDIR-honoring.patch | 33 +++++++++++ |
20 |
.../files/3.24.6-libical3-compat.patch | 44 +++++++++++++++ |
21 |
4 files changed, 144 insertions(+) |
22 |
|
23 |
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest |
24 |
index 645e932981e..cda9aee0b9f 100644 |
25 |
--- a/gnome-extra/evolution-ews/Manifest |
26 |
+++ b/gnome-extra/evolution-ews/Manifest |
27 |
@@ -1,2 +1,3 @@ |
28 |
DIST evolution-ews-3.22.6.tar.xz 715320 BLAKE2B abd68ffce9a2b723a72e26d5c0991060c377f930c3f34e2f9244dfb53c449bc92d8e0bca60b64993369fe00370fb60920e405355c3fbe63b846e279de785045c SHA512 6b93faa67a6f546142b023086bf54ac34d6c7c4320ee136f58cc0ea5a018811af2080d5945c4dc68c89555a35a4194b2f92bd839b2142ae63690e94ed895b40e |
29 |
DIST evolution-ews-3.24.5.tar.xz 488116 BLAKE2B 8144f1eae7440993c2bedd76e5cdfb3354b32bb1b1093bf24f23c12ca8a36e076950dc015f89966532d6c5ee491262a979cc9bff47cba5146c08989becd2fb95 SHA512 eaa5096c09686dade6f1efddea2b706a73c292b06b473b0f2ef1ba15eb5a3d685678416a0f1de40296beaa893d5dc91b944a440440dba489df67a944342f2f17 |
30 |
+DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1 |
31 |
|
32 |
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..1c2d3ee514d |
35 |
--- /dev/null |
36 |
+++ b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild |
37 |
@@ -0,0 +1,66 @@ |
38 |
+# Copyright 1999-2018 Gentoo Foundation |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=6 |
42 |
+GNOME2_LA_PUNT="yes" |
43 |
+ |
44 |
+inherit cmake-utils gnome2 |
45 |
+ |
46 |
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services" |
47 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
48 |
+ |
49 |
+LICENSE="LGPL-2.1" |
50 |
+SLOT="0" |
51 |
+KEYWORDS="~amd64 ~x86" |
52 |
+IUSE="test" |
53 |
+ |
54 |
+RDEPEND=" |
55 |
+ dev-db/sqlite:3= |
56 |
+ >=dev-libs/glib-2.46:2 |
57 |
+ dev-libs/libical:0= |
58 |
+ >=dev-libs/libmspack-0.4 |
59 |
+ >=dev-libs/libxml2-2 |
60 |
+ >=gnome-extra/evolution-data-server-3.24.7:0= |
61 |
+ >=mail-client/evolution-${PV}:2.0 |
62 |
+ >=net-libs/libsoup-2.42:2.4 |
63 |
+ >=x11-libs/gtk+-3.10:3 |
64 |
+" |
65 |
+DEPEND="${RDEPEND} |
66 |
+ dev-util/gdbus-codegen |
67 |
+ >=dev-util/intltool-0.35.5 |
68 |
+ >=sys-devel/gettext-0.18.3 |
69 |
+ virtual/pkgconfig |
70 |
+ test? ( net-libs/uhttpmock ) |
71 |
+" |
72 |
+ |
73 |
+# Unittests fail to find libevolution-ews.so |
74 |
+RESTRICT="test" |
75 |
+ |
76 |
+PATCHES=( |
77 |
+ "${FILESDIR}"/${PV}-DESTDIR-honoring.patch |
78 |
+ "${FILESDIR}"/${PV}-libical3-compat.patch |
79 |
+) |
80 |
+ |
81 |
+src_prepare() { |
82 |
+ gnome2_src_prepare # default from inherit order, but be explicit; needed for xdg_src_prepare, env_reset and co |
83 |
+} |
84 |
+ |
85 |
+src_configure() { |
86 |
+ local mycmakeargs=( |
87 |
+ -DWITH_MSPACK=ON |
88 |
+ -DENABLE_TESTS=$(usex test) |
89 |
+ ) |
90 |
+ cmake-utils_src_configure |
91 |
+} |
92 |
+ |
93 |
+src_compile() { |
94 |
+ cmake-utils_src_compile |
95 |
+} |
96 |
+ |
97 |
+src_test() { |
98 |
+ cmake-utils_src_test |
99 |
+} |
100 |
+ |
101 |
+src_install() { |
102 |
+ cmake-utils_src_install |
103 |
+} |
104 |
|
105 |
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 |
106 |
new file mode 100644 |
107 |
index 00000000000..c74df6bce52 |
108 |
--- /dev/null |
109 |
+++ b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch |
110 |
@@ -0,0 +1,33 @@ |
111 |
+From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001 |
112 |
+From: Milan Crha <mcrha@××××××.com> |
113 |
+Date: Mon, 2 Oct 2017 19:24:57 +0200 |
114 |
+Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is |
115 |
+ set |
116 |
+ |
117 |
+(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f) |
118 |
+--- |
119 |
+ cmake/modules/GLibTools.cmake | 8 +++++--- |
120 |
+ 1 file changed, 5 insertions(+), 3 deletions(-) |
121 |
+ |
122 |
+diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake |
123 |
+index fc8eb82..f0be558 100644 |
124 |
+--- a/cmake/modules/GLibTools.cmake |
125 |
++++ b/cmake/modules/GLibTools.cmake |
126 |
+@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0) |
127 |
+ if(_install_code) |
128 |
+ # Compile gsettings schemas and ensure that all of them are in the place. |
129 |
+ install(CODE |
130 |
+- "execute_process(${_install_code} |
131 |
+- COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\" |
132 |
+- )") |
133 |
++ "if(\"\$ENV{DESTDIR}\" STREQUAL \"\") |
134 |
++ execute_process(${_install_code} |
135 |
++ COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\" |
136 |
++ ) |
137 |
++ endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")") |
138 |
+ endif(_install_code) |
139 |
+ endmacro(add_gsettings_schemas) |
140 |
+ |
141 |
+-- |
142 |
+2.15.1 |
143 |
+ |
144 |
|
145 |
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 |
146 |
new file mode 100644 |
147 |
index 00000000000..001e35630e9 |
148 |
--- /dev/null |
149 |
+++ b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch |
150 |
@@ -0,0 +1,44 @@ |
151 |
+From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001 |
152 |
+From: Mart Raudsepp <leio@g.o> |
153 |
+Date: Mon, 8 Jan 2018 14:23:49 +0200 |
154 |
+Subject: [PATCH] Use icaltime_is_utc() instead of icaltimetype::is_utc |
155 |
+ |
156 |
+The structure member is going to be removed from libical3 and the |
157 |
+function is available for a long time, thus it's safe to replace |
158 |
+the usage in the code. |
159 |
+ |
160 |
+(ported from commit 7c0f42604c16fe571168ea48f4628bc920359595) |
161 |
+--- |
162 |
+ src/calendar/e-cal-backend-ews-utils.c | 2 +- |
163 |
+ src/calendar/e-cal-backend-ews.c | 2 +- |
164 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
165 |
+ |
166 |
+diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c |
167 |
+index 41d77b4..a46b1e3 100644 |
168 |
+--- a/src/calendar/e-cal-backend-ews-utils.c |
169 |
++++ b/src/calendar/e-cal-backend-ews-utils.c |
170 |
+@@ -346,7 +346,7 @@ ewscal_set_time (ESoapMessage *msg, |
171 |
+ gchar *tz_ident = NULL; |
172 |
+ |
173 |
+ if (with_timezone) { |
174 |
+- if (t->is_utc || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) { |
175 |
++ if (icaltime_is_utc (*t) || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) { |
176 |
+ tz_ident = g_strdup ("Z"); |
177 |
+ } else { |
178 |
+ gint offset, is_daylight, hrs, mins; |
179 |
+diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c |
180 |
+index 50dd5ae..29e488f 100644 |
181 |
+--- a/src/calendar/e-cal-backend-ews.c |
182 |
++++ b/src/calendar/e-cal-backend-ews.c |
183 |
+@@ -1081,7 +1081,7 @@ e_cal_backend_ews_get_timezone_from_ical_component (ECalBackend *backend, |
184 |
+ struct icaltimetype dtstart; |
185 |
+ |
186 |
+ dtstart = icalproperty_get_dtstart (prop); |
187 |
+- if (dtstart.is_utc) |
188 |
++ if (icaltime_is_utc (dtstart)) |
189 |
+ tzid = "UTC"; |
190 |
+ } |
191 |
+ } |
192 |
+-- |
193 |
+2.15.1 |
194 |
+ |