From patchwork Sat Dec 11 08:09:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Foo Chuan Wei X-Patchwork-Id: 35125 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 300F227BBEA; Sat, 11 Dec 2021 08:11:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 197F927BBE9 for ; Sat, 11 Dec 2021 08:11:52 +0000 (GMT) Received: from localhost ([::1]:42078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvxTz-00016t-4O for patchwork@mira.cbaines.net; Sat, 11 Dec 2021 03:11:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvxSF-0008KQ-DS for guix-patches@gnu.org; Sat, 11 Dec 2021 03:10:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvxSE-0004Kt-Oi for guix-patches@gnu.org; Sat, 11 Dec 2021 03:10:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvxSE-0003W2-Jr for guix-patches@gnu.org; Sat, 11 Dec 2021 03:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52425] [PATCH] gnu: sbcl-aserve: Add HTML5 elements to htmlgen. Resent-From: Foo Chuan Wei Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Dec 2021 08:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52425 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52425@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163921019513481 (code B ref -1); Sat, 11 Dec 2021 08:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Dec 2021 08:09:55 +0000 Received: from localhost ([127.0.0.1]:48451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvxS7-0003VN-Au for submit@debbugs.gnu.org; Sat, 11 Dec 2021 03:09:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:42026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvxS1-0003Uz-HW for submit@debbugs.gnu.org; Sat, 11 Dec 2021 03:09:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvxRx-0008G2-PK for guix-patches@gnu.org; Sat, 11 Dec 2021 03:09:47 -0500 Received: from mail-oln040092255044.outbound.protection.outlook.com ([40.92.255.44]:13920 helo=APC01-HK2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvxRu-0004Gu-AT for guix-patches@gnu.org; Sat, 11 Dec 2021 03:09:45 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TsT2FwZ1eDbxG9WyEAg3jmKn+pmShTQ2plNt+dfwDnw93olzcngp5J1SxmDxZoz3esJvwJ7wR+SFPIMNdzUKgKQVPl7PHo4sg+O86f7g9L51FCnwYrdQxjlkz1A1fK2fi+Iphjy86KAZfqsKFnz2OOMXPwS3snFocrgEwkBMXO2uFFN26g5mui3e5lxmdCv+h3pFdvhN+0ZkfjzTejYdmoFoxNsDWxbiJ8bBbfXWYEQH8y02eC1Xn6XV+lgxFdpMSaKT04aV2v4z0pbfcDDGSeeinaojDHwVjHovisK3mbfgG+/mWxdB+SH7ZtM1XoDjUkthAZECAmTfLVoZiso1Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FGfvY+mI5kB/rYQg2mxbIIjxSJ8mDsEKgQtPEoTrv7U=; b=aGvUebtd5+bP9QKYLThBYK4XsU3S1O5PSbsfoC2A3iDi3UjD9U5JeHfe6/33AAs2FVeftGMErdu8Qa6LLtFX5H9tyfP8P1eQ4NPgrQo8B844tbl9Tjh9k6/kd8Qtwij+7siWmksfpUahEd7hQSu/c8C6EUDXmjqh6iaf6xJp6CGasz4We42olyV7FDP45OXf2AYOBuZmqKsc8TFyfUMTQzW+TrZL0pgZ7jE3SHW7s0Tsz5NxlUrBV2MrLbETAmoZ6AvPe/4Uni1lwurr0DibONDYDKmaKEV7iqXvavb2Ji0UoZiCKpDr3eQtSQwNnW8bQzgnCxDp7dtevnWFx5vG8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FGfvY+mI5kB/rYQg2mxbIIjxSJ8mDsEKgQtPEoTrv7U=; b=jkDnYui67irjq6n9sr5sjIvA1dm1ndtTLGA23v69CUZmhAKO+K2Q61Pv/Fy/CxMSP9hmdZ8FSbR6K+m5RaMkh3bLEZMH9YV01F9eCK7cJdrqf+o3Hwf2mX479KFIUvEvVAguc4Op03IujjIgS4CBzFqGhfqrM3rHVAXPZO+0IbN1pCbJWkg/I5QbU40m4W2Qsk5oRjxvE0I0H0HhePWTjdA2Ku/0EABdWiEOzG3RVVaeSfhfdLPKQZyIEYlLVBdd66O5LlVWLml2/sv+bOCM8KcK6ut0P779YFAcgovqqxXoNvQKcf+1L6Cu0cUJ+DIchYo7NSPfNOzrCsXm1aAwaA== Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) by PU1PR01MB2028.apcprd01.prod.exchangelabs.com (2603:1096:803:1d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.13; Sat, 11 Dec 2021 08:09:03 +0000 Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::258d:e124:fd3a:40ee]) by PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::258d:e124:fd3a:40ee%7]) with mapi id 15.20.4755.027; Sat, 11 Dec 2021 08:09:03 +0000 Date: Sat, 11 Dec 2021 08:09:01 +0000 From: Foo Chuan Wei Message-ID: Mail-Followup-To: guix-patches@gnu.org Content-Disposition: inline X-TMN: [bQ8uLr9oDuHIEKpOxwXMGs7FrC5YTL5Q] X-ClientProxiedBy: SG2PR06CA0216.apcprd06.prod.outlook.com (2603:1096:4:68::24) To PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) X-Microsoft-Original-Message-ID: <20211211080901.3jhqxdvnt2p5tahq@main> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from main (61.6.253.42) by SG2PR06CA0216.apcprd06.prod.outlook.com (2603:1096:4:68::24) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Sat, 11 Dec 2021 08:09:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa3c46b4-7fa6-409c-9afe-08d9bc7d7ec9 X-MS-TrafficTypeDiagnostic: PU1PR01MB2028:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: whvSKDmFtc2OALFKHOCc/eJX45rFylPDMTnc79RJx+E4HPyw3pJIw8pgGnbgloCGTpiHp9ia1UigqoXYi7TlmMDo2DEMUSfzIaL0Nf/WvQKlQKqMqzP7seC905uTioyscQtjxHxgfcVu7NCLAdHN+eOsRK5liIOcG+ZgDx0RXEBdBWd+cXGwLPckgLsf77FinE0xFhLoVsQdzZR/khxMg1C3xpq5jxwCuoqH+7iAUmuVwfdqHiqQUmCI6QQRf2AhFwIupXEQD1Xt6u3LusoctOwL5ksUmot25vd26VHdFh6QVd9eG6iMb06y2OnErOsCEiq6CZoVOCfKcoAa8GdKDjBp7Ok3R4HT/lhdo/xX1E9vR69DFmAKkJoh3gxrrST8zisnYjMgXyj7RNAzPj6jjQsOiuPrSQz4GA2G8jKhPaey/d8pTBsyTmEr1KWjXsEADKoD2ZLDFVQRmv7aBbQB4XkqkQNdXoBMffk3cBWbeLsFGvt+VHDN9Xf4TRnksD5cW/70g96Zq361nve1/e/JAJ29HiM5vzInIWBfFboA8sWR+Xnec8JtBPaPh6TaWdaM9khuLXB3saS8zKG5SnOarscOeocny1fW3vfBDP4IH/tGRhtvrd6Jqyk2i72iHNRUKUI4glrcDHbtX4RD+heXxLSsvtDZcxEBW9PepK6QoWk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WFDQeMXMRaN2J7tUpuVmD12FfwcyY49r0CWXiKtfFmGyGnmdKShi2bJPA4SO/grnBC5zqLv1l74s/Em1sYqIOeNdZHVcYPjJTOxDt+R5D8NZM4PPAoKRGvbt+rxp1TSoJ5TzPa+JHKFiQlHHwsc5Zjrm/Y111Qvz3V6YH7FOkZSV4AsOZNWd/81gkbZqGYbvmGPxd0I6zkj8g0QV0K7l+hfsl/F8Yh1N7EpsqUA/qDbnwSw1wdWOlMWprMPvdr7tOgkRFGQWO/4X8yshhAPJ9chp/9VAaQ7fP2MnaQ58i+NghIqU7xg8seqLlT6MUKpVyzTGyBYGwoKk5rR29cM40/rIFnGHB5neUS4CZkn5gWbofEDDulgNaI6v6oise+hFGsVS7bhDg5f33CxxTf8eeuKiBe4kR7kIfdi4W+TQEK0quH8n+BYuoM+q4QpOAcPqcf7kdcdyEzWZanwJp+ui/2T7DMvROPuuDDiklfeNBLg9vzf66K2w9RNMfXP5aDqweCOjmQF+jlYmMNJ0bb6/dJ0s0KaeGsGHaFKvcQ2/NT4uOj9GiM6+27qBJRXybFIxHghQfnAhVfSQJYQ3G1U5aoTJFetK/iEWlcRN5SlVJ611VwYMJqvE9UYbUnip0tLyvky3RcN1ywoaO/Y0R9uD4mO60wd25kskIDN8M9gy9ht8jLVfsi3qgyiSfggbqfShi2zn/R/VpQPxESApDJ2glQ5q4LfwO/HaSqEp0nzoVlOhfQ+7vV5iXi3jM/LxtFQosSiNgV73xs8pEGFF5NC6InH3gThoUfjjVVUz1LvrRVOjMCejQkjGdv7fcVDbZU7M9gDfj4OiT75L3b1EU9mbAFivc/vLXEzX1ZeoxNAN1B77J0hcGW9OL6d7htmntzsgHWxwq/lNIKdT2sTPwT9cxifYEzNL4XXDqE6fhnX/GSsJtsuLk1yff8r0CFuOqwVn57JyOYu5zKej0/pEnNRRLw== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-d8e84.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: fa3c46b4-7fa6-409c-9afe-08d9bc7d7ec9 X-MS-Exchange-CrossTenant-AuthSource: PU1PR01MB2155.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2021 08:09:03.6499 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB2028 Received-SPF: pass client-ip=40.92.255.44; envelope-from=chuanwei.foo@hotmail.com; helo=APC01-HK2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lisp-xyz.scm (sbcl-aserve)[origin]: Add patches. * gnu/patches/sbcl-aserve-rfe12668-add-HTML-5-elements-to-htmlgen.patch: New file. * gnu/patches/sbcl-aserve-fix-bugs-in-rfe12668-implementation.patch: New file. --- sbcl-aserve's upstream, Portable AllegroServe, only supports HTML 4 elements. This patch adds support for HTML 5 elements by using patches obtained from Portable AllegroServe's upstream — https://github.com/franzinc/aserve/ gnu/packages/lisp-xyz.scm | 14 ++++- ...-fix-bugs-in-rfe12668-implementation.patch | 43 +++++++++++++ ...12668-add-HTML-5-elements-to-htmlgen.patch | 63 +++++++++++++++++++ 3 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/sbcl-aserve-fix-bugs-in-rfe12668-implementation.patch create mode 100644 gnu/packages/patches/sbcl-aserve-rfe12668-add-HTML-5-elements-to-htmlgen.patch base-commit: cfdf66e6bfc463b041965b64fc95174c90f046e0 diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 635f8e48cb..273e65dacd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17905,10 +17905,11 @@ functions allow Lisp programs to explore the web.") (define-public sbcl-aserve ;; There does not seem to be proper releases. - (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5")) + (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5") + (revision "2")) (package (name "sbcl-aserve") - (version (git-version "1.2.50" "1" commit)) + (version (git-version "1.2.50" revision commit)) (source (origin (method git-fetch) @@ -17919,7 +17920,14 @@ functions allow Lisp programs to explore the web.") (commit commit))) (file-name (git-file-name "aserve" version)) (sha256 - (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa")))) + (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa")) + (patches (search-patches + ;; Add HTML5 elements to htmlgen. + ;; Adapted from https://github.com/franzinc/aserve/ commits: + ;; * e47bd763: "rfe12668: add HTML 5 elements to htmlgen" + ;; * 7371ce59: "fix bugs in rfe12668 implementation" + "sbcl-aserve-rfe12668-add-HTML-5-elements-to-htmlgen.patch" + "sbcl-aserve-fix-bugs-in-rfe12668-implementation.patch")))) (build-system asdf-build-system/sbcl) (arguments `(#:phases diff --git a/gnu/packages/patches/sbcl-aserve-fix-bugs-in-rfe12668-implementation.patch b/gnu/packages/patches/sbcl-aserve-fix-bugs-in-rfe12668-implementation.patch new file mode 100644 index 0000000000..c7a8e05aae --- /dev/null +++ b/gnu/packages/patches/sbcl-aserve-fix-bugs-in-rfe12668-implementation.patch @@ -0,0 +1,43 @@ +From 8110ebd55d5bf659cd40dab2df59d80dafdb367a Mon Sep 17 00:00:00 2001 +From: Kevin Layer +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 + diff --git a/gnu/packages/patches/sbcl-aserve-rfe12668-add-HTML-5-elements-to-htmlgen.patch b/gnu/packages/patches/sbcl-aserve-rfe12668-add-HTML-5-elements-to-htmlgen.patch new file mode 100644 index 0000000000..93962e10ec --- /dev/null +++ b/gnu/packages/patches/sbcl-aserve-rfe12668-add-HTML-5-elements-to-htmlgen.patch @@ -0,0 +1,63 @@ +From 940679fb75073a59186099e3dd7fb381e727db6b Mon Sep 17 00:00:00 2001 +From: Kevin Layer +Date: Thu, 31 Oct 2013 04:27:29 -0700 +Subject: [PATCH 1/2] rfe12668: add HTML 5 elements to htmlgen + +Add the new elements listed here: + http://www.w3.org/TR/html5-diff/#new-elements + +Change-Id: I7f64363751130644caf90ecdd65c13175d77ae97 +--- + aserve/htmlgen/htmlgen.cl | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +diff --git a/aserve/htmlgen/htmlgen.cl b/aserve/htmlgen/htmlgen.cl +index 59248ef..0c0d6e8 100644 +--- a/aserve/htmlgen/htmlgen.cl ++++ b/aserve/htmlgen/htmlgen.cl +@@ -747,6 +747,40 @@ + + (def-std-html :var t nil) + +-(def-std-html :wbr nil nil) +- + (def-std-html :xmp t nil) ++ ++;; html 5 ++ ++(def-std-html :section t nil) ++(def-std-html :article t nil) ++(def-std-html :main t nil) ++(def-std-html :aside t nil) ++(def-std-html :hgroup t nil) ++(def-std-html :header t nil) ++(def-std-html :footer t nil) ++(def-std-html :nav t nil) ++(def-std-html :figure t nil) ++(def-std-html :figcaption t nil) ++ ++(def-std-html :video t nil) ++(def-std-html :audio t nil) ++(def-std-html :source t nil) ++(def-std-html :track t nil) ++(def-std-html :embed t nil) ++(def-std-html :mark t nil) ++(def-std-html :progress t nil) ++(def-std-html :meter t nil) ++(def-std-html :time t nil) ++(def-std-html :data t nil) ++(def-std-html :dialog t nil) ++(def-std-html :ruby t nil) ++(def-std-html :rt t nil) ++(def-std-html :rp t nil) ++(def-std-html :bdi t nil) ++(def-std-html :wbr nil nil) ++(def-std-html :canvas t nil) ++(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 :output t nil) +-- +2.25.1 +