mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-30 14:26:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: alpine: Update to 2.26.

Browse source 
* gnu/packages/mail.scm (alpine): Update to 2.26.
[source]: Remove patch.
* gnu/packages/patches/alpine-fix-privacy-policy-crash.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
Tobias Geerinckx-Rice 2022-06-05 02:00:01 +02:00
parent 4cb22c07d2
commit cb475aea08
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
3 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -848,7 +848,6 @@ dist_patch_DATA = \
%D%/packages/patches/akonadi-not-relocatable.patch \
%D%/packages/patches/akonadi-timestamps.patch \
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
%D%/packages/patches/alpine-fix-privacy-policy-crash.patch \
%D%/packages/patches/anki-mpv-args.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \

8
gnu/packages/mail.scm
View file

@ -3670,7 +3670,7 @@ (define-public swaks
(define-public alpine
(package
(name "alpine")
(version "2.25")
(version "2.26")
(source
(origin
(method git-fetch)
@ -3683,14 +3683,12 @@ (define-public alpine
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0z6dp3cpz1dmbxw41ravsx1bxychafp0ij8gvj96mzz7rm9pdnq3"))
(base32 "1padh9kgn9blzjf0016i2f15c615fk17m8vg8kx301jhmc2r973h"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove pre-built binaries scattered across the source repository.
(for-each delete-file (find-files "." "\\.(dll|exe)"))))
(patches
(search-patches "alpine-fix-privacy-policy-crash.patch"))))
(for-each delete-file (find-files "." "\\.(dll|exe)"))))))
(build-system gnu-build-system)
(arguments
`(#:make-flags

39
gnu/packages/patches/alpine-fix-privacy-policy-crash.patch
View file

@ -1,39 +0,0 @@
X-Git-Url: https://repo.or.cz/alpine.git/blobdiff_plain/fb2217ac67706e4cbef69bea41041e2fb8b910e9..3ee981816abfb7d47ffc0ac522fff002b5749b72:/alpine/help.c
diff --git a/alpine/help.c b/alpine/help.c
index 4f1bf46..e9c7b34 100644
--- a/alpine/help.c
+++ b/alpine/help.c
@@ -36,6 +36,7 @@ static char rcsid[] = "$Id: help.c 1032 2008-04-11 00:30:04Z hubert@u.washington
#include "../pith/detoken.h"
#include "../pith/list.h"
#include "../pith/margin.h"
+#include "../pith/busy.h"
typedef struct _help_scroll {
@@ -135,10 +136,12 @@ helper_internal(HelpType text, char *frag, char *title, int flags)
is_external = 0;
if(shown_text && *shown_text && !struncmp(*shown_text, "x-alpine-http:", 14)){
- int status;
+ int status, we_cancel = 0;
+
+ we_cancel = busy_cue(_("Retrieving help text"), NULL, 1);
HTTPSTREAM *stream = http_open(*shown_text + 14);
if(stream) help_text = http_get(stream, NULL);
- status = stream->status ? stream->status->code : -1;
+ status = stream && stream->status ? stream->status->code : -1;
if(stream) http_close(stream);
if(status != HTTP_OK){
shown_text = NO_HELP;
@@ -165,7 +168,8 @@ helper_internal(HelpType text, char *frag, char *title, int flags)
*rv = NULL;
}
}
-
+ if(we_cancel)
+ cancel_busy_cue(-1);
}
if(F_ON(F_BLANK_KEYMENU,ps_global)){