guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.
commit db81b622f5d11475e3b313f4149f97aa9067e155
Author: John Kehayias <[email protected]>
AuthorDate: Mon Sep 22 22:37:12 2025 -0400
gnu: emacs-minimal: Fix test.
The included patch is already done upstream, just after the 30.2 release.
* gnu/packages/emacs.scm (emacs-minimal)[source]: Add patch.
* gnu/packages/patches/emacs-zoom-image-test-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I0134ec90a03f8757b4247b5aea0853752b67daef
---
gnu/local.mk | 1 +
gnu/packages/emacs.scm | 3 ++-
.../patches/emacs-zoom-image-test-fix.patch | 25 ++++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 068fd3d571..0e9a737f03 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1228,6 +1228,7 @@ dist_patch_DATA =
\
%D%/packages/patches/emacs-telega-path-placeholder.patch \
%D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
+ %D%/packages/patches/emacs-zoom-image-test-fix.patch \
%D%/packages/patches/enblend-enfuse-reproducible.patch \
%D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 776c11a350..5a7af4ea62 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -158,7 +158,8 @@
"emacs-native-comp-driver-options.patch"
"emacs-native-comp-fix-filenames.patch"
"emacs-native-comp-pin-packages.patch"
- "emacs-pgtk-super-key-fix.patch"))
+ "emacs-pgtk-super-key-fix.patch"
+ "emacs-zoom-image-test-fix.patch"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "lisp"
diff --git a/gnu/packages/patches/emacs-zoom-image-test-fix.patch
b/gnu/packages/patches/emacs-zoom-image-test-fix.patch
new file mode 100644
index 0000000000..b47cc4f800
--- /dev/null
+++ b/gnu/packages/patches/emacs-zoom-image-test-fix.patch
@@ -0,0 +1,25 @@
+From 462a541db904405ede8446c48ba0c71ad41c544d Mon Sep 17 00:00:00 2001
+From: Eli Zaretskii <[email protected]>
+Date: Thu, 17 Jul 2025 19:34:50 +0300
+Subject: [PATCH] ; * test/lisp/net/shr-tests.el (shr-test/zoom-image): Fix
+ <img> (bug#79041).
+
+---
+ test/lisp/net/shr-tests.el | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
+index 363cd144e8f3..a931d07a1631 100644
+--- a/test/lisp/net/shr-tests.el
++++ b/test/lisp/net/shr-tests.el
+@@ -145,8 +145,8 @@ settings, then once more for each (OPTION . VALUE) pair.")
+ (dolist (alt '(nil "" "nothing to see here"))
+ (with-temp-buffer
+ (ert-info ((format "image with alt=%S" alt))
+- (let ((attrs (if alt (format " alt=\"%s\"" alt) "")))
+- (insert (format "<img src=\"%s\" %s" image-url attrs)))
++ (let ((attrs (if alt (format " alt=\"%s\">" alt) ">")))
++ (insert (format "<img src=\"%s\"%s" image-url attrs)))
+ (cl-letf* (;; Pretend we're a graphical display.
+ ((symbol-function 'display-graphic-p) #'always)
+ ((symbol-function 'url-queue-retrieve)
