1 |
commit: 68749a19eec8adb162011539fbbd05cf7f02d3d2 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 6 21:17:50 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 6 21:21:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68749a19 |
7 |
|
8 |
gnome-extra/evolution-data-server: bump to 3.22.4 and fix IMAP NOTIFY extension |
9 |
|
10 |
The gperf-3.1 patch doesn't seem to be needed, as it works with gperf-3.1 |
11 |
without it, but include it just in case (gperf-3.0.4 generated version looks to |
12 |
be included in the tarball, and so used instead unless we regenerate). |
13 |
|
14 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
15 |
|
16 |
gnome-extra/evolution-data-server/Manifest | 1 + |
17 |
.../evolution-data-server-3.22.4.ebuild | 134 +++++++++++++++++++++ |
18 |
.../files/3.22.4-gperf-3.1.patch | 24 ++++ |
19 |
.../files/3.22.4-imap-notify.patch | 27 +++++ |
20 |
4 files changed, 186 insertions(+) |
21 |
|
22 |
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest |
23 |
index 42fff60..9371b56 100644 |
24 |
--- a/gnome-extra/evolution-data-server/Manifest |
25 |
+++ b/gnome-extra/evolution-data-server/Manifest |
26 |
@@ -1,3 +1,4 @@ |
27 |
DIST evolution-data-server-3.20.5.tar.xz 5067732 SHA256 0d1586cd326d997497a2a6fddd939a83892be07cb20f8c88fda5013f8c5bbe7e SHA512 8376331ae0ee96013d5c61b1da92393486d0eb9e0fed63199d4b6c28d92cb6d9dc45826fd65b476d894141d507742e8574168bc99b8704bebe8b39bbd297606e WHIRLPOOL 3c3417603bd2a18c7a3370e32af7f1581fc399ebe6f721d0ac678a5978d667b58df2927eb02f240b4c2f139133e06f25e13a47879b7b7a470cd1283a186bba10 |
28 |
DIST evolution-data-server-3.20.6.tar.xz 5069584 SHA256 c9280149477cc0c75c20214814cfc54f0e5827c40080dadbbe4b4188479913aa SHA512 0526e64c407bd569b8fb45faeb902cdc15e46e5020c4187d76102f8e0b3173fdd0a742383cfed8de0351dd719c2ad33b39c7d4cd656312d07526ae8b85198dbc WHIRLPOOL e229d245ae79c6ecc2910bc6f110314e568d6afc546157af4e2a98be85e67ac1615f4085f3a4df2a94e658881ef6aa1c6d336b4ae3211bd0a85b2a81eef64f91 |
29 |
DIST evolution-data-server-3.22.3.tar.xz 5558616 SHA256 0c58dfc2bdd72ea5bef65e2ef9f2969c8ceef253d3e3150a894647a00d69cf4f SHA512 17a8cb07cc516925a8cc27798d61935ddd0de2074f7a245283aec8932cd1f023c2c0cd5339b5896984656a560865017ea9df9d77e80deb7fc1f432a82f5ba935 WHIRLPOOL f0ccfcf0080b785c5d35fd2afe072922c9538a10a60666459171e2b9d79e42ee30be2dd766abe1ffdca026a1f9f43b1764b60fc3dc1d5453bc3f55ce863ed36b |
30 |
+DIST evolution-data-server-3.22.4.tar.xz 5559372 SHA256 0c9c64f209bfd50dbace342ab3b673bcea74ad5fe01a7bc87c1a98d997349cb8 SHA512 38773c4ac65e69b02fd6d5abb0db843f038c383391e1c1006e54bda518f89741b6637f480d70e3cd79b31a812190d55ceec5c8b187d62d9ce582b0d6c362850c WHIRLPOOL d7808803328fcdcaab60934f7b674c599c04242bf6edd751cdc32de99b672a5f6d91b0f48bd42596c66400c09a73e26340b443216118667bfa58ca0fd5cb7cb8 |
31 |
|
32 |
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000..c96aff5 |
35 |
--- /dev/null |
36 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild |
37 |
@@ -0,0 +1,134 @@ |
38 |
+# Copyright 1999-2017 Gentoo Foundation |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+# $Id$ |
41 |
+ |
42 |
+EAPI=6 |
43 |
+GNOME2_LA_PUNT="yes" |
44 |
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) |
45 |
+VALA_USE_DEPEND="vapigen" |
46 |
+ |
47 |
+inherit db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx |
48 |
+ |
49 |
+DESCRIPTION="Evolution groupware backend" |
50 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
51 |
+ |
52 |
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
53 |
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" |
54 |
+SLOT="0/59" # subslot = libcamel-1.2 soname version |
55 |
+ |
56 |
+IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather" |
57 |
+REQUIRED_USE="vala? ( introspection )" |
58 |
+ |
59 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
60 |
+ |
61 |
+# sys-libs/db is only required for migrating from <3.13 versions |
62 |
+# gdata-0.15.1 is required for google tasks |
63 |
+# berkdb needed only for migrating old calendar data, bug #519512 |
64 |
+RDEPEND=" |
65 |
+ >=app-crypt/gcr-3.4 |
66 |
+ >=app-crypt/libsecret-0.5[crypt] |
67 |
+ >=dev-db/sqlite-3.7.17:= |
68 |
+ >=dev-libs/glib-2.46:2 |
69 |
+ >=dev-libs/libgdata-0.10:= |
70 |
+ >=dev-libs/libical-0.43:= |
71 |
+ >=dev-libs/libxml2-2 |
72 |
+ >=dev-libs/nspr-4.4:= |
73 |
+ >=dev-libs/nss-3.9:= |
74 |
+ >=net-libs/libsoup-2.42:2.4 |
75 |
+ |
76 |
+ dev-libs/icu:= |
77 |
+ sys-libs/zlib:= |
78 |
+ virtual/libiconv |
79 |
+ |
80 |
+ berkdb? ( >=sys-libs/db-4:= ) |
81 |
+ gtk? ( |
82 |
+ >=app-crypt/gcr-3.4[gtk] |
83 |
+ >=x11-libs/gtk+-3.10:3 |
84 |
+ ) |
85 |
+ google? ( |
86 |
+ >=dev-libs/json-glib-1.0.4 |
87 |
+ >=dev-libs/libgdata-0.15.1:= |
88 |
+ >=net-libs/webkit-gtk-2.11.91:4 |
89 |
+ ) |
90 |
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) |
91 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) |
92 |
+ kerberos? ( virtual/krb5:= ) |
93 |
+ ldap? ( >=net-nds/openldap-2:= ) |
94 |
+ weather? ( >=dev-libs/libgweather-3.10:2= ) |
95 |
+" |
96 |
+DEPEND="${RDEPEND} |
97 |
+ ${PYTHON_DEPS} |
98 |
+ dev-util/gdbus-codegen |
99 |
+ dev-util/gperf |
100 |
+ >=dev-util/gtk-doc-am-1.14 |
101 |
+ >=dev-util/intltool-0.35.5 |
102 |
+ >=gnome-base/gnome-common-2 |
103 |
+ >=sys-devel/gettext-0.17 |
104 |
+ virtual/pkgconfig |
105 |
+ vala? ( $(vala_depend) ) |
106 |
+" |
107 |
+ |
108 |
+# Some tests fail due to missings locales. |
109 |
+# Also, dbus tests are flacky, bugs #397975 #501834 |
110 |
+# It looks like a nightmare to disable those for now. |
111 |
+RESTRICT="test" |
112 |
+ |
113 |
+# From gnome-3-22 branch, will be included in 3.22.5 release |
114 |
+PATCHES=( |
115 |
+ "${FILESDIR}"/${PV}-gperf-3.1.patch |
116 |
+ "${FILESDIR}"/${PV}-imap-notify.patch |
117 |
+) |
118 |
+ |
119 |
+pkg_setup() { |
120 |
+ python-any-r1_pkg_setup |
121 |
+} |
122 |
+ |
123 |
+src_prepare() { |
124 |
+ use vala && vala_src_prepare |
125 |
+ gnome2_src_prepare |
126 |
+} |
127 |
+ |
128 |
+src_configure() { |
129 |
+ # /usr/include/db.h is always db-1 on FreeBSD |
130 |
+ # so include the right dir in CPPFLAGS |
131 |
+ use berkdb && append-cppflags "-I$(db_includedir)" |
132 |
+ |
133 |
+ # phonenumber does not exist in tree |
134 |
+ gnome2_src_configure \ |
135 |
+ $(use_enable api-doc-extras gtk-doc) \ |
136 |
+ $(use_with api-doc-extras private-docs) \ |
137 |
+ $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \ |
138 |
+ $(use_enable gnome-online-accounts goa) \ |
139 |
+ $(use_enable gtk) \ |
140 |
+ $(use_enable google google-auth) \ |
141 |
+ $(use_enable google) \ |
142 |
+ $(use_enable introspection) \ |
143 |
+ $(use_enable ipv6) \ |
144 |
+ $(use_with kerberos krb5 "${EPREFIX}"/usr) \ |
145 |
+ $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \ |
146 |
+ $(use_with ldap openldap) \ |
147 |
+ $(use_enable vala vala-bindings) \ |
148 |
+ $(use_enable weather) \ |
149 |
+ --enable-largefile \ |
150 |
+ --enable-smime \ |
151 |
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \ |
152 |
+ --without-phonenumber \ |
153 |
+ --disable-examples \ |
154 |
+ --disable-uoa |
155 |
+} |
156 |
+ |
157 |
+src_test() { |
158 |
+ unset ORBIT_SOCKETDIR |
159 |
+ unset SESSION_MANAGER |
160 |
+ virtx emake check |
161 |
+} |
162 |
+ |
163 |
+src_install() { |
164 |
+ gnome2_src_install |
165 |
+ |
166 |
+ if use ldap; then |
167 |
+ insinto /etc/openldap/schema |
168 |
+ doins "${FILESDIR}"/calentry.schema |
169 |
+ dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema |
170 |
+ fi |
171 |
+} |
172 |
|
173 |
diff --git a/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch b/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch |
174 |
new file mode 100644 |
175 |
index 00000000..e43dd08 |
176 |
--- /dev/null |
177 |
+++ b/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch |
178 |
@@ -0,0 +1,24 @@ |
179 |
+From 60d1cbbdc49ea254e30303d936e8f2b6b136afe4 Mon Sep 17 00:00:00 2001 |
180 |
+From: Milan Crha <mcrha@××××××.com> |
181 |
+Date: Mon, 6 Feb 2017 18:30:49 +0100 |
182 |
+Subject: Bug 778222 - Fix a build break with gperf 3.1 |
183 |
+ |
184 |
+--- |
185 |
+ camel/providers/imapx/camel-imapx-tokens.txt | 1 - |
186 |
+ 1 file changed, 1 deletion(-) |
187 |
+ |
188 |
+diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt |
189 |
+index ed278bd..61c7115 100644 |
190 |
+--- a/camel/providers/imapx/camel-imapx-tokens.txt |
191 |
++++ b/camel/providers/imapx/camel-imapx-tokens.txt |
192 |
+@@ -1,7 +1,6 @@ |
193 |
+ /* This contains all of the keywords we care about. These |
194 |
+ can be converted to an id very efficiently */ |
195 |
+ struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; }; |
196 |
+-struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len); |
197 |
+ %% |
198 |
+ ALERT, IMAPX_ALERT |
199 |
+ ALREADYEXISTS, IMAPX_ALREADYEXISTS |
200 |
+-- |
201 |
+cgit v0.12 |
202 |
+ |
203 |
|
204 |
diff --git a/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch b/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch |
205 |
new file mode 100644 |
206 |
index 00000000..ff6aacc |
207 |
--- /dev/null |
208 |
+++ b/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch |
209 |
@@ -0,0 +1,27 @@ |
210 |
+From 5d830ed06a4bc4313a1f08b6fe47291d02639e04 Mon Sep 17 00:00:00 2001 |
211 |
+From: Milan Crha <mcrha@××××××.com> |
212 |
+Date: Mon, 6 Feb 2017 19:58:54 +0100 |
213 |
+Subject: Bug 778069 - UI not updated after IMAP NOTIFY notifications |
214 |
+ |
215 |
+--- |
216 |
+ camel/providers/imapx/camel-imapx-server.c | 4 ++++ |
217 |
+ 1 file changed, 4 insertions(+) |
218 |
+ |
219 |
+diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c |
220 |
+index 6b23a9a..09735fa 100644 |
221 |
+--- a/camel/providers/imapx/camel-imapx-server.c |
222 |
++++ b/camel/providers/imapx/camel-imapx-server.c |
223 |
+@@ -1685,6 +1685,10 @@ imapx_untagged_status (CamelIMAPXServer *is, |
224 |
+ if (mailbox != NULL) { |
225 |
+ camel_imapx_mailbox_handle_status_response (mailbox, response); |
226 |
+ camel_imapx_store_emit_mailbox_updated (imapx_store, mailbox); |
227 |
++ |
228 |
++ if (camel_imapx_server_is_in_idle (is)) |
229 |
++ g_signal_emit (is, signals[REFRESH_MAILBOX], 0, mailbox); |
230 |
++ |
231 |
+ g_object_unref (mailbox); |
232 |
+ } |
233 |
+ |
234 |
+-- |
235 |
+cgit v0.12 |
236 |
+ |