1 |
commit: 1dff9ad1d920a5f8b657735f23d00e06e2021c96 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 10 00:34:56 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 10 00:35:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dff9ad1 |
7 |
|
8 |
mail-client/claws-mail: Removed old. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/676174 |
11 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
mail-client/claws-mail/Manifest | 4 - |
15 |
mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild | 209 -------------------- |
16 |
mail-client/claws-mail/claws-mail-3.15.1.ebuild | 205 -------------------- |
17 |
mail-client/claws-mail/claws-mail-3.16.0.ebuild | 205 -------------------- |
18 |
mail-client/claws-mail/claws-mail-3.17.2.ebuild | 211 --------------------- |
19 |
.../claws-mail-3.15.0-old_profile_segfault.patch | 80 -------- |
20 |
6 files changed, 914 deletions(-) |
21 |
|
22 |
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest |
23 |
index a65dddd169e..3e24b02faca 100644 |
24 |
--- a/mail-client/claws-mail/Manifest |
25 |
+++ b/mail-client/claws-mail/Manifest |
26 |
@@ -1,5 +1 @@ |
27 |
-DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B f25356372b65f2df072eb2774fca87514c2da59811e78650e26ae58c1b518e229cba62cf1b0d0ad72107e292c9d87450f7d2508c02f34c5c9c70d944f9866823 SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8 |
28 |
-DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c |
29 |
-DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e |
30 |
-DIST claws-mail-3.17.2.tar.xz 6166160 BLAKE2B d31feb49cbeddbf4f95540f984c76a4d91edb95fccf2a7d97933ddaacfa9a5fedb464e602cb85a97bc75dc341bc7004cef9bea27d8dfb51d42a62d3f2f46fa1d SHA512 c68d31f7097f1b5fd5c768f4d97fd9edfbe54794e06ad6980e092743ff5ac96efbc2354021040315ef355d9a272fb71065e4c02bd8ac1804e7db7953a8cff615 |
31 |
DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8 |
32 |
|
33 |
diff --git a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild |
34 |
deleted file mode 100644 |
35 |
index 7e7feaa001c..00000000000 |
36 |
--- a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,209 +0,0 @@ |
39 |
-# Copyright 1999-2018 Gentoo Foundation |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=6 |
43 |
- |
44 |
-PYTHON_COMPAT=( python2_7 ) |
45 |
-inherit autotools gnome2-utils python-single-r1 xdg-utils |
46 |
- |
47 |
-DESCRIPTION="An email client (and news reader) based on GTK+" |
48 |
-HOMEPAGE="https://www.claws-mail.org/" |
49 |
- |
50 |
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" |
51 |
- |
52 |
-SLOT="0" |
53 |
-LICENSE="GPL-3" |
54 |
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86" |
55 |
- |
56 |
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" |
57 |
-REQUIRED_USE="libcanberra? ( notification ) |
58 |
- libindicate? ( notification ) |
59 |
- libnotify? ( notification ) |
60 |
- networkmanager? ( dbus ) |
61 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
62 |
- smime? ( pgp )" |
63 |
- |
64 |
-COMMONDEPEND=" |
65 |
- net-mail/ytnef |
66 |
- archive? ( |
67 |
- app-arch/libarchive |
68 |
- >=net-misc/curl-7.9.7 |
69 |
- ) |
70 |
- bogofilter? ( mail-filter/bogofilter ) |
71 |
- calendar? ( |
72 |
- >=dev-libs/libical-2.0.0:= |
73 |
- >=net-misc/curl-7.9.7 |
74 |
- ) |
75 |
- dbus? ( >=dev-libs/dbus-glib-0.60 ) |
76 |
- gdata? ( >=dev-libs/libgdata-0.17.2 ) |
77 |
- gnutls? ( >=net-libs/gnutls-3.0 ) |
78 |
- gtk3? ( x11-libs/gtk+:3 ) |
79 |
- !gtk3? ( >=x11-libs/gtk+-2.20:2 ) |
80 |
- imap? ( >=net-libs/libetpan-0.57 ) |
81 |
- ldap? ( >=net-nds/openldap-2.0.7 ) |
82 |
- nls? ( >=sys-devel/gettext-0.18 ) |
83 |
- nntp? ( >=net-libs/libetpan-0.57 ) |
84 |
- notification? ( |
85 |
- dev-libs/glib:2 |
86 |
- libcanberra? ( media-libs/libcanberra[gtk] ) |
87 |
- libindicate? ( dev-libs/libindicate:3[gtk] ) |
88 |
- libnotify? ( x11-libs/libnotify ) |
89 |
- ) |
90 |
- pda? ( >=app-pda/jpilot-0.99 ) |
91 |
- pdf? ( app-text/poppler[cairo] ) |
92 |
- pgp? ( >=app-crypt/gpgme-1.0.0 ) |
93 |
- session? ( |
94 |
- x11-libs/libICE |
95 |
- x11-libs/libSM |
96 |
- ) |
97 |
- smime? ( >=app-crypt/gpgme-1.0.0 ) |
98 |
- spam-report? ( >=net-misc/curl-7.9.7 ) |
99 |
- spell? ( >=app-text/enchant-1.0.0 ) |
100 |
- startup-notification? ( x11-libs/startup-notification ) |
101 |
- svg? ( >=gnome-base/librsvg-2.40.5 ) |
102 |
- valgrind? ( dev-util/valgrind ) |
103 |
-" |
104 |
- |
105 |
-DEPEND="${COMMONDEPEND} |
106 |
- app-arch/xz-utils |
107 |
- virtual/pkgconfig |
108 |
- xface? ( >=media-libs/compface-1.4 )" |
109 |
- |
110 |
-RDEPEND="${COMMONDEPEND} |
111 |
- app-misc/mime-types |
112 |
- x11-misc/shared-mime-info |
113 |
- clamav? ( app-antivirus/clamav ) |
114 |
- networkmanager? ( net-misc/networkmanager ) |
115 |
- pdf? ( app-text/ghostscript-gpl ) |
116 |
- perl? ( dev-lang/perl:= ) |
117 |
- python? ( |
118 |
- ${PYTHON_DEPS} |
119 |
- >=dev-python/pygtk-2.10.3 |
120 |
- ) |
121 |
- rss? ( |
122 |
- dev-libs/libxml2 |
123 |
- net-misc/curl |
124 |
- )" |
125 |
- |
126 |
-PATCHES=( |
127 |
- "${FILESDIR}/${P}-old_profile_segfault.patch" |
128 |
-) |
129 |
- |
130 |
-pkg_setup() { |
131 |
- use python && python-single-r1_pkg_setup |
132 |
-} |
133 |
- |
134 |
-src_prepare() { |
135 |
- default |
136 |
- eautoreconf |
137 |
-} |
138 |
- |
139 |
-src_configure() { |
140 |
- # Don't use libsoup-gnome (bug #565924) |
141 |
- export HAVE_LIBSOUP_GNOME=no |
142 |
- |
143 |
- local myeconfargs=( |
144 |
- --disable-bsfilter-plugin |
145 |
- --disable-fancy-plugin |
146 |
- --disable-generic-umpc |
147 |
- --enable-acpi_notifier-plugin |
148 |
- --enable-address_keeper-plugin |
149 |
- --enable-alternate-addressbook |
150 |
- --enable-att_remover-plugin |
151 |
- --enable-attachwarner-plugin |
152 |
- --enable-fetchinfo-plugin |
153 |
- --enable-mailmbox-plugin |
154 |
- --enable-newmail-plugin |
155 |
- --enable-tnef_parse-plugin |
156 |
- --with-password-encryption=$(usex gnutls gnutls old) |
157 |
- $(use_enable archive archive-plugin) |
158 |
- $(use_enable bogofilter bogofilter-plugin) |
159 |
- $(use_enable calendar vcalendar-plugin) |
160 |
- $(use_enable clamav clamd-plugin) |
161 |
- $(use_enable dbus) |
162 |
- $(use_enable debug crash-dialog) |
163 |
- $(use_enable doc manual) |
164 |
- $(use_enable gdata gdata-plugin) |
165 |
- $(use_enable gnutls) |
166 |
- $(use_enable gtk3) |
167 |
- $(use_enable ipv6) |
168 |
- $(use_enable ldap) |
169 |
- $(use_enable networkmanager) |
170 |
- $(use_enable nls) |
171 |
- $(use_enable notification notification-plugin) |
172 |
- $(use_enable pda jpilot) |
173 |
- $(use_enable pdf pdf_viewer-plugin) |
174 |
- $(use_enable perl perl-plugin) |
175 |
- $(use_enable pgp pgpcore-plugin) |
176 |
- $(use_enable pgp pgpinline-plugin) |
177 |
- $(use_enable pgp pgpmime-plugin) |
178 |
- $(use_enable python python-plugin) |
179 |
- $(use_enable rss rssyl-plugin) |
180 |
- $(use_enable session libsm) |
181 |
- $(use_enable sieve managesieve-plugin) |
182 |
- $(use_enable smime smime-plugin) |
183 |
- $(use_enable spam-report spam_report-plugin) |
184 |
- $(use_enable spamassassin spamassassin-plugin) |
185 |
- $(use_enable spell enchant) |
186 |
- $(use_enable startup-notification) |
187 |
- $(use_enable svg) |
188 |
- $(use_enable valgrind valgrind) |
189 |
- $(use_enable xface compface) |
190 |
- ) |
191 |
- |
192 |
- # libetpan is needed if user wants nntp or imap functionality |
193 |
- if use imap || use nntp ; then |
194 |
- myeconfargs+=( --enable-libetpan ) |
195 |
- else |
196 |
- myeconfargs+=( --disable-libetpan ) |
197 |
- fi |
198 |
- |
199 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
200 |
-} |
201 |
- |
202 |
-src_install() { |
203 |
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) |
204 |
- default |
205 |
- |
206 |
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps |
207 |
- # => also install it in /usr/share/pixmaps for other desktop envs |
208 |
- # => also install higher resolution icons in /usr/share/icons/hicolor/... |
209 |
- insinto /usr/share/pixmaps |
210 |
- doins ${PN}.png |
211 |
- local size |
212 |
- for size in 64 128 ; do |
213 |
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png |
214 |
- done |
215 |
- |
216 |
- docinto tools |
217 |
- dodoc tools/README* |
218 |
- |
219 |
- domenu ${PN}.desktop |
220 |
- |
221 |
- einfo "Installing extra tools" |
222 |
- cd "${S}"/tools |
223 |
- exeinto /usr/$(get_libdir)/${PN}/tools |
224 |
- doexe *.pl *.py *.conf *.sh |
225 |
- doexe tb2claws-mail update-po uudec uuooffice |
226 |
- |
227 |
- # kill useless files |
228 |
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la} |
229 |
-} |
230 |
- |
231 |
-pkg_preinst() { |
232 |
- gnome2_icon_savelist |
233 |
-} |
234 |
- |
235 |
-pkg_postinst() { |
236 |
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:" |
237 |
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags" |
238 |
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface" |
239 |
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely" |
240 |
- gnome2_icon_cache_update |
241 |
- xdg_desktop_database_update |
242 |
-} |
243 |
- |
244 |
-pkg_postrm() { |
245 |
- gnome2_icon_cache_update |
246 |
- xdg_desktop_database_update |
247 |
-} |
248 |
|
249 |
diff --git a/mail-client/claws-mail/claws-mail-3.15.1.ebuild b/mail-client/claws-mail/claws-mail-3.15.1.ebuild |
250 |
deleted file mode 100644 |
251 |
index 2392454c221..00000000000 |
252 |
--- a/mail-client/claws-mail/claws-mail-3.15.1.ebuild |
253 |
+++ /dev/null |
254 |
@@ -1,205 +0,0 @@ |
255 |
-# Copyright 1999-2018 Gentoo Foundation |
256 |
-# Distributed under the terms of the GNU General Public License v2 |
257 |
- |
258 |
-EAPI=6 |
259 |
- |
260 |
-PYTHON_COMPAT=( python2_7 ) |
261 |
-inherit autotools gnome2-utils python-single-r1 xdg-utils |
262 |
- |
263 |
-DESCRIPTION="An email client (and news reader) based on GTK+" |
264 |
-HOMEPAGE="https://www.claws-mail.org/" |
265 |
- |
266 |
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" |
267 |
- |
268 |
-SLOT="0" |
269 |
-LICENSE="GPL-3" |
270 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
271 |
- |
272 |
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" |
273 |
-REQUIRED_USE="libcanberra? ( notification ) |
274 |
- libindicate? ( notification ) |
275 |
- libnotify? ( notification ) |
276 |
- networkmanager? ( dbus ) |
277 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
278 |
- smime? ( pgp )" |
279 |
- |
280 |
-COMMONDEPEND=" |
281 |
- net-mail/ytnef |
282 |
- archive? ( |
283 |
- app-arch/libarchive |
284 |
- >=net-misc/curl-7.9.7 |
285 |
- ) |
286 |
- bogofilter? ( mail-filter/bogofilter ) |
287 |
- calendar? ( |
288 |
- >=dev-libs/libical-2.0.0:= |
289 |
- >=net-misc/curl-7.9.7 |
290 |
- ) |
291 |
- dbus? ( >=dev-libs/dbus-glib-0.60 ) |
292 |
- gdata? ( >=dev-libs/libgdata-0.17.2 ) |
293 |
- gnutls? ( >=net-libs/gnutls-3.0 ) |
294 |
- gtk3? ( x11-libs/gtk+:3 ) |
295 |
- !gtk3? ( >=x11-libs/gtk+-2.20:2 ) |
296 |
- imap? ( >=net-libs/libetpan-0.57 ) |
297 |
- ldap? ( >=net-nds/openldap-2.0.7 ) |
298 |
- nls? ( >=sys-devel/gettext-0.18 ) |
299 |
- nntp? ( >=net-libs/libetpan-0.57 ) |
300 |
- notification? ( |
301 |
- dev-libs/glib:2 |
302 |
- libcanberra? ( media-libs/libcanberra[gtk] ) |
303 |
- libindicate? ( dev-libs/libindicate:3[gtk] ) |
304 |
- libnotify? ( x11-libs/libnotify ) |
305 |
- ) |
306 |
- pda? ( >=app-pda/jpilot-0.99 ) |
307 |
- pdf? ( app-text/poppler[cairo] ) |
308 |
- pgp? ( >=app-crypt/gpgme-1.0.0 ) |
309 |
- session? ( |
310 |
- x11-libs/libICE |
311 |
- x11-libs/libSM |
312 |
- ) |
313 |
- smime? ( >=app-crypt/gpgme-1.0.0 ) |
314 |
- spam-report? ( >=net-misc/curl-7.9.7 ) |
315 |
- spell? ( >=app-text/enchant-1.0.0 ) |
316 |
- startup-notification? ( x11-libs/startup-notification ) |
317 |
- svg? ( >=gnome-base/librsvg-2.40.5 ) |
318 |
- valgrind? ( dev-util/valgrind ) |
319 |
-" |
320 |
- |
321 |
-DEPEND="${COMMONDEPEND} |
322 |
- app-arch/xz-utils |
323 |
- virtual/pkgconfig |
324 |
- xface? ( >=media-libs/compface-1.4 )" |
325 |
- |
326 |
-RDEPEND="${COMMONDEPEND} |
327 |
- app-misc/mime-types |
328 |
- x11-misc/shared-mime-info |
329 |
- clamav? ( app-antivirus/clamav ) |
330 |
- networkmanager? ( net-misc/networkmanager ) |
331 |
- pdf? ( app-text/ghostscript-gpl ) |
332 |
- perl? ( dev-lang/perl:= ) |
333 |
- python? ( |
334 |
- ${PYTHON_DEPS} |
335 |
- >=dev-python/pygtk-2.10.3 |
336 |
- ) |
337 |
- rss? ( |
338 |
- dev-libs/libxml2 |
339 |
- net-misc/curl |
340 |
- )" |
341 |
- |
342 |
-pkg_setup() { |
343 |
- use python && python-single-r1_pkg_setup |
344 |
-} |
345 |
- |
346 |
-src_prepare() { |
347 |
- default |
348 |
- eautoreconf |
349 |
-} |
350 |
- |
351 |
-src_configure() { |
352 |
- # Don't use libsoup-gnome (bug #565924) |
353 |
- export HAVE_LIBSOUP_GNOME=no |
354 |
- |
355 |
- local myeconfargs=( |
356 |
- --disable-bsfilter-plugin |
357 |
- --disable-fancy-plugin |
358 |
- --disable-generic-umpc |
359 |
- --enable-acpi_notifier-plugin |
360 |
- --enable-address_keeper-plugin |
361 |
- --enable-alternate-addressbook |
362 |
- --enable-att_remover-plugin |
363 |
- --enable-attachwarner-plugin |
364 |
- --enable-fetchinfo-plugin |
365 |
- --enable-mailmbox-plugin |
366 |
- --enable-newmail-plugin |
367 |
- --enable-tnef_parse-plugin |
368 |
- --with-password-encryption=$(usex gnutls gnutls old) |
369 |
- $(use_enable archive archive-plugin) |
370 |
- $(use_enable bogofilter bogofilter-plugin) |
371 |
- $(use_enable calendar vcalendar-plugin) |
372 |
- $(use_enable clamav clamd-plugin) |
373 |
- $(use_enable dbus) |
374 |
- $(use_enable debug crash-dialog) |
375 |
- $(use_enable doc manual) |
376 |
- $(use_enable gdata gdata-plugin) |
377 |
- $(use_enable gnutls) |
378 |
- $(use_enable gtk3) |
379 |
- $(use_enable ipv6) |
380 |
- $(use_enable ldap) |
381 |
- $(use_enable networkmanager) |
382 |
- $(use_enable nls) |
383 |
- $(use_enable notification notification-plugin) |
384 |
- $(use_enable pda jpilot) |
385 |
- $(use_enable pdf pdf_viewer-plugin) |
386 |
- $(use_enable perl perl-plugin) |
387 |
- $(use_enable pgp pgpcore-plugin) |
388 |
- $(use_enable pgp pgpinline-plugin) |
389 |
- $(use_enable pgp pgpmime-plugin) |
390 |
- $(use_enable python python-plugin) |
391 |
- $(use_enable rss rssyl-plugin) |
392 |
- $(use_enable session libsm) |
393 |
- $(use_enable sieve managesieve-plugin) |
394 |
- $(use_enable smime smime-plugin) |
395 |
- $(use_enable spam-report spam_report-plugin) |
396 |
- $(use_enable spamassassin spamassassin-plugin) |
397 |
- $(use_enable spell enchant) |
398 |
- $(use_enable startup-notification) |
399 |
- $(use_enable svg) |
400 |
- $(use_enable valgrind valgrind) |
401 |
- $(use_enable xface compface) |
402 |
- ) |
403 |
- |
404 |
- # libetpan is needed if user wants nntp or imap functionality |
405 |
- if use imap || use nntp ; then |
406 |
- myeconfargs+=( --enable-libetpan ) |
407 |
- else |
408 |
- myeconfargs+=( --disable-libetpan ) |
409 |
- fi |
410 |
- |
411 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
412 |
-} |
413 |
- |
414 |
-src_install() { |
415 |
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) |
416 |
- default |
417 |
- |
418 |
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps |
419 |
- # => also install it in /usr/share/pixmaps for other desktop envs |
420 |
- # => also install higher resolution icons in /usr/share/icons/hicolor/... |
421 |
- insinto /usr/share/pixmaps |
422 |
- doins ${PN}.png |
423 |
- local size |
424 |
- for size in 64 128 ; do |
425 |
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png |
426 |
- done |
427 |
- |
428 |
- docinto tools |
429 |
- dodoc tools/README* |
430 |
- |
431 |
- domenu ${PN}.desktop |
432 |
- |
433 |
- einfo "Installing extra tools" |
434 |
- cd "${S}"/tools |
435 |
- exeinto /usr/$(get_libdir)/${PN}/tools |
436 |
- doexe *.pl *.py *.conf *.sh |
437 |
- doexe tb2claws-mail update-po uudec uuooffice |
438 |
- |
439 |
- # kill useless files |
440 |
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la} |
441 |
-} |
442 |
- |
443 |
-pkg_preinst() { |
444 |
- gnome2_icon_savelist |
445 |
-} |
446 |
- |
447 |
-pkg_postinst() { |
448 |
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:" |
449 |
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags" |
450 |
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface" |
451 |
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely" |
452 |
- gnome2_icon_cache_update |
453 |
- xdg_desktop_database_update |
454 |
-} |
455 |
- |
456 |
-pkg_postrm() { |
457 |
- gnome2_icon_cache_update |
458 |
- xdg_desktop_database_update |
459 |
-} |
460 |
|
461 |
diff --git a/mail-client/claws-mail/claws-mail-3.16.0.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild |
462 |
deleted file mode 100644 |
463 |
index cc00879ebd7..00000000000 |
464 |
--- a/mail-client/claws-mail/claws-mail-3.16.0.ebuild |
465 |
+++ /dev/null |
466 |
@@ -1,205 +0,0 @@ |
467 |
-# Copyright 1999-2018 Gentoo Foundation |
468 |
-# Distributed under the terms of the GNU General Public License v2 |
469 |
- |
470 |
-EAPI=6 |
471 |
- |
472 |
-PYTHON_COMPAT=( python2_7 ) |
473 |
-inherit autotools gnome2-utils python-single-r1 xdg-utils |
474 |
- |
475 |
-DESCRIPTION="An email client (and news reader) based on GTK+" |
476 |
-HOMEPAGE="https://www.claws-mail.org/" |
477 |
- |
478 |
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" |
479 |
- |
480 |
-SLOT="0" |
481 |
-LICENSE="GPL-3" |
482 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
483 |
- |
484 |
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" |
485 |
-REQUIRED_USE="libcanberra? ( notification ) |
486 |
- libindicate? ( notification ) |
487 |
- libnotify? ( notification ) |
488 |
- networkmanager? ( dbus ) |
489 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
490 |
- smime? ( pgp )" |
491 |
- |
492 |
-COMMONDEPEND=" |
493 |
- net-mail/ytnef |
494 |
- archive? ( |
495 |
- app-arch/libarchive |
496 |
- >=net-misc/curl-7.9.7 |
497 |
- ) |
498 |
- bogofilter? ( mail-filter/bogofilter ) |
499 |
- calendar? ( |
500 |
- >=dev-libs/libical-2.0.0:= |
501 |
- >=net-misc/curl-7.9.7 |
502 |
- ) |
503 |
- dbus? ( >=dev-libs/dbus-glib-0.60 ) |
504 |
- gdata? ( >=dev-libs/libgdata-0.17.2 ) |
505 |
- gnutls? ( >=net-libs/gnutls-3.0 ) |
506 |
- gtk3? ( x11-libs/gtk+:3 ) |
507 |
- !gtk3? ( >=x11-libs/gtk+-2.20:2 ) |
508 |
- imap? ( >=net-libs/libetpan-0.57 ) |
509 |
- ldap? ( >=net-nds/openldap-2.0.7 ) |
510 |
- nls? ( >=sys-devel/gettext-0.18 ) |
511 |
- nntp? ( >=net-libs/libetpan-0.57 ) |
512 |
- notification? ( |
513 |
- dev-libs/glib:2 |
514 |
- libcanberra? ( media-libs/libcanberra[gtk] ) |
515 |
- libindicate? ( dev-libs/libindicate:3[gtk] ) |
516 |
- libnotify? ( x11-libs/libnotify ) |
517 |
- ) |
518 |
- pda? ( >=app-pda/jpilot-0.99 ) |
519 |
- pdf? ( app-text/poppler[cairo] ) |
520 |
- pgp? ( >=app-crypt/gpgme-1.0.0 ) |
521 |
- session? ( |
522 |
- x11-libs/libICE |
523 |
- x11-libs/libSM |
524 |
- ) |
525 |
- smime? ( >=app-crypt/gpgme-1.0.0 ) |
526 |
- spam-report? ( >=net-misc/curl-7.9.7 ) |
527 |
- spell? ( >=app-text/enchant-1.0.0 ) |
528 |
- startup-notification? ( x11-libs/startup-notification ) |
529 |
- svg? ( >=gnome-base/librsvg-2.40.5 ) |
530 |
- valgrind? ( dev-util/valgrind ) |
531 |
-" |
532 |
- |
533 |
-DEPEND="${COMMONDEPEND} |
534 |
- app-arch/xz-utils |
535 |
- virtual/pkgconfig |
536 |
- xface? ( >=media-libs/compface-1.4 )" |
537 |
- |
538 |
-RDEPEND="${COMMONDEPEND} |
539 |
- app-misc/mime-types |
540 |
- x11-misc/shared-mime-info |
541 |
- clamav? ( app-antivirus/clamav ) |
542 |
- networkmanager? ( net-misc/networkmanager ) |
543 |
- pdf? ( app-text/ghostscript-gpl ) |
544 |
- perl? ( dev-lang/perl:= ) |
545 |
- python? ( |
546 |
- ${PYTHON_DEPS} |
547 |
- >=dev-python/pygtk-2.10.3 |
548 |
- ) |
549 |
- rss? ( |
550 |
- dev-libs/libxml2 |
551 |
- net-misc/curl |
552 |
- )" |
553 |
- |
554 |
-pkg_setup() { |
555 |
- use python && python-single-r1_pkg_setup |
556 |
-} |
557 |
- |
558 |
-src_prepare() { |
559 |
- default |
560 |
- eautoreconf |
561 |
-} |
562 |
- |
563 |
-src_configure() { |
564 |
- # Don't use libsoup-gnome (bug #565924) |
565 |
- export HAVE_LIBSOUP_GNOME=no |
566 |
- |
567 |
- local myeconfargs=( |
568 |
- --disable-bsfilter-plugin |
569 |
- --disable-fancy-plugin |
570 |
- --disable-generic-umpc |
571 |
- --enable-acpi_notifier-plugin |
572 |
- --enable-address_keeper-plugin |
573 |
- --enable-alternate-addressbook |
574 |
- --enable-att_remover-plugin |
575 |
- --enable-attachwarner-plugin |
576 |
- --enable-fetchinfo-plugin |
577 |
- --enable-mailmbox-plugin |
578 |
- --enable-newmail-plugin |
579 |
- --enable-tnef_parse-plugin |
580 |
- --with-password-encryption=$(usex gnutls gnutls old) |
581 |
- $(use_enable archive archive-plugin) |
582 |
- $(use_enable bogofilter bogofilter-plugin) |
583 |
- $(use_enable calendar vcalendar-plugin) |
584 |
- $(use_enable clamav clamd-plugin) |
585 |
- $(use_enable dbus) |
586 |
- $(use_enable debug crash-dialog) |
587 |
- $(use_enable doc manual) |
588 |
- $(use_enable gdata gdata-plugin) |
589 |
- $(use_enable gnutls) |
590 |
- $(use_enable gtk3) |
591 |
- $(use_enable ipv6) |
592 |
- $(use_enable ldap) |
593 |
- $(use_enable networkmanager) |
594 |
- $(use_enable nls) |
595 |
- $(use_enable notification notification-plugin) |
596 |
- $(use_enable pda jpilot) |
597 |
- $(use_enable pdf pdf_viewer-plugin) |
598 |
- $(use_enable perl perl-plugin) |
599 |
- $(use_enable pgp pgpcore-plugin) |
600 |
- $(use_enable pgp pgpinline-plugin) |
601 |
- $(use_enable pgp pgpmime-plugin) |
602 |
- $(use_enable python python-plugin) |
603 |
- $(use_enable rss rssyl-plugin) |
604 |
- $(use_enable session libsm) |
605 |
- $(use_enable sieve managesieve-plugin) |
606 |
- $(use_enable smime smime-plugin) |
607 |
- $(use_enable spam-report spam_report-plugin) |
608 |
- $(use_enable spamassassin spamassassin-plugin) |
609 |
- $(use_enable spell enchant) |
610 |
- $(use_enable startup-notification) |
611 |
- $(use_enable svg) |
612 |
- $(use_enable valgrind valgrind) |
613 |
- $(use_enable xface compface) |
614 |
- ) |
615 |
- |
616 |
- # libetpan is needed if user wants nntp or imap functionality |
617 |
- if use imap || use nntp ; then |
618 |
- myeconfargs+=( --enable-libetpan ) |
619 |
- else |
620 |
- myeconfargs+=( --disable-libetpan ) |
621 |
- fi |
622 |
- |
623 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
624 |
-} |
625 |
- |
626 |
-src_install() { |
627 |
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) |
628 |
- default |
629 |
- |
630 |
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps |
631 |
- # => also install it in /usr/share/pixmaps for other desktop envs |
632 |
- # => also install higher resolution icons in /usr/share/icons/hicolor/... |
633 |
- insinto /usr/share/pixmaps |
634 |
- doins ${PN}.png |
635 |
- local size |
636 |
- for size in 64 128 ; do |
637 |
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png |
638 |
- done |
639 |
- |
640 |
- docinto tools |
641 |
- dodoc tools/README* |
642 |
- |
643 |
- domenu ${PN}.desktop |
644 |
- |
645 |
- einfo "Installing extra tools" |
646 |
- cd "${S}"/tools |
647 |
- exeinto /usr/$(get_libdir)/${PN}/tools |
648 |
- doexe *.pl *.py *.conf *.sh |
649 |
- doexe tb2claws-mail update-po uudec uuooffice |
650 |
- |
651 |
- # kill useless files |
652 |
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la} |
653 |
-} |
654 |
- |
655 |
-pkg_preinst() { |
656 |
- gnome2_icon_savelist |
657 |
-} |
658 |
- |
659 |
-pkg_postinst() { |
660 |
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:" |
661 |
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags" |
662 |
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface" |
663 |
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely" |
664 |
- gnome2_icon_cache_update |
665 |
- xdg_desktop_database_update |
666 |
-} |
667 |
- |
668 |
-pkg_postrm() { |
669 |
- gnome2_icon_cache_update |
670 |
- xdg_desktop_database_update |
671 |
-} |
672 |
|
673 |
diff --git a/mail-client/claws-mail/claws-mail-3.17.2.ebuild b/mail-client/claws-mail/claws-mail-3.17.2.ebuild |
674 |
deleted file mode 100644 |
675 |
index ba540a3ae23..00000000000 |
676 |
--- a/mail-client/claws-mail/claws-mail-3.17.2.ebuild |
677 |
+++ /dev/null |
678 |
@@ -1,211 +0,0 @@ |
679 |
-# Copyright 1999-2018 Gentoo Authors |
680 |
-# Distributed under the terms of the GNU General Public License v2 |
681 |
- |
682 |
-EAPI=6 |
683 |
- |
684 |
-PYTHON_COMPAT=( python2_7 ) |
685 |
-inherit autotools gnome2-utils python-single-r1 xdg-utils |
686 |
- |
687 |
-DESCRIPTION="An email client (and news reader) based on GTK+" |
688 |
-HOMEPAGE="https://www.claws-mail.org/" |
689 |
- |
690 |
-if [[ "${PV}" == 9999 ]] ; then |
691 |
- inherit git-r3 |
692 |
- EGIT_REPO_URI="git://git.claws-mail.org/claws.git" |
693 |
-else |
694 |
- SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" |
695 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
696 |
-fi |
697 |
- |
698 |
-SLOT="0" |
699 |
-LICENSE="GPL-3" |
700 |
- |
701 |
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" |
702 |
-REQUIRED_USE="libcanberra? ( notification ) |
703 |
- libindicate? ( notification ) |
704 |
- libnotify? ( notification ) |
705 |
- networkmanager? ( dbus ) |
706 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
707 |
- smime? ( pgp )" |
708 |
- |
709 |
-COMMONDEPEND=" |
710 |
- dev-libs/nettle |
711 |
- net-mail/ytnef |
712 |
- >=x11-libs/gtk+-2.24:2 |
713 |
- archive? ( |
714 |
- app-arch/libarchive |
715 |
- >=net-misc/curl-7.9.7 |
716 |
- ) |
717 |
- bogofilter? ( mail-filter/bogofilter ) |
718 |
- calendar? ( |
719 |
- >=dev-libs/libical-2.0.0:= |
720 |
- >=net-misc/curl-7.9.7 |
721 |
- ) |
722 |
- dbus? ( >=dev-libs/dbus-glib-0.60 ) |
723 |
- gdata? ( >=dev-libs/libgdata-0.17.2 ) |
724 |
- dillo? ( www-client/dillo ) |
725 |
- gnutls? ( >=net-libs/gnutls-3.0 ) |
726 |
- imap? ( >=net-libs/libetpan-0.57 ) |
727 |
- ldap? ( >=net-nds/openldap-2.0.7 ) |
728 |
- nls? ( >=sys-devel/gettext-0.18 ) |
729 |
- nntp? ( >=net-libs/libetpan-0.57 ) |
730 |
- notification? ( |
731 |
- dev-libs/glib:2 |
732 |
- libcanberra? ( media-libs/libcanberra[gtk] ) |
733 |
- libindicate? ( dev-libs/libindicate:3[gtk] ) |
734 |
- libnotify? ( x11-libs/libnotify ) |
735 |
- ) |
736 |
- pda? ( >=app-pda/jpilot-0.99 ) |
737 |
- pdf? ( app-text/poppler[cairo] ) |
738 |
- pgp? ( >=app-crypt/gpgme-1.0.0 ) |
739 |
- session? ( |
740 |
- x11-libs/libICE |
741 |
- x11-libs/libSM |
742 |
- ) |
743 |
- smime? ( >=app-crypt/gpgme-1.0.0 ) |
744 |
- spam-report? ( >=net-misc/curl-7.9.7 ) |
745 |
- spell? ( >=app-text/enchant-1.0.0 ) |
746 |
- startup-notification? ( x11-libs/startup-notification ) |
747 |
- svg? ( >=gnome-base/librsvg-2.40.5 ) |
748 |
- valgrind? ( dev-util/valgrind ) |
749 |
-" |
750 |
- |
751 |
-DEPEND="${COMMONDEPEND} |
752 |
- app-arch/xz-utils |
753 |
- virtual/pkgconfig |
754 |
- xface? ( >=media-libs/compface-1.4 )" |
755 |
- |
756 |
-RDEPEND="${COMMONDEPEND} |
757 |
- app-misc/mime-types |
758 |
- x11-misc/shared-mime-info |
759 |
- clamav? ( app-antivirus/clamav ) |
760 |
- networkmanager? ( net-misc/networkmanager ) |
761 |
- pdf? ( app-text/ghostscript-gpl ) |
762 |
- perl? ( dev-lang/perl:= ) |
763 |
- python? ( |
764 |
- ${PYTHON_DEPS} |
765 |
- >=dev-python/pygtk-2.10.3 |
766 |
- ) |
767 |
- rss? ( |
768 |
- dev-libs/libxml2 |
769 |
- net-misc/curl |
770 |
- )" |
771 |
- |
772 |
-pkg_setup() { |
773 |
- use python && python-single-r1_pkg_setup |
774 |
-} |
775 |
- |
776 |
-src_prepare() { |
777 |
- default |
778 |
- eautoreconf |
779 |
-} |
780 |
- |
781 |
-src_configure() { |
782 |
- # Don't use libsoup-gnome (bug #565924) |
783 |
- export HAVE_LIBSOUP_GNOME=no |
784 |
- |
785 |
- local myeconfargs=( |
786 |
- --disable-bsfilter-plugin |
787 |
- --disable-fancy-plugin |
788 |
- --disable-generic-umpc |
789 |
- --enable-acpi_notifier-plugin |
790 |
- --enable-address_keeper-plugin |
791 |
- --enable-alternate-addressbook |
792 |
- --enable-att_remover-plugin |
793 |
- --enable-attachwarner-plugin |
794 |
- --enable-fetchinfo-plugin |
795 |
- --enable-mailmbox-plugin |
796 |
- --enable-newmail-plugin |
797 |
- --enable-tnef_parse-plugin |
798 |
- --with-password-encryption=$(usex gnutls gnutls old) |
799 |
- $(use_enable archive archive-plugin) |
800 |
- $(use_enable bogofilter bogofilter-plugin) |
801 |
- $(use_enable calendar vcalendar-plugin) |
802 |
- $(use_enable clamav clamd-plugin) |
803 |
- $(use_enable dbus) |
804 |
- $(use_enable debug crash-dialog) |
805 |
- $(use_enable dillo dillo-plugin) |
806 |
- $(use_enable doc manual) |
807 |
- $(use_enable gdata gdata-plugin) |
808 |
- $(use_enable gnutls) |
809 |
- $(use_enable ipv6) |
810 |
- $(use_enable ldap) |
811 |
- $(use_enable networkmanager) |
812 |
- $(use_enable nls) |
813 |
- $(use_enable notification notification-plugin) |
814 |
- $(use_enable pda jpilot) |
815 |
- $(use_enable pdf pdf_viewer-plugin) |
816 |
- $(use_enable perl perl-plugin) |
817 |
- $(use_enable pgp pgpcore-plugin) |
818 |
- $(use_enable pgp pgpinline-plugin) |
819 |
- $(use_enable pgp pgpmime-plugin) |
820 |
- $(use_enable python python-plugin) |
821 |
- $(use_enable rss rssyl-plugin) |
822 |
- $(use_enable session libsm) |
823 |
- $(use_enable sieve managesieve-plugin) |
824 |
- $(use_enable smime smime-plugin) |
825 |
- $(use_enable spam-report spam_report-plugin) |
826 |
- $(use_enable spamassassin spamassassin-plugin) |
827 |
- $(use_enable spell enchant) |
828 |
- $(use_enable startup-notification) |
829 |
- $(use_enable svg) |
830 |
- $(use_enable valgrind valgrind) |
831 |
- $(use_enable xface compface) |
832 |
- ) |
833 |
- |
834 |
- # libetpan is needed if user wants nntp or imap functionality |
835 |
- if use imap || use nntp ; then |
836 |
- myeconfargs+=( --enable-libetpan ) |
837 |
- else |
838 |
- myeconfargs+=( --disable-libetpan ) |
839 |
- fi |
840 |
- |
841 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
842 |
-} |
843 |
- |
844 |
-src_install() { |
845 |
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) |
846 |
- default |
847 |
- |
848 |
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps |
849 |
- # => also install it in /usr/share/pixmaps for other desktop envs |
850 |
- # => also install higher resolution icons in /usr/share/icons/hicolor/... |
851 |
- insinto /usr/share/pixmaps |
852 |
- doins ${PN}.png |
853 |
- local size |
854 |
- for size in 64 128 ; do |
855 |
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png |
856 |
- done |
857 |
- |
858 |
- docinto tools |
859 |
- dodoc tools/README* |
860 |
- |
861 |
- domenu ${PN}.desktop |
862 |
- |
863 |
- einfo "Installing extra tools" |
864 |
- cd "${S}"/tools || die |
865 |
- exeinto /usr/$(get_libdir)/${PN}/tools |
866 |
- doexe *.pl *.py *.conf *.sh |
867 |
- doexe tb2claws-mail update-po uudec uuooffice |
868 |
- |
869 |
- # kill useless files |
870 |
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la} |
871 |
-} |
872 |
- |
873 |
-pkg_preinst() { |
874 |
- gnome2_icon_savelist |
875 |
-} |
876 |
- |
877 |
-pkg_postinst() { |
878 |
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:" |
879 |
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags" |
880 |
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface" |
881 |
- ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely" |
882 |
- gnome2_icon_cache_update |
883 |
- xdg_desktop_database_update |
884 |
-} |
885 |
- |
886 |
-pkg_postrm() { |
887 |
- gnome2_icon_cache_update |
888 |
- xdg_desktop_database_update |
889 |
-} |
890 |
|
891 |
diff --git a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch |
892 |
deleted file mode 100644 |
893 |
index b19bf8f39d6..00000000000 |
894 |
--- a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch |
895 |
+++ /dev/null |
896 |
@@ -1,80 +0,0 @@ |
897 |
-From: Ricardo Mones <ricardo@×××××.org> |
898 |
-Date: Wed, 9 Aug 2017 14:48:38 +0000 (+0200) |
899 |
-Subject: Fix bug #3855: segfault at startup with old profile and IMAP account |
900 |
-X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=667c9d3eaf0487193cc7873e6d3a63959a03d7f9;hp=63677adb68c57479f6bc7534cfbf2f234b1f4fb1 |
901 |
- |
902 |
-Fix bug #3855: segfault at startup with old profile and IMAP account |
903 |
- |
904 |
-Revert "Remove duplicated code and include". |
905 |
- |
906 |
-This reverts commit 300f811f3bbf10455ca55d9b01da6705dd1e07bb. |
907 |
---- |
908 |
- |
909 |
-diff --git a/src/imap.c b/src/imap.c |
910 |
-index 0e1e777..25bb283 100644 |
911 |
---- a/src/imap.c |
912 |
-+++ b/src/imap.c |
913 |
-@@ -77,6 +77,8 @@ typedef struct _IMAPSession IMAPSession; |
914 |
- typedef struct _IMAPNameSpace IMAPNameSpace; |
915 |
- typedef struct _IMAPFolderItem IMAPFolderItem; |
916 |
- |
917 |
-+#include "prefs_account.h" |
918 |
-+ |
919 |
- #define IMAP_FOLDER(obj) ((IMAPFolder *)obj) |
920 |
- #define IMAP_FOLDER_ITEM(obj) ((IMAPFolderItem *)obj) |
921 |
- #define IMAP_SESSION(obj) ((IMAPSession *)obj) |
922 |
-@@ -425,6 +427,7 @@ static gint imap_get_flags (Folder *folder, |
923 |
- FolderItem *item, |
924 |
- MsgInfoList *msglist, |
925 |
- GHashTable *msgflags); |
926 |
-+static gchar *imap_folder_get_path (Folder *folder); |
927 |
- static gchar *imap_item_get_path (Folder *folder, |
928 |
- FolderItem *item); |
929 |
- static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item); |
930 |
-@@ -3042,6 +3045,35 @@ static FolderItem *imap_create_special_folder(Folder *folder, |
931 |
- return new_item; |
932 |
- } |
933 |
- |
934 |
-+static gchar *imap_folder_get_path(Folder *folder) |
935 |
-+{ |
936 |
-+ gchar *folder_path; |
937 |
-+ |
938 |
-+ g_return_val_if_fail(folder != NULL, NULL); |
939 |
-+ g_return_val_if_fail(folder->account != NULL, NULL); |
940 |
-+ |
941 |
-+#ifdef G_OS_WIN32 |
942 |
-+ gchar *sanitized_dirname = g_strdup(folder->account->recv_server); |
943 |
-+ g_strdelimit(sanitized_dirname, ":", ','); |
944 |
-+#endif |
945 |
-+ |
946 |
-+ folder_path = g_strconcat(get_imap_cache_dir(), |
947 |
-+ G_DIR_SEPARATOR_S, |
948 |
-+#ifdef G_OS_WIN32 |
949 |
-+ sanitized_dirname, |
950 |
-+#else |
951 |
-+ folder->account->recv_server, |
952 |
-+#endif |
953 |
-+ G_DIR_SEPARATOR_S, |
954 |
-+ folder->account->userid, |
955 |
-+ NULL); |
956 |
-+ |
957 |
-+#ifdef G_OS_WIN32 |
958 |
-+ g_free(sanitized_dirname); |
959 |
-+#endif |
960 |
-+ return folder_path; |
961 |
-+} |
962 |
-+ |
963 |
- #ifdef G_OS_WIN32 |
964 |
- static gchar *imap_encode_unsafe_chars(const gchar *str) |
965 |
- { |
966 |
-@@ -3078,9 +3110,8 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item) |
967 |
- gchar *item_path = NULL; |
968 |
- |
969 |
- g_return_val_if_fail(folder != NULL, NULL); |
970 |
-- g_return_val_if_fail(folder->account != NULL, NULL); |
971 |
- g_return_val_if_fail(item != NULL, NULL); |
972 |
-- folder_path = prefs_account_cache_dir(folder->account, FALSE); |
973 |
-+ folder_path = imap_folder_get_path(folder); |
974 |
- |
975 |
- g_return_val_if_fail(folder_path != NULL, NULL); |
976 |
- |