From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KK4NNdiQbF+cawAA0tVLHw (envelope-from ) for ; Thu, 24 Sep 2020 12:28:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 6kkCMdiQbF/0fAAA1q6Kng (envelope-from ) for ; Thu, 24 Sep 2020 12:28:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 36598940BC9 for ; Thu, 24 Sep 2020 12:28:05 +0000 (UTC) Received: from localhost ([::1]:36994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLQLz-0007MS-DG for larch@yhetil.org; Thu, 24 Sep 2020 08:28:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLQL0-00076I-4G for guix-patches@gnu.org; Thu, 24 Sep 2020 08:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLQKz-0004Ec-RN for guix-patches@gnu.org; Thu, 24 Sep 2020 08:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLQKz-0006va-OX for guix-patches@gnu.org; Thu, 24 Sep 2020 08:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition. References: <20200820150914.9443-1-dannym@scratchpost.org> In-Reply-To: <20200820150914.9443-1-dannym@scratchpost.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 12:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.160095039226593 (code B ref 42958); Thu, 24 Sep 2020 12:27:01 +0000 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:26:32 +0000 Received: from localhost ([127.0.0.1]:38833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQKV-0006ur-S2 for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:26:32 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQKT-0006uh-4g for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:26:30 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9A6BC51C43 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:26:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z95nQdR4vee5 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:26:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600950385; bh=rTlpkFUFKdPZdh9BbC1h0yxHsE+OCZh4FizVzoKnk3U=; h=To:From:Subject:Date; b=A1KaDpBeMNxl4hxjuYdAsA00F5Yzr+o9Pblyp4+eHx99TqKBzhWmZhaT7L5sV360S mxDQY7DYnpqvJNtowhpeLZklt4kjyykno2WMNBX0QU2grdV1eu6d6wknI3tSQP15zf abn8X5NShn14otslHJqncFExwDlQLUpxa8pwdxY1uyzWjSvb+zm1LeH69FoUOi1sCQ q0/9/NpRbu3ym7XpL00TV/G6UxyLp1FsbkHc4FAzJWwWe3B8SRq7YrpXY1xX5uwQEU rb4Qbr10Jd+5+GTmd02/lpDRr5J6kHQ5tWQisKXy2RWfAldd4618VmZ8rRWZ24+T6O qwJolhT+yXflQ== From: Raghav Gururajan Message-ID: <1b553328-6cdc-ab8d-1ea5-f046ac3d3e95@disroot.org> Date: Thu, 24 Sep 2020 08:26:24 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------3625450B66D6490F6836C124" Content-Language: en-US X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=A1KaDpBe; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.59 X-TUID: WpTjCTXQRO47 This is a multi-part message in MIME format. --------------3625450B66D6490F6836C124 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-yelp-xsl-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-yelp-xsl-Make-some-cosmetic-changes.patch" >From c52b87ec16822fb3cea3b8937c9bc7042e1553b8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:02:14 -0400 Subject: [PATCH 01/11] gnu: yelp-xsl: Make some cosmetic changes. * gnu/packages/gnome.scm (yelp-xsl): Make some cosmetic changes. --- gnu/packages/gnome.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc0a4e859e..eca2d74f71 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6445,24 +6445,25 @@ of running programs and invoke methods on those interfaces.") (package (name "yelp-xsl") (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) ("itstool" ,itstool) ("xmllint" ,libxml2))) - (home-page "https://wiki.gnome.org/Apps/Yelp") (synopsis "XSL stylesheets for Yelp") (description "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser to format Docbook and Mallard documents.") + (home-page "https://wiki.gnome.org/Apps/Yelp") (license license:gpl2+))) (define-public yelp -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-yelp-xsl-Update-to-3.36.0.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-gnu-yelp-xsl-Update-to-3.36.0.patch" >From bd5e10ef62b19933b03c2263f99eb83523ccaca4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:04:27 -0400 Subject: [PATCH 02/11] gnu: yelp-xsl: Update to 3.36.0. * gnu/packages/gnome.scm (yelp-xsl) [version]: Update to 3.36.0. [source][sha256]: Modify base32. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eca2d74f71..8418fd91ed 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6444,7 +6444,7 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.34.2") + (version "3.36.0") (source (origin (method url-fetch) @@ -6453,7 +6453,7 @@ of running programs and invoke methods on those interfaces.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) + (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-yelp-xsl-Enable-documentation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-gnu-yelp-xsl-Enable-documentation.patch" >From 17bb39d17b1585bfb98b1b6d2fbbe718784eeb0d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:08:12 -0400 Subject: [PATCH 03/11] gnu: yelp-xsl: Enable documentation. * gnu/packages/gnome.scm (yelp-xsl) [arguments]<#:configure-flag>[--enable-doc]: New flag. [native-inputs]: Add mallard-ducktype, intltool and libxslt. --- gnu/packages/gnome.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8418fd91ed..987ac895b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6455,10 +6455,17 @@ of running programs and invoke methods on those interfaces.") (sha256 (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--enable-doc"))) (native-inputs - `(("gettext-minimal" ,gettext-minimal) + `(("ducktype" ,mallard-ducktype) + ("gettext-minimal" ,gettext-minimal) + ("intltool" ,intltool) ("itstool" ,itstool) - ("xmllint" ,libxml2))) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") (description "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-yelp-xsl-Update-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-gnu-yelp-xsl-Update-description.patch" >From 46e64da9a742a845b690b09fbb976573ff7302b0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:09:42 -0400 Subject: [PATCH 04/11] gnu: yelp-xsl: Update description. * gnu/packages/gnome.scm (yelp-xsl) [description]: Modify. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 987ac895b7..9903fd85b3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6467,9 +6467,12 @@ of running programs and invoke methods on those interfaces.") ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") - (description - "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser -to format Docbook and Mallard documents.") + (description "Yelp-XSL is a collection of programs and data files to help +you build, maintain, and distribute documentation. It provides XSLT stylesheets +that can be built upon for help viewers and publishing systems. These +stylesheets output JavaScript and CSS content, and reference images +provided by yelp-xsl. It also redistributes copies of the jQuery and +jQuery.Syntax JavaScript libraries.") (home-page "https://wiki.gnome.org/Apps/Yelp") (license license:gpl2+))) -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-yelp-xsl-Update-license.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0005-gnu-yelp-xsl-Update-license.patch" >From 994119569069ca88d225b44221b0f50bb61d21b0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:11:14 -0400 Subject: [PATCH 05/11] gnu: yelp-xsl: Update license. * gnu/packages/gnome.scm (yelp-xsl) [license]: Add lgpl2.1+ and expat. --- gnu/packages/gnome.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9903fd85b3..d6a807dfa9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6474,7 +6474,14 @@ stylesheets output JavaScript and CSS content, and reference images provided by yelp-xsl. It also redistributes copies of the jQuery and jQuery.Syntax JavaScript libraries.") (home-page "https://wiki.gnome.org/Apps/Yelp") - (license license:gpl2+))) + (license + (list + ;; XSLT + license:gpl2+ + ;; Images + license:lgpl2.1+ + ;; JavaScript + license:expat)))) (define-public yelp (package -- 2.28.0 --------------3625450B66D6490F6836C124--