diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch')
| -rw-r--r-- | gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch b/gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch new file mode 100644 index 0000000000..c7a8e05aae --- /dev/null +++ b/gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch @@ -0,0 +1,43 @@ +From 8110ebd55d5bf659cd40dab2df59d80dafdb367a Mon Sep 17 00:00:00 2001 +From: Kevin Layer <[email protected]> +Date: Mon, 10 Feb 2014 11:10:42 -0800 +Subject: [PATCH 2/2] fix bugs in rfe12668 implementation + +The previous commit added :embed and :keygen but they were already +there. Resolve this issue. + +Change-Id: Ieb962a12880394e67d973835945005446833fab7 +--- + aserve/htmlgen/htmlgen.cl | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/aserve/htmlgen/htmlgen.cl b/aserve/htmlgen/htmlgen.cl +index 0c0d6e8..f77d6de 100644 +--- a/aserve/htmlgen/htmlgen.cl ++++ b/aserve/htmlgen/htmlgen.cl +@@ -658,7 +658,6 @@ + (def-std-html :dt t nil) + + (def-std-html :em t nil) +-(def-std-html :embed t nil) + + (def-std-html :fieldset t nil) + (def-std-html :font t nil) +@@ -685,7 +684,6 @@ + (def-std-html :isindex nil nil) + + (def-std-html :kbd t nil) +-(def-std-html :keygen nil nil) + + (def-std-html :label t nil) + (def-std-html :layer t nil) +@@ -782,5 +780,5 @@ + (def-std-html :menuitem t nil) + (def-std-html :details t nil) + (def-std-html :datalist t nil) +-(def-std-html :keygen t nil) ++(def-std-html :keygen nil nil) + (def-std-html :output t nil) +-- +2.25.1 + |