From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 9fRjCVLF/2MsOQAAbAwnHQ (envelope-from ) for ; Wed, 01 Mar 2023 22:36:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wB2rCFLF/2PxKgEAauVa8A (envelope-from ) for ; Wed, 01 Mar 2023 22:36:18 +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 E0B623FF36 for ; Wed, 1 Mar 2023 22:36:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXU7H-0005CS-Ko; Wed, 01 Mar 2023 16:36: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 1pXU7G-0005Bl-BF for guix-patches@gnu.org; Wed, 01 Mar 2023 16:36:02 -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 1pXU7G-0000QM-2j for guix-patches@gnu.org; Wed, 01 Mar 2023 16:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXU7F-0001JF-VB for guix-patches@gnu.org; Wed, 01 Mar 2023 16:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v4 1/3] 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: Wed, 01 Mar 2023 21:36: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: 60976@debbugs.gnu.org, julien@lepiller.eu Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.16777065525008 (code B ref 60976); Wed, 01 Mar 2023 21:36:01 +0000 Received: (at 60976) by debbugs.gnu.org; 1 Mar 2023 21:35:52 +0000 Received: from localhost ([127.0.0.1]:55134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXU76-0001Ii-47 for submit@debbugs.gnu.org; Wed, 01 Mar 2023 16:35:52 -0500 Received: from mail-pj1-f53.google.com ([209.85.216.53]:40670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXU74-0001IS-5k for 60976@debbugs.gnu.org; Wed, 01 Mar 2023 16:35:50 -0500 Received: by mail-pj1-f53.google.com with SMTP id m20-20020a17090ab79400b00239d8e182efso675474pjr.5 for <60976@debbugs.gnu.org>; Wed, 01 Mar 2023 13:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=f8OJJnhNDE9a50xSpH6EKQaWbUJYmNHVkTWWGRikttc=; b=UQOLuCyP2UdjwsvkciZUHVp+n54HsVy23mqg6mCIAcOGHf3ASvxiRaEffh7muLlHWJ yiugmgmqqEsCuS7c/XzNUlXINrEmhchTJrdBJvoccOlJy633IcbngFzx4hetOstWoFGZ aBpxYOsKO9F69ECE6hUekHub2W1rTG63nUC9SzoIIlEDOkHyD5mzzjmPEkEuddiK9du+ mhD/xkYiOYe6GnqA7rVJxmaKAFcX4Z0K6lWq2m3RdDbghP451a3YKYiwnMcDtAlKH5WT 37mrVTMccTnnte/yE+CkkSEjIcb1dzQQ1XlVgPNsmBYlhykWLPYd3S/iYb+/mOV6ZL7Z wHUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f8OJJnhNDE9a50xSpH6EKQaWbUJYmNHVkTWWGRikttc=; b=2e/AFhXcBe0WdXGIb5zywaBxu/zuG6+UCHzpajagItFj63FAs/WX9axllqr7WhKRG9 CLgQn2ROnxObhTgWBQyPnCz09sDbKWpzoGDtTRCRH7yVtHPn0N53bLxdY15ckeyrhiuE ULKFCqQ7/wbkQDyQp479g2pG6+9KgANawdp3cTt5ONTPSlNq6Aw7FRwP8PuQ9fQncSlU zdYmOF3RcLlDg0enw32k9C7zBACl+chfJiZf6yZa1cxctvRleWclTWBdYM8UujqaGfYC fbO5iN3+N/lZ8YbfW2s2Xk6r/+NbqG1pHe/QesNyb1LfJCWpxchh4EddIOHyatKibCLX yTZQ== X-Gm-Message-State: AO0yUKXbk9PthU5ydVH6pyfVi3IjQGfvM88YYr5QnUn34b7JhSeNjtsg bRJJugmJV344bL1qL5hki/mGVtL7A/k= X-Google-Smtp-Source: AK7set+ygYMzmG/teeuiNOGqM9D1fUw1ZJxMR/RMOBdkU2ZFZp/E/Vi8tsaG0UO6N4glwQvB3YAzLA== X-Received: by 2002:a17:90b:4d8e:b0:237:373e:9ded with SMTP id oj14-20020a17090b4d8e00b00237373e9dedmr8947971pjb.22.1677706543893; Wed, 01 Mar 2023 13:35:43 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id b3-20020a17090acc0300b00232cc61e16bsm214371pju.35.2023.03.01.13.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 13:35:43 -0800 (PST) From: Frank Pursel Date: Thu, 26 Jan 2023 08:46:25 -0800 Message-Id: <48adf8ab622e5051d0012bfb45703c8a73cad92c.1677706130.git.frank.pursel@gmail.com> 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=1677706578; a=rsa-sha256; cv=none; b=mgA5bKlq3mPlWsgSkTk286uUuW63K0/gbGWQE34twyld+cW23T65agoHg7UGMtkyXMkTGE BDi/YgfvxEV656RFuDmSc56LIPKbXZYuCfjryA7DSex+5ObOQOeYvLsnBQRmlBq0yXtXw9 w+FUdK5mMf6Ae0nYbAS8D0RgelCQAjytHD//rIKy1u1jhjcftdzGAWKc9Rc8qlLL54DBYy jmQ2Mxk+mN1URONpcKg09cIlceidt9tNmK+WFRHbPQH6LQLhau5xnFP2kHzBU0vf7Jr3ym 3njPMAznl1ig2wEDnul4ABPoKmP3+KRNUNeKnZr91K34MrG7dHPMzoE6b5PQbA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=UQOLuCyP; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677706578; 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=f8OJJnhNDE9a50xSpH6EKQaWbUJYmNHVkTWWGRikttc=; b=ZzIb7nYtEIDy9mAhxKwtZtA/7bZHPtDiuu2KxVFXDxP/+n/dZce9qvY9WDzuin9+K2t5cQ 8bqZ/fLEbUPoNHFLxf9y7ux2Jmr2gr0Tj5Ybx4B83B/4wXaRFOtDIRVxBiFRObO+ugGp5F Zjdpc9DxjZgw0MY0BE3Hme9YEJxIohswJrrM365VJsvmnwI6sJzAp/kCpxbdZ6UdNDlToA AkutWHyeNwqTB3/fpNdYtO8vpYHWvwo4sklezz+Gx1A9+1lfanzD3TM8lDVwkC+3ps9/gN irkTcDhpwz1eMsYBuUEnxac7NKJ7zrLCb2zbjuTnSF4V6iJpoK3Qt7vZS5Sbdw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.41 X-Spam-Score: 0.41 X-Migadu-Queue-Id: E0B623FF36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=UQOLuCyP; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-TUID: ryPang9TNENu --- Posting a full update. I believe I've addressed all the identified issues concerning java-jericho-html... gnu/packages/java-xml.scm | 63 +++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 5b16806e27..faa51a66fd 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. ;;; @@ -23,20 +24,72 @@ ;;; along with GNU Guix. If not, see . =20 (define-module (gnu packages java-xml) - #:use-module (gnu packages) + #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages gtk) #:use-module (gnu packages java) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix gexp) - #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (guix build-system ant) + #:use-module (guix bzr-download) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module (guix build-system ant) + #:use-module (guix packages) #:use-module (guix utils)) =20 +(define-public java-jericho-html + (package + (name "java-jericho-html") + (version "3.4") + (source (origin + (method bzr-fetch) + (uri + (bzr-reference + (url + "http://jerichohtml.bzr.sourceforge.net/bzr/jerichohtml") + (revision (string-append "tag:" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1zsf4i33jn05pma4y1658d6avhw7x4c12ggs96szhc06b7bxs8j0")) + (modules '((guix build utils))) + (snippet '(begin + (format #t "~%~a~%" "Removing sourced jar files.= ") + (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") + #:phases (modify-phases %standard-phases + (add-before 'build 'add-ant-env-options + (lambda* _ + (setenv "ANT_OPTS" "-Dfile.encoding=3Diso-8859-1") + (let ((match-str + (string-append "jerichohtml-" ,version))) + (substitute* "build.xml" + ((match-str) + ""))))) + (add-after 'build 'check-prep + (lambda* (#:key source #:allow-other-keys) + (mkdir-p "src/test/java")))))) + (native-inputs (list + java-commons-logging-minimal + java-junit + java-log4j-api + java-slf4j-api)) + (home-page "http://jericho.htmlparser.net/docs/index.html") + (synopsis "Java HTML Parser library") + (description + "This 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.") + (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