TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: mailutils: Look up Scheme variables in the right module.

Browse source 
Fixes <https://issues.guix.gnu.org/49295>.
Reported by Maxime Devos <maximedevos@telenet.be>.

* gnu/packages/patches/mailutils-variable-lookup.patch: New file.
* gnu/packages/mail.scm (mailutils)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
Ludovic Courtès 2021-09-01 18:42:34 +02:00
parent 95c29d2746
commit a5fb1f4eeb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1435,6 +1435,7 @@ dist_patch_DATA = \
%D%/packages/patches/luit-posix.patch \
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/mailutils-fix-uninitialized-variable.patch \
%D%/packages/patches/mailutils-variable-lookup.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/marble-qt-add-qt-headers.patch \
%D%/packages/patches/mariadb-CVE-2021-27928.patch \

5
gnu/packages/mail.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
@ -269,7 +269,8 @@ (define-public mailutils
"17smrxjdgbbzbzakik30vj46q4iib85ksqhb82jr4vjp57akszh9"))
(patches
;; Fixes https://issues.guix.gnu.org/43088.
(search-patches "mailutils-fix-uninitialized-variable.patch"))))
(search-patches "mailutils-fix-uninitialized-variable.patch"
"mailutils-variable-lookup.patch"))))
(build-system gnu-build-system)
(arguments
`(#:phases

26
gnu/packages/patches/mailutils-variable-lookup.patch Normal file
View file

@ -0,0 +1,26 @@
Have 'send-message' look up 'mu-debug' & co. in the right
module: <https://issues.guix.gnu.org/49968>.
Submitted: https://lists.gnu.org/archive/html/bug-mailutils/2021-09/msg00000.html
---
include/mailutils/guile.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/mailutils/guile.h b/include/mailutils/guile.h
index f05550678..47f89db39 100644
--- a/include/mailutils/guile.h
+++ b/include/mailutils/guile.h
@@ -20,7 +20,8 @@
#include <libguile.h>
-#define MU_SCM_SYMBOL_VALUE(p) SCM_VARIABLE_REF(scm_c_lookup(p))
+#define MU_SCM_SYMBOL_VALUE(p) \
+ (scm_c_public_ref ("mailutils mailutils", p))
typedef struct
{
--
2.33.0