summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-10-15 17:37:26 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-10-15 17:37:43 +0200
commit5f4ee945c4f43c1810e2a6b878a12a5da2b8081e (patch)
tree285b6df070716e9932dfd0fdee55f1282a19afae /gnu/packages/patches/alpine-fix-privacy-policy-crash.patch
parentdfa2e5b44bb026a7dcbc29134b6831d611e41b86 (diff)
downloadguix-patches-5f4ee945c4f43c1810e2a6b878a12a5da2b8081e.tar
guix-patches-5f4ee945c4f43c1810e2a6b878a12a5da2b8081e.tar.gz
gnu: Actually add patch.
This follows up on ec2c7d454637257b0ad33f16a9573d53afe086d3. * gnu/packages/patches/alpine-fix-privacy-policy-crash.patch: New new file.
Diffstat (limited to 'gnu/packages/patches/alpine-fix-privacy-policy-crash.patch')
-rw-r--r--gnu/packages/patches/alpine-fix-privacy-policy-crash.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch b/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch
new file mode 100644
index 0000000000..d514ac33a0
--- /dev/null
+++ b/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch
@@ -0,0 +1,39 @@
+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)){