From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id mKX1K1mo+mNmqgAAbAwnHQ (envelope-from ) for ; Sun, 26 Feb 2023 01:31:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id MJPtK1mo+mMQUQEA9RJhRA (envelope-from ) for ; Sun, 26 Feb 2023 01:31:21 +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 2E44A9FBF for ; Sun, 26 Feb 2023 01:31:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW4wR-0007Re-Ix; Sat, 25 Feb 2023 19:31:03 -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 1pW4wQ-0007RV-Vh for guix-patches@gnu.org; Sat, 25 Feb 2023 19:31: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 1pW4wQ-00081z-N9 for guix-patches@gnu.org; Sat, 25 Feb 2023 19:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW4wQ-0006rV-6y for guix-patches@gnu.org; Sat, 25 Feb 2023 19:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html References: <63cb23b3.650a0220.26d15.f66d@mx.google.com> In-Reply-To: <63cb23b3.650a0220.26d15.f66d@mx.google.com> Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2023 00:31:02 +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: 60976@debbugs.gnu.org Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167737143626340 (code B ref 60976); Sun, 26 Feb 2023 00:31:02 +0000 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 00:30:36 +0000 Received: from localhost ([127.0.0.1]:41848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4vz-0006ql-VC for submit@debbugs.gnu.org; Sat, 25 Feb 2023 19:30:36 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:39553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4vx-0006qX-Ea for 60976@debbugs.gnu.org; Sat, 25 Feb 2023 19:30:34 -0500 Received: by mail-pl1-f182.google.com with SMTP id i3so3301319plg.6 for <60976@debbugs.gnu.org>; Sat, 25 Feb 2023 16:30:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:date:subject:to:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=Kb42cpv6vs0x/Xuw647SuUDIbDjLuLfQviAs37MB7wg=; b=TiOxM2JWpGJIOch5hfO3YsL1rnKSh6kHxW0xogdGne/Gx5+1DbtEUkZqVxVnUJjaSk lyN2hvUo+LuhxMzGuaULhSohim7VHQxZCbN1jG2Q8eVsOEiE8CBeZLHFtl/cOZNnvCXW X1bv6VBljL9MZ42MoI0nyHIrZlVlBFzKVnCO5f+8rMjnyT/OfhNv8Amp24ph4DTkD/4G eme9CYWYfw48xt0Wo/WmXyhD5YPrgr9lxdl8qPcAxE4ooIV5y3D+cDuswxzxSUB7GAq0 eTPMfv8TFfQJjzfjRZbTLbnIuQWX1r1/s4OVb3fDNgc0K6WG4rQkB2LCbeamt68mQN6s eRsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:date:subject:to:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Kb42cpv6vs0x/Xuw647SuUDIbDjLuLfQviAs37MB7wg=; b=SI0lBoQuSenLfjLLMLqKc0JnrQFtyqHFaA/9rICmnAq36C/WqgCOjT/tVOv4Ca3VNS UDK4T3B3Y6+WODySjP9E7NzeLaN0PEyLWa1AepeT70m/vFQ5bUB/2KfunVV1E0mhqGrR r5EsrTJnD7DdBEw2/kyROw736eu/IOTASqi0YXTcvI/Djfw9zxcUVq/djh/Vshy2opRS ebzxPra7q1zLrBjGGvQxCjXr3xLjxXYlvQq5i/awNJlCp8k90gYwxpjNetrRbzhQ/z/s jopGM7nH+GmPj02EjNFpWexyCe7MAi1IepcamfiexCWsEIjg90GY38FZW2sIZjxQe5Cs 2ufA== X-Gm-Message-State: AO0yUKVoNvR09oOxbdc2kJDdmgjr7YgWnvIw2acznc20zNkR1ouXIn8N vMD3y6UMGYiH+HmYRg5aJDFrpBpQ9y0= X-Google-Smtp-Source: AK7set+8qqr8OZnyUxYnj7x91vjzRwK+wDFDhuCHoRtaP8NK0CQ1bti0DBxwcYHJC2OVkNiRQnMZLw== X-Received: by 2002:a17:90b:164f:b0:234:6df2:3b4e with SMTP id il15-20020a17090b164f00b002346df23b4emr21762961pjb.6.1677371426339; Sat, 25 Feb 2023 16:30:26 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id y8-20020a17090a1f4800b00234465cd2a7sm1740660pjy.56.2023.02.25.16.30.24 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 16:30:25 -0800 (PST) Message-ID: <63faa821.170a0220.bf499.2f6f@mx.google.com> X-Google-Original-Message-ID: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> From 1351eea169a28d30040826b14079fb49de3c98b8 Mon Sep 17 00:00:00 2001 From: Frank Pursel Date: Thu, 26 Jan 2023 08:46:25 -0800 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=1677371481; a=rsa-sha256; cv=none; b=Z2NQODa2a9JA+B/3NFyN1d95vPCtRf8y5JcF/AbVcIB5UYDjipJpsHHu/1zSsqe7PPRhqm 5kfWVaVF7yAJRPFV70A6IcKRqZUOWYfhigSEp3E5cN9YQQIOwJ2cVItQeZmOPrigGzASsj 1AxRRA74g0BsHENIKfTDGLBsx0tT65cSGfs6eR5wW7HKM1axzk/4ZCgUEOZE9H/8KtFBOx GZG+KflcocYUnky4NFCcDYLCPCwJOWAjgDZoyEYYInPlilVfPZcyOr3AuU1HqEHhq1l7Ks xh3JdV/TSiTnUO7/76C2M5PU1PZ3FsS45og5vKuXg+DBpwOdJeqYNwQT5pptrQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=TiOxM2JW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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=1677371481; 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=Kb42cpv6vs0x/Xuw647SuUDIbDjLuLfQviAs37MB7wg=; b=X41rcZv4plqmZS5XXgGiBRLMI8TRf26VBy1xDER0KjGGhj0ESOKtZ2+bg4pq4ltqF8YQWA KwrDEz9fQKr7Pbh5Q9YYyFwfY9bAduL2/2XFUaxUduBzVFRoOOSUVPHHLNIiAAzaZt05os arFaAdMhQvmt2H+rvS4q7/b3VwcVfSB2VTbuFbwVEKmwXC+7aARQHD3fE5Ds0q6oQSW5tK hCt6wsmaXzovDYnS5Vu1NT0qfLporvr95J6RCL1aDCe8DEZ4CgZaLevpkqD1/ZMNJTf1ot yQSmx/t2pib4M2dIBXG+O0xAWdO5C164MEn8Ifuejswqu+YU4e/0qpD066PghA== X-Migadu-Spam-Score: 6.82 X-Migadu-Scanner: scn1.migadu.com X-Migadu-Queue-Id: 2E44A9FBF Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=TiOxM2JW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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-Spam-Score: 6.82 X-TUID: qTz8c4kZSy6A --- The main point here is to give us ditaa but we also want the ziggaraut to be fully guix maintainable. 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. Better late than never. Regards, Frank Pursel gnu/packages/java-xml.scm | 79 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 5b16806e27..9cf256549b 100644 --- a/gnu/packages/java-xml.scm +++ b/gnu/packages/java-xml.scm @@ -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. ;;; @@ -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.4") + (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i") + (internal-name "jericho-html")) + (package + (name "java-jericho-html") + (version ver) + (source (origin + (method url-fetch/zipbomb) + (uri (string-append + "https://sourceforge.net/projects/jerichohtml" + "/files/jericho-html/3.4/jericho-html-3.4.zip/downlo= ad")) + (sha256 + (base32 + hash)) + (modules '((guix build utils))) + (snippet '(begin + (format #t "~%~a~%" "Removing sourced jar file= s.") + (for-each (lambda (jarf) + (delete-file jarf) + (format #t "Deleted: ~a~%" jarf)) + (find-files "." "\\.jar$")))))) + (build-system ant-build-system) + (arguments + `(#:jar-name (string-append ,name ".jar") + #:source-dir (string-append ,internal-name "-" + ,ver "/src/") + #:test-dir (string-append ,internal-name "-" + ,ver "/test/") + #:test-exclude (list "**/StAXTest.java" + "**/NodeIteratorTest.java" + "**/ScriptTest.java" + "**/SegmentGetStyleURISegmentsTest.java" + "**/SegmentTest.java" + "**/StreamedSourceTest.java" + "**/HTMLSanitiserTest.java") + #:phases (modify-phases %standard-phases + (add-before 'build 'add-ant-env-options + (lambda* _ + (setenv "ANT_OPTS" "-Dfile.encoding=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.xml" + (("\\$\\{test\\.home\\}/java") + "${test.home}/src")) + (mkdir-p (string-append cwd "/build/test-classes= ")) + (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.htmlparser.net/docs/index.html") + (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. It also +provides high-level HTML form manipulation functions.=20=20 +") + (synopsis "Java HTML Parser library") + (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0))))) + (define-public java-simple-xml (package (name "java-simple-xml") base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42 --=20 2.39.1