public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clawsMail: 3.17.1 -> 3.17.2

Browse Source
This commit is contained in:
Franz Pletz 2018-12-31 02:42:57 +01:00
parent 35ee5cb001
commit 8a13b97972
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/mailreaders/claws-mail/default.nix
View File

@ -31,11 +31,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "claws-mail-${version}"; name = "claws-mail-${version}";
version = "3.17.1"; version = "3.17.2";
src = fetchurl { src = fetchurl {
url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
sha256 = "1wknxbwyzm5xjh3cqmddcxmvp1rkp301qga5n5rgfi7vcd0myyvm"; sha256 = "1hb17kpvfl8f1y49zan0wvf4awapxg13bqbqwrbhq2n4xp445kr5";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

29
pkgs/applications/networking/mailreaders/claws-mail/mime.patch
View File

@ -1,15 +1,28 @@
--- a/src/procmime.c 2015-10-01 23:02:16.629908590 -0700 diff --git a/src/procmime.c b/src/procmime.c
+++ b/src/procmime.c 2015-10-01 23:02:46.932001337 -0700 index bd3239e..06a3b26 100644
@@ -1196,11 +1196,7 @@ --- a/src/procmime.c
+++ b/src/procmime.c
@@ -1144,20 +1144,16 @@ GList *procmime_get_mime_type_list(void)
MimeType *mime_type;
gboolean fp_is_glob_file = TRUE;
if (mime_type_list) if (mime_type_list)
return mime_type_list; return mime_type_list;
-
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) - if ((fp = claws_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
-#else -#else
- if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL) - if ((fp = claws_fopen("/usr/share/mime/globs", "rb")) == NULL)
-#endif -#endif
+ if ((fp = procmime_fopen("@MIMEROOTDIR@/mime/globs", "rb")) == NULL) +
+ if ((fp = claws_fopen("@MIMEROOTDIR@/mime/globs", "rb")) == NULL)
{ {
fp_is_glob_file = FALSE; fp_is_glob_file = FALSE;
if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) { if ((fp = claws_fopen("/etc/mime.types", "rb")) == NULL) {
if ((fp = claws_fopen(SYSCONFDIR "/mime.types", "rb"))
== NULL) {
FILE_OP_ERROR(SYSCONFDIR "/mime.types",
"claws_fopen");
return NULL;
}