From unknown Fri Jun 20 07:28:24 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#72243 <72243@debbugs.gnu.org> To: bug#72243 <72243@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add xlink-xsd. Reply-To: bug#72243 <72243@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:28:24 +0000 retitle 72243 [PATCH] gnu: Add xlink-xsd. reassign 72243 guix-patches submitter 72243 gemmaro severity 72243 normal tag 72243 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 22 08:01:53 2024 Received: (at submit) by debbugs.gnu.org; 22 Jul 2024 12:01:53 +0000 Received: from localhost ([127.0.0.1]:57122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVrjl-0008Cm-AP for submit@debbugs.gnu.org; Mon, 22 Jul 2024 08:01:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:48958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVrjj-0008Cd-6c for submit@debbugs.gnu.org; Mon, 22 Jul 2024 08:01:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sVrhY-0000uH-FZ for guix-patches@gnu.org; Mon, 22 Jul 2024 07:59:36 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sVrhW-0005pc-Mt for guix-patches@gnu.org; Mon, 22 Jul 2024 07:59:36 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1fc611a0f8cso23204885ad.2 for ; Mon, 22 Jul 2024 04:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721649573; x=1722254373; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NloU7UDJHq8xlt4H8PvCiqZIIGINDCakJkLgjueRlPw=; b=YNdewOMJtfA2NCZH811kMz6iW1ZtyIlSX5z+yb2u0eXGFdNIBT1vMNX5B23HwKMrgo DzywLOF/EntKwdTQY4IY6M05yUiJWMBDArsnhWFAGA6O8A9P31ZgUzsrDYodcPOK4Ug5 EgMYLTkXczvBagCVF7LBI7NBEU2YPjbd6N+OMHTL0UYvLqOWQ1fdACoWSnfCDVo5rrN/ 9pNIVMnItypJrds4YDayxR4GbFrLfOPUUPtjDQLn2zLfiae7i6pOrGpv69QgqVy0lWKv nlRuUQOxtDMIJgWMt9VZ59BEXRW/wjyrSQOq7Q2WplmGr4R7sBIcMBpqzWdC3R5zHtzu iJ4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721649573; x=1722254373; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NloU7UDJHq8xlt4H8PvCiqZIIGINDCakJkLgjueRlPw=; b=VznjhHi2c3jg7TCLV+iaTMcA5eofR/lCqexc3IEgIHVTJnYNCvUtZ4Ut2XcdHIxKfA BWzHeVMvUHnPib71sHyEGrYp105eX+Hy0gFZClCs/+Os6JMJp70RGw2EKlv14gRZkCCx wXead4Tuuf/QXm5y2/NoX4hW4dxWTkRRY3tP1geEXccRbWWsdiJNsVRSkgXi5HhJWwx+ AKUZpX51KXARrNi6IfmCgvsC2MZEWEwPbiE77G0SmiKgWbJGlJsIIGw0gJNxceb9wyXJ FpmoR9FIg5+ZlNDNWKtNIzlM5v900JBEWftlBSi3qWrqifDcemoJFfg5O02KaU9X/+xm hknQ== X-Gm-Message-State: AOJu0Yxe9ROkvrHe9QWXWepzDsiE4Q+7gnRedjBbTFj7GgD7NIZiuMue tI4QPJKsOgRNn9vGk6zf96dNxXUFHSupvrFhifgUBS9+Eh4t6Dfcxfg7qXNi X-Google-Smtp-Source: AGHT+IFbU4qlbRiz60vMKig1d77l3Zm1G+G2A0ZS4CGZX/E/ypE3irKuTHSmQYpjuVEz80+ejQ+SmA== X-Received: by 2002:a17:903:234a:b0:1fb:68a2:a948 with SMTP id d9443c01a7336-1fd745985a3mr37635265ad.15.1721649572575; Mon, 22 Jul 2024 04:59:32 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f48ff9fsm52691315ad.289.2024.07.22.04.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 04:59:32 -0700 (PDT) From: gemmaro To: guix-patches@gnu.org Subject: [PATCH] gnu: Add xlink-xsd. Date: Mon, 22 Jul 2024 20:59:01 +0900 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=gemmaro.dev@gmail.com; helo=mail-pl1-x633.google.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/xml.scm (xlink-xsd): New variable. Change-Id: If18f2018bd205134ea7d7d627b0d09c87c108415 --- gnu/packages/xml.scm | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 85edcf0f7d..3c14a677af 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -85,7 +85,8 @@ (define-module (gnu packages xml) #:use-module (guix deprecation) #:use-module (guix utils) #:use-module (gnu packages linux) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (ice-9 regex)) (define-public libxmlb (package @@ -1993,3 +1994,44 @@ (define-public xml-namespace-xsd schema language defined by the XML Schema Recommendation Second Edition of 28 October 2004.") (license license:w3c))) + +(define-public xlink-xsd + (package + (name "xlink-xsd") + (version "1.1-2008-06") + (source + (origin + (method url-fetch) + (uri (let* ((matches (string-match + "[0-9]+.[0-9]+-([0-9]{4})-([0-9]{2})" version)) + (year (match:substring matches 1)) + (month (match:substring matches 2))) + (string-append "https://www.w3.org/XML/" year "/" month + "/xlink.xsd"))) + (sha256 + (base32 "0jpjha5iiq4rf4hx3qfnmyya9cf17ysxz0rbhsffn5nwgxnghgf8")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("xlink.xsd" "/xml/dtd/xlink/xlink.xsd") + ("catalog.xml" "/xml/dtd/xlink/catalog.xml")) + #:phases #~(modify-phases %standard-phases + (add-before 'install 'create-catalog + (lambda _ + (invoke "xmlcatalog" + "--noout" + "--create" + "--add" + "uri" + "http://www.w3.org/1999/xlink.xsd" + "xlink.xsd" + "catalog.xml")))))) + (native-inputs (list libxml2)) + (home-page "https://www.w3.org/TR/xlink/") + (synopsis "XML Schema for XML Linking language") + (description + "This package provides an XML Schema document and its catalog file for +the XML Linking Language (XLink). It provides the XLink-1.1 specific +declarations and definitions for use in defining linking elements +which conform to the XLink specification.") + (license license:w3c))) base-commit: e5c0b62debc6f48a32a65736d9ba3da0b1e59cb9 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 22 10:36:56 2024 Received: (at 72243) by debbugs.gnu.org; 22 Jul 2024 14:36:56 +0000 Received: from localhost ([127.0.0.1]:58414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVu9n-0004Ed-S0 for submit@debbugs.gnu.org; Mon, 22 Jul 2024 10:36:56 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:37266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVu9l-0004ES-3w for 72243@debbugs.gnu.org; Mon, 22 Jul 2024 10:36:53 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 36151202D2; Mon, 22 Jul 2024 16:36:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 00EE580099; Mon, 22 Jul 2024 16:36:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id o_GEZA4bZmAm; Mon, 22 Jul 2024 16:36:46 +0200 (CEST) Received: from [192.168.1.239] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 4FAAA80095; Mon, 22 Jul 2024 16:36:46 +0200 (CEST) Message-ID: <65b5c438-b3a7-44bd-a072-78d81691e850@makinata.eu> Date: Mon, 22 Jul 2024 15:36:45 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [bug#72243] [PATCH] gnu: Add xlink-xsd. To: gemmaro References: Content-Language: en-US From: Bruno Victal In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72243 Cc: 72243@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi gemmaro, On 2024-07-22 12:59, gemmaro wrote: > +(define-public xlink-xsd > + (package > + (name "xlink-xsd") > + (version "1.1-2008-06") > + (source > + (origin > + (method url-fetch) > + (uri (let* ((matches (string-match > + "[0-9]+.[0-9]+-([0-9]{4})-([0-9]{2})" version)) > + (year (match:substring matches 1)) > + (month (match:substring matches 2))) > + (string-append "https://www.w3.org/XML/" year "/" month > + "/xlink.xsd"))) Perhaps something like: --8<---------------cut here---------------start------------->8--- (define-public … (let* ((year …) (month …) (version (string-join (list "1.1" year month) "-"))) (package …))) --8<---------------cut here---------------end--------------->8--- would be more readable instead of matching the version string with regex? > + #:install-plan #~'(("xlink.xsd" "/xml/dtd/xlink/xlink.xsd") > + ("catalog.xml" "/xml/dtd/xlink/catalog.xml")) I'd prefer to place these under "/xml/xsd/xlink/{xlink.xsd,catalog.xml}" instead since these are not DTD files. Cheers, -- Bruno From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 22 18:13:37 2024 Received: (at 72243) by debbugs.gnu.org; 22 Jul 2024 22:13:37 +0000 Received: from localhost ([127.0.0.1]:58682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sW1Hk-0008Fa-Qr for submit@debbugs.gnu.org; Mon, 22 Jul 2024 18:13:37 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:55583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sW1Hi-0008F8-0z for 72243@debbugs.gnu.org; Mon, 22 Jul 2024 18:13:35 -0400 Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1fc4fcbb131so88795ad.3 for <72243@debbugs.gnu.org>; Mon, 22 Jul 2024 15:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721686344; x=1722291144; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hP/rAmbWzltyMSEtPHQ6fTtJ8AzCfwFIGCeYOV/30+A=; b=kSZro8c1upyKQaKfSy8ZZuXiPrRbZ9VvzOIvllgqpJrxqHNMOVOav8czHf0FWAWgcM bowBYifErWUW5mXjmjHY4QoUsgkE7/LLhy66yj5cYb4fPGhFPk1kcHozAfVsV1OyB+36 fhcAV9TNNUMV9QMzgnmDoNZA+E56I+HEATYzJ94ZUnNGRW7Yj+o8SsbVOn6MpRKAyD4D m5TzPk5vwEWpM+69fAlJ1LshuBGrwbF9CwlVDX/WMUL6Y1ImFmjeldnFkTLPtdTlosnP 5GUOHOCabKA/fA403Hhb+11g9LOi4AQl+mqjqL3eqhIslbGNYVUogQ82XOm+g1uT5juf KxLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721686344; x=1722291144; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hP/rAmbWzltyMSEtPHQ6fTtJ8AzCfwFIGCeYOV/30+A=; b=oF4fRScKzOVNqCqeTp9NaP3KZpRFXObGMq4mcQQ+gRYFYhoSfW9YHtcDfxw5w+z05a RHA0IVZp2yXqUXS5tmf9MjkXo4SvCBPY/uoUE9XtpiqnA2RZ4SoSS7H/c+PDFf/t792l pU/c2COPl3nNLDV3+0PIfCN5Zf0OAJCfw8Zo4JvKBtl+9fWHDHDJyr9BAiYzvmoQ7NKp 7Tvu17ITYPcBeL2DxOPB9NK/2IS/2Im93rzGiVPtngYsx3hiRC6JF0TxI9PHOqCXIvcq FBsUrpcR64bsjPHZO9QivslGodxA7RbHRHSatowjgWxuJ0CjL3FOPBmzCOHnH406aYrE Tayg== X-Gm-Message-State: AOJu0Yx8Mm9kAz/7gt0EwqtroIHFV9zEGppdH0xZucJ0qkdd2re4eQ5Q 6SF1gCTJlSEmK5kYImT9lO8iBgKob8b5KRr4U8X8fgxWQ0DnEgIa8u7JXTMD X-Google-Smtp-Source: AGHT+IGi7iRsDYHTvmVN7Fc8L+j2tRsnbJHKib/VugOIsJt5x2d4GLl5gOJaAlKwClFRpLjZBiLBgQ== X-Received: by 2002:a17:903:40c2:b0:1fd:6b87:214d with SMTP id d9443c01a7336-1fd7464ffafmr89161765ad.55.1721686344137; Mon, 22 Jul 2024 15:12:24 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f4571f2sm60548275ad.244.2024.07.22.15.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 15:12:23 -0700 (PDT) From: gemmaro To: 72243@debbugs.gnu.org Subject: [PATCH v2] gnu: Add xlink-xsd. Date: Tue, 23 Jul 2024 07:11:53 +0900 Message-ID: <0bec120534a03a9db5b613cd12119158001355b4.1721686313.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Bruno Victal Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72243 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/xml.scm (xlink-xsd): New variable. Change-Id: If18f2018bd205134ea7d7d627b0d09c87c108415 --- gnu/packages/xml.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 85edcf0f7d..b73172c048 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1993,3 +1993,42 @@ (define-public xml-namespace-xsd schema language defined by the XML Schema Recommendation Second Edition of 28 October 2004.") (license license:w3c))) + +(define-public xlink-xsd + (let* ((year "2008") + (month "06")) + (package + (name "xlink-xsd") + (version (string-join (list "1.1" year month) "-")) + (source + (origin + (method url-fetch) + (uri (string-append "https://www.w3.org/XML/" year "/" month + "/xlink.xsd")) + (sha256 + (base32 "0jpjha5iiq4rf4hx3qfnmyya9cf17ysxz0rbhsffn5nwgxnghgf8")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("xlink.xsd" "/xml/xsd/xlink/xlink.xsd") + ("catalog.xml" "/xml/xsd/xlink/catalog.xml")) + #:phases #~(modify-phases %standard-phases + (add-before 'install 'create-catalog + (lambda _ + (invoke "xmlcatalog" + "--noout" + "--create" + "--add" + "uri" + "http://www.w3.org/1999/xlink.xsd" + "xlink.xsd" + "catalog.xml")))))) + (native-inputs (list libxml2)) + (home-page "https://www.w3.org/TR/xlink/") + (synopsis "XML Schema for XML Linking language") + (description + "This package provides an XML Schema document and its catalog file for +the XML Linking Language (XLink). It provides the XLink-1.1 specific +declarations and definitions for use in defining linking elements +which conform to the XLink specification.") + (license license:w3c)))) base-commit: e5c0b62debc6f48a32a65736d9ba3da0b1e59cb9 -- 2.45.2