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))) + + + + +