From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aMcQCwQP+2MfSQAAbAwnHQ (envelope-from ) for ; Sun, 26 Feb 2023 08:49:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4BBGCgQP+2O1hQAAG6o9tA (envelope-from ) for ; Sun, 26 Feb 2023 08:49:24 +0100 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 5D82732538 for ; Sun, 26 Feb 2023 08:49:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWBmR-0003rD-LP; Sun, 26 Feb 2023 02:49:12 -0500 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 1pWBmI-0003qt-Qv for guix-patches@gnu.org; Sun, 26 Feb 2023 02:49:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWBmI-000898-B7 for guix-patches@gnu.org; Sun, 26 Feb 2023 02:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWBmH-00049L-T5 for guix-patches@gnu.org; Sun, 26 Feb 2023 02:49:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2023 07:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Frank Pursel , 60976@debbugs.gnu.org Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167739769315758 (code B ref 60976); Sun, 26 Feb 2023 07:49:01 +0000 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 07:48:13 +0000 Received: from localhost ([127.0.0.1]:42237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWBlU-000463-SV for submit@debbugs.gnu.org; Sun, 26 Feb 2023 02:48:13 -0500 Received: from lepiller.eu ([89.234.186.109]:40558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWBlS-00045X-5G for 60976@debbugs.gnu.org; Sun, 26 Feb 2023 02:48:11 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id de01e3cb; Sun, 26 Feb 2023 07:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:in-reply-to:references:message-id:mime-version :content-type:content-transfer-encoding; s=dkim; bh=0e2XVIYkuM73 P5I/6Kf94Rqv4odwwPYJpw+oOD5J/Tg=; b=Fo6tiMFkh7RkAIZaIx6KJOpFIzcN mpIjDzewEnLBjxGWqvYJ0f7DquWK0XDCk50VGU1sQfUDkipk6igcucLyfo6Jiiup 6/ihpJAh/pesflWqFxvxqwM8fqISJgNIggdYH6z3gGA/C1Th+IF5/Gl7KPY5X9fc u8CulkkWJIo8NKJ14+lsOXVUiZYEgj4HFDqOFA+B/UIDIwX773vkANEb9QMbA1KX 4UFBsrUJuU4lX/rT+hBdOH1tY1X/7T56dvIPmBkE2+kf6wU1pzQRE0eyU/8QXgRb zASV8UnreSRjuazA+/Owa8Wir4T4D2srv368Y28gqXBCFlBMvOqc4puxjw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ad2ed2f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 26 Feb 2023 07:48:07 +0000 (UTC) Date: Sun, 26 Feb 2023 08:47:12 +0100 From: Julien Lepiller User-Agent: K-9 Mail for Android In-Reply-To: <63faa821.170a0220.bf499.2f6f@mx.google.com> References: <63cb23b3.650a0220.26d15.f66d@mx.google.com> <63faa821.170a0220.bf499.2f6f@mx.google.com> Message-ID: <2BACC913-D4CF-4920-AC20-C6A8BE0C5B3D@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677397764; a=rsa-sha256; cv=none; b=V8Lzb9w32HyQ0DxFSydoyzy0B44aVfg4xr0H0f+vpASgI+2S7+CCFm+qaA76kgZDVLU1dW zT5D9HjNyqzgSpzAEo0NYwCWz4lkjEUE54NaXuDyYbirIlAU/gWF2rBD3Un5xGGs2BbWK2 ffIxMLn7UtwtPj9qCo5UoQLd8gYI1tIJVO48CLP7OGZzTpgbIFRi1Ph1Cmo+dCq2lGZNz3 ceV6wJCYBt9xz8xZd+Hpti0qyK5eh+OY9ljE1KEz6LhfFB7M/QvpLMAnA2fKSlxGyamNZG a1cTptmEIetXGpoHNNBt5/7cIzHSa4BwmrKpbbhKxgiEKc+tY69XSUtBUwCyCA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Fo6tiMFk; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677397764; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CFxxPiHg0nYaC7x24pouCp05cuKwY+E5nRvWTYLf9Gw=; b=SSXfcrFUhOvFN/SK0OTELGGocYH1CF5XwLTn7zw1PI5FOBQzTvzRJ3cM0xAeJ8iEE/0gnA syPdA0PODUcnCnDjL3o9zw3REu/vEK/nlcjXgcQJxQ6KVnqCh0KEMCENvQIUi7TxA31E2W 20ZpErL/9r4TMcwlocrnFnU4G+Zas5fBJ3xUeul1Xr4Hs0s1vBWe8LH9SyPlU4vw7IhNOJ Bqh1BCON5B7hJeiO5Shk7XzLrjLo+hNsqyyVsCtYa/svlY8ZE2FVHZnQ3f5pYyqsLGJKGt Gy6Wgrn1vB4ZN/+yzu4CVNI4OB68bVA+mUaiyyPJ3+acUyFCUD9tdUIn14wDHA== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Fo6tiMFk; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.08 X-Spam-Score: -2.08 X-Migadu-Queue-Id: 5D82732538 X-TUID: 53Sj+bBHarAf Hi! Since you're introducing jericho-html in this series, why don't you merge = the first and fourth patch, to introduce the correct version immediately? Note that phases do not need to end with #t anymore=2E Usually, synopsis is put before description=2E The description should be a= full sentence, it cannot start with "A"=2E Maybe "This library is a=E2=80= =A6" or "This Java library allows analysing=E2=80=A6" I'm not a fan of having the hash and version outside the package dehinitio= n with a let when it's not necessary=2E You can put the hash directly where= it belongs, since it's used only once, and the version in the version fiil= d=2E You can refer to the version field in all subsequent fields, which is = how we do it usually=2E Same with internal name, it won't change, so I woul= d just use a string directly=2E I'd also sort inputs in alphabetic order (even chough most packages in jav= a=2Escm don't=E2=80=A6) Le 26 janvier 2023 17:46:25 GMT+01:00, Frank Pursel a =C3=A9crit=C2=A0: >--- >The main point here is to give us ditaa but we also want the ziggaraut >to be fully guix maintainable=2E Hence here I submit another complete >patch set providing all that preceeded plus changes to java-jericho-html >that, in hindsight, I wish I had put in there in the first place=2E >Better late than never=2E > >Regards, >Frank Pursel > > gnu/packages/java-xml=2Escm | 79 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 79 insertions(+) > >diff --git a/gnu/packages/java-xml=2Escm b/gnu/packages/java-xml=2Escm >index 5b16806e27=2E=2E9cf256549b 100644 >--- a/gnu/packages/java-xml=2Escm >+++ b/gnu/packages/java-xml=2Escm >@@ -6,6 +6,7 @@ > ;;; Copyright =C2=A9 2020 Vincent Legoll > ;;; Copyright =C2=A9 2021 L=C3=A9o Le Bouter > ;;; Copyright =C2=A9 2022 Christopher Baines >+;;; Copyright =C2=A9 2023 Frank Pursel > ;;; > ;;; This file is part of GNU Guix=2E > ;;; >@@ -37,6 +38,84 @@ (define-module (gnu packages java-xml) > #:use-module (guix build-system ant) > #:use-module (guix utils)) >=20 >+(define-public java-jericho-html >+ (let ((ver "3=2E4") >+ (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i") >+ (internal-name "jericho-html")) >+ (package >+ (name "java-jericho-html") >+ (version ver) >+ (source (origin >+ (method url-fetch/zipbomb) >+ (uri (string-append >+ "https://sourceforge=2Enet/projects/jerichohtml" >+ "/files/jericho-html/3=2E4/jericho-html-3=2E4=2Ezi= p/download")) >+ (sha256 >+ (base32 >+ hash)) >+ (modules '((guix build utils))) >+ (snippet '(begin >+ (format #t "~%~a~%" "Removing sourced jar fi= les=2E") >+ (for-each (lambda (jarf) >+ (delete-file jarf) >+ (format #t "Deleted: ~a~%" jarf)= ) >+ (find-files "=2E" "\\=2Ejar$")))))= ) >+ (build-system ant-build-system) >+ (arguments >+ `(#:jar-name (string-append ,name "=2Ejar") >+ #:source-dir (string-append ,internal-name "-" >+ ,ver "/src/") >+ #:test-dir (string-append ,internal-name "-" >+ ,ver "/test/") >+ #:test-exclude (list "**/StAXTest=2Ejava" >+ "**/NodeIteratorTest=2Ejava" >+ "**/ScriptTest=2Ejava" >+ "**/SegmentGetStyleURISegmentsTest=2Ejava" >+ "**/SegmentTest=2Ejava" >+ "**/StreamedSourceTest=2Ejava" >+ "**/HTMLSanitiserTest=2Ejava") >+ #:phases (modify-phases %standard-phases >+ (add-before 'build 'add-ant-env-options >+ (lambda* _ >+ (setenv "ANT_OPTS" "-Dfile=2Eencoding=3Diso-8859= -1") #t)) >+ (add-after 'build 'check-prep >+ (lambda* (#:key source #:allow-other-keys) >+ (let* ((cwd (getcwd)) >+ (jericho-test (string-append cwd "/" ,internal-name >+ "-" ,ver "/test")) >+ (test (string-append jericho-test "/test")) >+ (test-data (string-append jericho-test "/data")) >+ (test-src (string-append jericho-test "/src")) >+ (test-src-data (string-append test-src "/data"))) >+ (format #t "~%Check Prep dir: ~s\n" cwd) >+ (substitute* "build=2Exml" >+ (("\\$\\{test\\=2Ehome\\}/java") >+ "${test=2Ehome}/src")) >+ (mkdir-p (string-append cwd "/build/test-class= es")) >+ (copy-recursively (string-append cwd >+ "/" >+ ,internal-name >+ "-" >+ ,ver >+ "/samples/console/classes") >+ (string-append cwd >+ "/build/test-classes/")) >+ (mkdir-p test-src-data) >+ (copy-recursively test-data >+ test-src-data)) >+ #t))))) >+ (native-inputs (list java-junit java-slf4j-api java-log4j-api >+ java-commons-logging-minimal)) >+ (home-page "http://jericho=2Ehtmlparser=2Enet/docs/index=2Ehtml") >+ (description >+ "A java library allowing analysis and manipulation of >+parts of an HTML document, including server-side tags, while >+reproducing verbatim any unrecognised or invalid HTML=2E It also >+provides high-level HTML form manipulation functions=2E =20 >+") >+ (synopsis "Java HTML Parser library") >+ (license (list license:lgpl2=2E1+ license:asl2=2E0 license:epl1=2E= 0))))) >+ > (define-public java-simple-xml > (package > (name "java-simple-xml") > >base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42