From patchwork Thu Jan 26 16:46:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 47359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2214A16BBF; Sun, 26 Feb 2023 00:31:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D2681685F for ; Sun, 26 Feb 2023 00:31:21 +0000 (GMT) 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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- 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(+) base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42 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 © 2020 Vincent Legoll ;;; Copyright © 2021 Léo Le Bouter ;;; Copyright © 2022 Christopher Baines +;;; Copyright © 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)) +(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/download")) + (sha256 + (base32 + hash)) + (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") + #: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=iso-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. +") + (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") From patchwork Thu Jan 26 16:53:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 47360 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 31E0716BBF; Sun, 26 Feb 2023 00:32:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4274B1685F for ; Sun, 26 Feb 2023 00:32:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW4xU-0008Gr-6T; Sat, 25 Feb 2023 19:32: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 1pW4xO-0008Fi-1U for guix-patches@gnu.org; Sat, 25 Feb 2023 19:32:05 -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 1pW4xN-00089n-PX for guix-patches@gnu.org; Sat, 25 Feb 2023 19:32:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW4xN-0006t8-LH for guix-patches@gnu.org; Sat, 25 Feb 2023 19:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v3 2/4] gnu: Add java-libbatik Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2023 00:32: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 Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167737150126451 (code B ref 60976); Sun, 26 Feb 2023 00:32:01 +0000 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 00:31:41 +0000 Received: from localhost ([127.0.0.1]:41852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4x2-0006sY-Gp for submit@debbugs.gnu.org; Sat, 25 Feb 2023 19:31:40 -0500 Received: from mail-pl1-f172.google.com ([209.85.214.172]:40876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4x0-0006sK-FN for 60976@debbugs.gnu.org; Sat, 25 Feb 2023 19:31:39 -0500 Received: by mail-pl1-f172.google.com with SMTP id u14so3295862ple.7 for <60976@debbugs.gnu.org>; Sat, 25 Feb 2023 16:31:38 -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:references:date :in-reply-to:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v81sBx/h55hBXu6+3ebuY4o25RzA3HVjpRFAqiaMh64=; b=ZpB4WyZrfrKK9ndMtVdjSrLfRsjDOTTrV6tGDH/zw6cpn15sorQwEySdgyVmoJgSNV Vo3lz3F4rwHkMfGaus8OZUzClxk7qzmDHvShLoVJf74TxAzfPyUmciaGVL+jfKC9LjAO xOXp1Hy4jqJaDbAM+OOJYJSyKmauCf2AhO79LIRD54Uk991jXiJu1pY7yJJQZG02UF9Q 94D/4qx3mrJrUh2h70soNM+7JSgfrrI/BZIGERC1GTla0SfSLN7LraQPdD7/iFXMuEmG +TaqEcx0m+TevOk+/dH2PkfkXS/+LX52QnO3ouTq6Vl1n8mhfCp1jkPZMc+JOmkg5wNL PrEg== 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:references:date :in-reply-to:subject:to:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=v81sBx/h55hBXu6+3ebuY4o25RzA3HVjpRFAqiaMh64=; b=7XVUHulYe6L+hqsVKGjC9+MHkDRcDleKwSkq82Ojkl00O/e2oZtPY0V5rsfbvzpndA l9pe1lcYuVRoNLQmfRwlC64LW/6asZa+Q0oZ+qhtHSpBzqOdLnASoPek8euVzmh15Idn vfv16g8FNqYbrgLO5pt+ljSBxBTl0b8e6zgxCHnz/1+ZGS96RcQb6CuVg+lApoxeQWT4 BMvswF2hWZCmfajU4QNiXYsM8H/1lRfcthmr3gfPZzA3g5Yum1U4YL6m0+65s+jpXojD S+SOLDddkstG/POiNMnSzWoi4JjbTl/INNyWUXc73rWExcw4zCfn/YWNpzLyVeR+EB2m yhew== X-Gm-Message-State: AO0yUKXqP01xdtQAGzMRT53YRTErxAwEFyVuj09e2GVmZ/Nvwm4lfdei qvAaXcz/iXgSCS+D0+6VTg7Uo90P3jM= X-Google-Smtp-Source: AK7set+yKX7dgTvI6l0EvuvxWZUD5H1goMJp/5u15nvXOB2ZxPCMsV2mZ8nCUV900JI+LPz+gFRB0g== X-Received: by 2002:a05:6a21:789c:b0:cb:c276:58cc with SMTP id bf28-20020a056a21789c00b000cbc27658ccmr18302993pzc.28.1677371491926; Sat, 25 Feb 2023 16:31:31 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b0059072daa002sm1679995pfi.192.2023.02.25.16.31.30 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 16:31:31 -0800 (PST) From: Frank Pursel In-Reply-To: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Date: Thu, 26 Jan 2023 08:53:09 -0800 References: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Message-Id: <4dded0fd7cc5556c2468bba775ecfe1a290ff5e2.1677369969.git.frank.pursel@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/batik.scm | 82 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 7f159010a5..662c4f5cd5 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,8 +28,87 @@ (define-module (gnu packages batik) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java) + #:use-module (gnu packages javascript) #:use-module (gnu packages java-xml) - #:use-module (gnu packages textutils)) + #:use-module (gnu packages textutils) + #:use-module (gnu packages xml)) + +(define-public java-libbatik + (package + (name "batik") + (version "1.16+dfsg") + (source + (origin + (method url-fetch) + (uri (string-append + "https://deb.debian.org/debian/pool/main/b/batik/" + name "_" + version ".orig.tar.xz")) + (sha256 (base32 + "1xnmnnadp4l74dz55d3ask236lwy0iwg981851d01j2zlrgpw4p9")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Identify and delete bundled jars. + (format #t "~%~a~%" "Removing sourced jars") + (for-each + (lambda (f) + (delete-file f) + (format #t "Deleted: ~a~%" f)) + (find-files "." "\\.jar$")) + )))) + (build-system ant-build-system) + (arguments + `(#:jar-name (string-append ,name ".jar") + #:source-dir "sources/src/main/java" + #:test-dir "sources/src/test" + #:test-exclude (list "**/util/*.java") + #:phases + (modify-phases %standard-phases + (add-after + 'unpack 'src-consolidation + (lambda _ + (mkdir-p "sources") + (let ((cwd (getcwd)) + (sub-dirs (list "anim" "awt-util" "bridge" + "codec" "constants" "css" + "dom" "ext" "extension" + "gui-util" "gvt" "i18n" + "parser" "script" "slideshow" + "svgbrowser" "svg-dom" + "svggen" "svgpp" + "svgrasterizer" "swing" "test" + "test-svg" "transcoder" "ttf2svg" + "util" "xml" "test-swing")) ) + (for-each + (lambda (sdir) + (copy-recursively + (string-append + "batik-" sdir) "sources/") ) + sub-dirs) ) + ;; Prep testing + (copy-recursively + "test-resources" "sources") + ;; Remove scripting subdirs for jpython, and jacl. + (for-each + (lambda (rfile) + (delete-file rfile) + (format #t "Deleted: ~s\n" rfile)) + (append + (find-files + "sources/src/main/java/org/apache/batik/script/jpython" ) + (find-files + "sources/src/main/java/org/apache/batik/script/jacl" ) )) + #t) ) ) ) ) + (native-inputs (list rhino java-xmlgraphics-commons libxslt + java-jaxen java-junit java-jaxp java-xerces + java-jdom quickjs)) + (home-page "https://xmlgraphics.apache.org/batik") + (synopsis "The java based toolkit for Scalable Vector Graphics") + (description "Batik is a Java-based toolkit for applications or +applets that want to use images in the Scalable Vector Graphics (SVG) +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0) ) ) (define-public java-w3c-smil-3.0 (package From patchwork Thu Jan 26 17:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 47361 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 60E3116BBF; Sun, 26 Feb 2023 00:33:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF0761685F for ; Sun, 26 Feb 2023 00:33:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW4yN-0008S3-Bn; Sat, 25 Feb 2023 19:33: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 1pW4yM-0008Ro-Fm for guix-patches@gnu.org; Sat, 25 Feb 2023 19:33: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 1pW4yM-0008K7-7v for guix-patches@gnu.org; Sat, 25 Feb 2023 19:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW4yM-0006uo-3g for guix-patches@gnu.org; Sat, 25 Feb 2023 19:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v3 3/4] gnu: Add ditaa Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2023 00:33: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.167737155726547 (code B ref 60976); Sun, 26 Feb 2023 00:33:02 +0000 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 00:32:37 +0000 Received: from localhost ([127.0.0.1]:41856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4xx-0006u7-0h for submit@debbugs.gnu.org; Sat, 25 Feb 2023 19:32:37 -0500 Received: from mail-pf1-f182.google.com ([209.85.210.182]:42998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4xv-0006tu-5E for 60976@debbugs.gnu.org; Sat, 25 Feb 2023 19:32:35 -0500 Received: by mail-pf1-f182.google.com with SMTP id ce7so1572109pfb.9 for <60976@debbugs.gnu.org>; Sat, 25 Feb 2023 16:32:35 -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:references:date :in-reply-to:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RjSXoTBC0J8aMWzpxVIDJlu3uM7oJd9VsUsu1IvFvQk=; b=TbTaaQk58zh1nV46Ml9CQRzQyyPnJUtwiO3CPZIWv8VyYIEjJdCw5S56FSn+gvnf+I sAiSqAbzXRh/uoPa4jSTD7Nbw3gaW0WXv2HQ6SfyN3T2cP8Hs1Koa4gGXtS6O+JK7rP+ sndd4W3olE4IWqnvEQeibQ4NrqNALdBhF2sefmBR0qvUfJ1fDMhB/hrnQhnLVZ2sWnWR 3bk8KD+JIRAJpK5jdIqDS7STZB+rmFz2SwyIeSZX5xfEgeFqabo0lfUfp30xUt9J6dFZ RRw/SvbBKzvKvcLIuqxg3yed6FyVpXtDKGARyZTTOMv0S7hhSDbZQFSgzIi+Xa0x2OIC MFew== 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:references:date :in-reply-to:subject:to:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=RjSXoTBC0J8aMWzpxVIDJlu3uM7oJd9VsUsu1IvFvQk=; b=yDWqasHhtQqXi3+w8ZG/LY/CRhcdtIL4qehLD7WOelyaxYEUQoeb9ljMk4TYxANFWQ TBjsUpPH2xnaxtxudXiogNUXQNlWV6SddTLikFJ2jbotNZVezZuysOGT4AJaPhQxZjoM oVP2j9lkucAu77O0yqs+mg8CD9TsH5TcVKhYCf+hQxD8a9RNegOURNkZuHAlIfsE19oU Wab660ur/5JC1slUalCelhVFMIQfhQKOxcM+N69E6XXIico31OpyYvt91W1whnQisDbZ FJYj4ems4K2g+hTaqou3BtPKkiQG1TjT2Js9cIlY9Dz/C9WbBiw8t0Zz7Clnc41SN7eU VG4g== X-Gm-Message-State: AO0yUKWiYuqaY2GIOLLfvgYdwCUz+IhlazPaTHkEUfmwYhchWL4LKhEK iIEblPKxjr42eHZ+11HFr3Us0rln5/o= X-Google-Smtp-Source: AK7set9f0/vuDDeSbEOfL2z6FdQZeJBPoj5eQxz1FSIQYX8upM6DBsxVhR3dpJgruPJRfK0+x0B/2A== X-Received: by 2002:a05:6a00:9b:b0:5a8:a263:7f4d with SMTP id c27-20020a056a00009b00b005a8a2637f4dmr16440426pfj.15.1677371548844; Sat, 25 Feb 2023 16:32:28 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id k11-20020aa792cb000000b005a84de344a6sm1756283pfa.14.2023.02.25.16.32.27 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 16:32:28 -0800 (PST) From: Frank Pursel In-Reply-To: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Date: Thu, 26 Jan 2023 09:01:17 -0800 References: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Message-Id: <51d9aae0d048aebfccc46b5363271dc4f2bc64be.1677369969.git.frank.pursel@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/ditaa.scm | 145 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 gnu/packages/ditaa.scm diff --git a/gnu/packages/ditaa.scm b/gnu/packages/ditaa.scm new file mode 100644 index 0000000000..e1f063e179 --- /dev/null +++ b/gnu/packages/ditaa.scm @@ -0,0 +1,145 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . +;;; +;;; Copyright © 2023 Frank Pursel +;;; + +(define-module (gnu packages ditaa) + #:use-module (gnu packages) + #:use-module (gnu packages bash) + #:use-module (gnu packages batik) + #:use-module (gnu packages java) + #:use-module (gnu packages java-xml) + #:use-module (gnu packages xml) + #:use-module (guix build-system ant) + #:use-module (guix build utils) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix modules) + ) + +(define-public ditaa + (package + (name "ditaa") + (version "0.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stathissideris/ditaa") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y3g17wp1wvb05m56pp25avww2njpgh0gk0jsbsf25scj7hyyj26")) + (modules '((guix build utils))) + (snippet + '(begin + (format #t "~%~a~%" "Finding and removing sourced jars.") + (for-each + (lambda (jarf) + (delete-file jarf) + (format #t "Deleted: ~a~%" jarf)) + (find-files "." "\\.jar$")))))) + (build-system ant-build-system) + (inputs (list bash-minimal)) + (native-inputs (list java-libbatik java-commons-cli java-w3c-svg + java-jericho-html `(,icedtea "jdk") java-junit)) + (arguments + `(#:build-target "release-all" + #:phases + (modify-phases %standard-phases + ;; Ant's buildfile and build tree need to be modified + ;; to provide access to the guix builds of the + ;; batik and the java-commons-cli + ;; jar files. Also some of the source requires java7. + (add-before 'build 'build-prep + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((batik-jar (search-input-file inputs + "share/java/batik.jar")) + (commons-cli-jar (search-input-file inputs + "lib/m2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar"))) + (mkdir-p "lib") + (copy-file batik-jar "./lib/batik.jar") + (copy-file commons-cli-jar "./lib/commons-cli.jar")) + (with-directory-excursion "build" + (substitute* "release.xml" + (("source=\"1.6\"") + "source=\"7\"") + (("") + (string-append "" + "\n" "")))) + #t)) + (replace 'build + (lambda* _ + (setenv "ANT_OPTS" + (string-append "-Dversion.string=" + ,version)) + (with-directory-excursion "build" + (invoke "ant" "-f" "release.xml" "release-jar")) #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "ANT_OPTS" + (string-append "-Dversion.string=" + ,version)) + (mkdir-p "tests/testlib") + (with-directory-excursion "build" + (invoke "ant" "-f" "release.xml" + "generate-test-images") + (invoke "ant" "test"))) #f))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (bin (string-append out "/bin")) + (bash (search-input-file inputs "bin/bash")) + (java (search-input-file inputs "bin/java")) + (jre (search-input-directory inputs "jre")) + (ditaa (string-append out "/bin/ditaa")) + (jar-name (string-append ,name + ,version ".jar"))) + (with-directory-excursion "releases" + (install-file jar-name lib)) + (mkdir-p bin) + (with-output-to-file ditaa + (lambda _ + (format #t "#!~a~%JAVA_HOME=~a ~a -jar ~a/~a $@~%" + bash jre java lib jar-name))) + (chmod ditaa #o755)) #t)) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "out") + "/share/doc/"))) + (for-each (lambda (filen) + (install-file filen doc)) + (find-files "." ".*README\\.md"))) #t))))) + (home-page "https://github.com/stathissideris/ditaa") + (synopsis "Create graphics from ascii art") + (description + "ditaa is a small command-line utility +that converts diagrams drawn using ascii art +('drawings' that contain characters that resemble lines like | / - ), +into proper bitmap graphics.") + (license license:lgpl3))) + + + + +