From unknown Sun Aug 17 07:00:49 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#60976 <60976@debbugs.gnu.org> To: bug#60976 <60976@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add ditaa. Reply-To: bug#60976 <60976@debbugs.gnu.org> Date: Sun, 17 Aug 2025 14:00:49 +0000 retitle 60976 [PATCH] gnu: Add ditaa. reassign 60976 guix-patches submitter 60976 Frank Pursel severity 60976 normal tag 60976 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 20 18:29:00 2023 Received: (at submit) by debbugs.gnu.org; 20 Jan 2023 23:29:01 +0000 Received: from localhost ([127.0.0.1]:47465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJ0oe-00052Q-3q for submit@debbugs.gnu.org; Fri, 20 Jan 2023 18:29:00 -0500 Received: from lists.gnu.org ([209.51.188.17]:50640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJ0ob-00052I-Vv for submit@debbugs.gnu.org; Fri, 20 Jan 2023 18:28:58 -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 1pJ0ob-0006UZ-MV for guix-patches@gnu.org; Fri, 20 Jan 2023 18:28:57 -0500 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJ0oZ-0005D9-A5 for guix-patches@gnu.org; Fri, 20 Jan 2023 18:28:57 -0500 Received: by mail-pl1-x635.google.com with SMTP id p24so6613253plw.11 for ; Fri, 20 Jan 2023 15:28:54 -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=cicRDO0xa2OevE2mHwWp00mRCr/0h5hOzYdh1kytusw=; b=j55i1tQfQTOKTsQp+mU2XINo/v481M9n7LhGdnYiJ4aHBa0Mh3szEN3uONWNUr4JaD rq95s5yb4vVd3+8eqXk3/s4rzSDF/KAQejLiUbWVZwF2mOMWKbGOvutHzRTlTDnxD+JH BzfLY2c3qWOqZ1at6yGyD+op+oHU5H7wt64stippv9zyrGkgIHnKrne9Je6LQeN8gB4l sMWWKesQE44i/WRSaagb1Tc8FegGuOluCjTdZgd8HRtWV4zrvL812afxt/UZhRjmRRnn W/5EaUSwdwxqQot17hS1I4ztyaZFb7sS/reTJPKQTG1VInGvRUasfBtpUehA2y147k7W nKwg== 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=cicRDO0xa2OevE2mHwWp00mRCr/0h5hOzYdh1kytusw=; b=Eo9XuwFHfZSjbA8gagPB9jCjVOS9YGUDvEodWp8rFS7oyJnADBuvr6UXXVjJHDE4Uj jUQkebOyuS/G7hS/kTmhaEIh3h2TgQBuxO7QfGnxU/x+1+94vnMJcuEhhaE/x35N3CGE V85ERGz4L3j/iooNupyg+bUL8lN53Y5wM0peIn4gxnMaBVg6DKgaVklnRpHSATIF5GfI 8i21T1MYMaLAQiWpKCYyVFn2fCD4cUazZuxmTTCMRtTIEXwUHkgWT4OoL5exRm2E+cSS 5jmXCt46MxsxskOIldDT6JyyBnNCLbJjq36kwMsh+4HjAc1b/+MLJ8qH58yITNp0v0/t 2cQw== X-Gm-Message-State: AFqh2kr/HWjeSweV9qYY138KLhfudMA5MDxY1Ibiq/hPyc1/EF/NeQL/ jMFRD40cgkS76laAetJ6iNysDA9X1qE= X-Google-Smtp-Source: AMrXdXspGSmg4BB7WhzITOG/3vwKdryOAJLD36y0dzKf8ytV36y4MS0WWZ/Qh0t8oFo9yVis8sUsLg== X-Received: by 2002:a17:902:ccc9:b0:194:749a:1e78 with SMTP id z9-20020a170902ccc900b00194749a1e78mr18390125ple.40.1674257332362; Fri, 20 Jan 2023 15:28:52 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id c22-20020a6566d6000000b0045dc85c4a5fsm19342550pgw.44.2023.01.20.15.28.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 15:28:51 -0800 (PST) Message-ID: <63cb23b3.650a0220.26d15.f66d@mx.google.com> X-Google-Original-Message-ID: From fe6fb328ce756aed0ac0a123483192f8af1ebc65 Mon Sep 17 00:00:00 2001 From: Frank Pursel To: guix-patches@gnu.org Subject: [PATCH] gnu: Add ditaa. Date: Fri, 6 Jan 2023 10:46:18 -0800 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=frank.pursel@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: 14 X-Spam_score: 1.4 X-Spam_bar: + X-Spam_report: (1.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_96_XX=3.405, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/ditaa.scm: New file. --- With Guix as with everything in life: If at first you don't succeed . . . Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.51.188.17 listed in wl.mailspike.net] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * gnu/packages/ditaa.scm: New file. --- With Guix as with everything in life: If at first you don't succeed . . . This patch addresses the issues I discovered some time after posting 60612 which was intended to address the issues with the still older 53908! All of which required building a few odd dependencies supporting the goal of adding ditaa to guix's repertoire. Like the earlier patches to add ditaa I'm again hopeful about this one and look forward to any feedback. Sincerely, Frank Pursel gnu/packages/ditaa.scm | 296 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 296 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..c47efa3b3e --- /dev/null +++ b/gnu/packages/ditaa.scm @@ -0,0 +1,296 @@ +;;; 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 =C2=A9 2023 Frank Pursel +;;; + +(define-module (gnu packages ditaa) + #:use-module (gnu packages) + #:use-module (gnu packages bash) + #:use-module (gnu packages java) + #:use-module (gnu packages xml) + #:use-module (gnu packages java-xml) + #:use-module (gnu packages javascript) + #:use-module (gnu packages batik) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system ant) + #:use-module (guix modules) + #:use-module (guix build 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/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-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/"=20 + name "_"=20 + 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 + `(#:tests? #f + #:jar-name (string-append ,name ".jar") + #:source-dir "sources" + #: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" + "transcoder" "ttf2svg" + "util" "xml")) ) + (for-each + (lambda (sdir) + (copy-recursively + (string-append + "batik-" sdir "/src/main/java/") "sources/") ) + sub-dirs) ) + ;; Remove scripting subdirs for jpython, and jacl.=20 + (for-each + (lambda (rfile) + (delete-file rfile) + (format #t "Deleted: ~s\n" rfile)) + (append + (find-files + "sources/org/apache/batik/script/jpython" ) + (find-files + "sources/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=20 +applets that want to use images in the Scalable Vector Graphics (SVG)=20 +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0) ) ) + +(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=3D\"1.6\"") + "source=3D\"7\"") + (("") + (string-append "" + "\n" "")))) + #t)) + (replace 'build + (lambda* _ + (setenv "ANT_OPTS" + (string-append "-Dversion.string=3D" + ,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=3D" + ,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=3D~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=20 +that converts diagrams drawn using ascii art=20 +('drawings' that contain characters that resemble lines like | / - ),=20 +into proper bitmap graphics.") + (license license:lgpl3))) + + + + + base-commit: 4e9cb45da0cc41cf85b720640a8ba9bc88c28d46 --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 24 07:35:16 2023 Received: (at 60976) by debbugs.gnu.org; 24 Jan 2023 12:35:16 +0000 Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKIWB-0003KL-MC for submit@debbugs.gnu.org; Tue, 24 Jan 2023 07:35:15 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:42823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKIW7-0003Jc-0o for 60976@debbugs.gnu.org; Tue, 24 Jan 2023 07:35:11 -0500 Received: by mail-wr1-f54.google.com with SMTP id d14so10045820wrr.9 for <60976@debbugs.gnu.org>; Tue, 24 Jan 2023 04:35:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=c8kfzm88cpBp4eaZdig8rIlIfs9VZIrpbTtYhkEsRF0=; b=BB5oVNJJTKoQkO4PVShk8/qxCm6xXGDztUEBJVvWBQoT5WBYSpWVm1fPoCXrx3EHlQ T8s5pdiVxImL5Wh8U06bD552i880oJRVcdHjv8jXLm5dnwOWdYbhbfecBpEZ/di9o1q2 nEOCjq2MyQe1W8ieI38FEIZxcGqk+gxLF1AHSiJM/HUjpKaQ5pjWE2v/xwJ/Fker+aHb sbfJJ7Rz7VQbgQEKSMC7MMpXEB+XB2SHjtasbPbOvB0pgEcWGmvtX8dtCvHbe+z0OgMX S3XzP+e4UmYqeRn2s7BgwpffI4Dotdp8auCkhMuZZeOKzA2hVNly8Z85AqWu/HurASnl P3nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=c8kfzm88cpBp4eaZdig8rIlIfs9VZIrpbTtYhkEsRF0=; b=LyaQkNJUEVXfiSWfa7KqN8HZNbA2Sys8hPwHTfstOxrfkex3yIh4pqatRDyNjeJern ARzrAEfdZC8Y+LGSoLmbnZenc45Au679kAzD9/hrhb0aLhre6GLmKOmm5aFHFDj+CBgo D1JG0Bp8ZK7Kf4GkOrKMfgEFBKoftPiBdhVvvYE94etIXu0sfyCoE8LjvffJ+peByMli 2v+ljzYy8mEEwqN/G3XoB1FFahYx3VotJ0a8umd6r4vhc4Q7gGQZoPJjy4Q9vXvymIYM YvRjfWj924W6JuzebyjTWMvM+7t9UXyQmPSFSJYMMVWEp0X0m8GtCg6W5qqCdh7LcBOG fdRg== X-Gm-Message-State: AO0yUKVpcdpE7LkQ2ZbiQ/cflFHntdl54GWi430AvCuXi+ee/MPlS0Ti GPXQ2CUt8iAffGcz35rjrN8T3TKjiLc= X-Google-Smtp-Source: AK7set8mZT3bGY9jOIEuTxMxsxKdifcrn5nPhOPTP3jS4irs2MRcidVXR+QVG2e4d/CO0Wq98PP1/A== X-Received: by 2002:adf:d239:0:b0:2bf:b2fe:a2c4 with SMTP id k25-20020adfd239000000b002bfb2fea2c4mr179623wrh.7.1674563705224; Tue, 24 Jan 2023 04:35:05 -0800 (PST) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id s18-20020a5d4ed2000000b002bde537721dsm1805098wrv.20.2023.01.24.04.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 04:35:04 -0800 (PST) From: Simon Tournier To: Frank Pursel , 60976@debbugs.gnu.org Subject: Re: [bug#60976] [PATCH] gnu: Add ditaa. In-Reply-To: <63cb23b3.650a0220.26d15.f66d@mx.google.com> References: <63cb23b3.650a0220.26d15.f66d@mx.google.com> Date: Tue, 24 Jan 2023 11:44:58 +0100 Message-ID: <87o7qop5xx.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Thanks for your contribution. Several minor things. On ven., 06 janv. 2023 at 10:46, Frank Pursel wrote: > * gnu/packages/ditaa.scm: New file. Why a new file? Could you split this commit? Basically, each package addition should go to their own commit. > +(define-public java-jericho-html Why not some of the gnu/packages/java-*.scm files? Or gnu/packages/batik.scm > +(define-public java-libbatik Idem. > + (arguments > + `(#:tests? #f Please provide a comment why the tests are disabled. For example, if there is no test suite or if upstream does not provide tests, (arguments `(#:tests? #f ; no tests > +(define-public ditaa Why not in gnu/packages/graph.scm? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 24 21:50:57 2023 Received: (at 60976) by debbugs.gnu.org; 25 Jan 2023 02:50:57 +0000 Received: from localhost ([127.0.0.1]:57963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKVsG-0003gz-Pg for submit@debbugs.gnu.org; Tue, 24 Jan 2023 21:50:57 -0500 Received: from mail-pj1-f48.google.com ([209.85.216.48]:37661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKVsE-0003gl-EU for 60976@debbugs.gnu.org; Tue, 24 Jan 2023 21:50:55 -0500 Received: by mail-pj1-f48.google.com with SMTP id x2-20020a17090a46c200b002295ca9855aso604753pjg.2 for <60976@debbugs.gnu.org>; Tue, 24 Jan 2023 18:50:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=pMmvyK+HdfhNLr18WzGcrInANgALp2GpIELkeAr2BvY=; b=iTNDYSU7IRnXnylkSh7d8swHbhCDj/y1KFsbvh7Bu5xixBACTuNz0M31Flr03b/QmY WqEFfNjUfVn0xMIytGiqDxaY0rYrMhDIxPBJ3AM+0lTzP7aGqB2BgaS9hb3rjsJSmmBR duLEtgew4/Gncm1OmjjPksK9mQT2SIdoYKzUfS/UAf4yztk1k55fjI64bt7AVN15h4gG dcX1JhKjaR2f3XFZJN+m4w89W3InJ8v6M+0eACjVvKC40IxLx67Xvpt1Qg9cuzVRB6dm QrUV2Sf2CQAq1lbp+sPyOC2SZw6wQrC2NcQ89VtEB+lDvWuNWir9OcSBGatyUdmQtgVw i56g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pMmvyK+HdfhNLr18WzGcrInANgALp2GpIELkeAr2BvY=; b=EzXEmabNUAglHVlGw9wuXLloWNyofZyGjsTowV7tKW3NEMMTfcj3mpxeIEmR5Ar431 niM6wnM5CGE7U2u9LTvzWr8tX4lQ3utMsGn+7VMVCoFEzxAr6+96jTAHI+5Bmx4wxKXj G3lnUez6dY+oNYHjPPEPq2sSY/Qwi9wfhwrgawwQEmdDZomQaG4/FsLS/xbTzFBuEOmp pY6Qwio6om0uTiADguYbyP7j9Hyv+qwjBqgOPWXY8TyCl5ei+8dvIN5s6WSFS2luXybI N8yx+Q8TtnYJ5h0Yp/QnxUdel0+BvXUynSI8T8pXxFCjBsgFsOwAxZYSXsnlvXDL6nx+ /Sgw== X-Gm-Message-State: AFqh2kocfEEwMkKE5YgeIGhkBxkV3uDmZWNM//LUFpJ7GRC1XO4GRSaz dQgu8cLSPUXgy7UK/aZWUytGFp6Fx6M= X-Google-Smtp-Source: AMrXdXubTtKTtbgeBZB5qXHeT2jSfoXDjB+6qRWxq12FW99/socOpye/i2GsLSZ4hRP+2Tpph9ae4Q== X-Received: by 2002:a17:903:2448:b0:192:7845:e0cc with SMTP id l8-20020a170903244800b001927845e0ccmr73602391pls.68.1674615047742; Tue, 24 Jan 2023 18:50:47 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id y16-20020a17090264d000b0019335832ee9sm2367582pli.179.2023.01.24.18.50.46 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 18:50:47 -0800 (PST) From: Frank Pursel X-Google-Original-From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH] gnu: Add ditaa. Date: Tue, 24 Jan 2023 18:50:45 -0800 Message-ID: <87wn5bxr7e.fsf@Ginko.mail-host-address-is-not-set> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Tuesday 24 Jan 2023 at 0435 PST, Simon Tournier wrote: > Why a new file? > Could you split this commit? Basically, each package addition should go > to their own commit. Yes, I puzzled over that too and I think this is the best answer. If you don't admit a new file (for which I don't see great economy) then you must decide what three others you would dilute or adjust to avoid clearly identifying the relationship between these three packages. There seem to be prior examples of small, unique packages of about this size having separate files. Ditaa creates graphics but does not do anything like provide OS level interfaces like in 'graphics.scm'. Similarly, it does not deal with computer science graphs like in 'graph.scm'. It seems to me it is more like curl which stands alone in curl.scm or bison, in bison.scm, cmake, cpio, abiword, and I could go on. While, I know, ditaa is not as fundamental as these other giants it shares that ubiquity. So, I think, ditaa's uniqueness merits that distinction. Together with it's odd dependencies I don't see a better fit but if someone has the courage to positively assert where each of these packages fits I'm completely supportive. > Why not some of the gnu/packages/java-*.scm files? Or gnu/packages/batik.scm Another reason not to want to split this commit is because, per the reference manual, It seemed to me that this was also 'one set of related changes' enabling ditaa. java-libbatik and java-jericho-html are unlikely to be used in support of anything else but cannot be commited separately without breaking ditaa. I also suspect their purpose would quickly become unclear if mixed with other java packages. If there were another application that also built upon the concrete java-libbatik then I think the argument for moving it into batik.scm would be stronger but don't think there is one because batik.scm remains more abstract. I think that is ok. 'batik.scm' is java internally uses an svg api but ditaa leverages svg to produce other than svg output and is independent of java. It is a tool that is likely to be used in non-java environments. > Please provide a comment why the tests are disabled. For example, if > there is no test suite or if upstream does not provide tests, Knowing that ditaa's checks (which depend upon libbatik) was enough for me but I think I can do better. I'll get another patch together to achieve this. Noting that the qa checks on this patch now indicate that this patch is successful (I never take this for granted) does this seem like a good path forward? Regards, Frank From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 25 05:10:26 2023 Received: (at 60976) by debbugs.gnu.org; 25 Jan 2023 10:10:26 +0000 Received: from localhost ([127.0.0.1]:58363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKcjZ-0005hp-QZ for submit@debbugs.gnu.org; Wed, 25 Jan 2023 05:10:26 -0500 Received: from mail-wr1-f50.google.com ([209.85.221.50]:36594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKcjX-0005hQ-Fi for 60976@debbugs.gnu.org; Wed, 25 Jan 2023 05:10:23 -0500 Received: by mail-wr1-f50.google.com with SMTP id b7so16513474wrt.3 for <60976@debbugs.gnu.org>; Wed, 25 Jan 2023 02:10:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=+BEiLjsoj3NqXgIsUzu6CWirHCyk8oJmUp5a5b1Jlyk=; b=dPV5Jk3+YmeAHiBg122qYBVO9yBiLrSEuRXtoK0rPk1RnMAmbkgJlfwFAlRoB925un VJ02+hY+TLVRjpJlOd1XnuTbnnrqllE16Tn39O7mjn0eSZUQU8uCgvCYSbr4UMMuyy2b uKljmUIC1DPFQ2pW5qo3HkIxy28cT6amLK5Vi/GTmqwIAp3sw99xlA1OQC2Dm9WrLD1P KtuDdICQBTuEpNTzc3zI0e6TjfFpyhRnEJEmcBLDk+VhSWk6cYcvpUxG0OrYXOTJquQZ 8/4ZZ5JVAiRjoX2XLU9cOPahsXEBL5/K4iLpMCUTKQvHr8oDM6IvVKWE+n7Raza7Egva jOjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+BEiLjsoj3NqXgIsUzu6CWirHCyk8oJmUp5a5b1Jlyk=; b=5LYyujjt5yt1THCN8Li2b2/7BPeNJhphajv44FeOp85OCA7zcNdfrSPnyHjrWA6Jkm YmTepS9z5G/7TafV1XXw57NwfqFk6HGuoH6fHaFBqut/2XYjJOGnm7wBZKEfEaiFuuvN Vlavsj9whkatz7AUd6yKlr50gDmCj8e94F6+n7lEo7EmlXtGk7cEP98PSXawzWDOmkyK tzcbuYOVjL8yhSlGA+CkEvPOasDMKL0eaDwJGUPd/GMimXgNNVW+kA7TJitBfox2TN7a H/3F7jFMHNvQrWhgY/eJ8BdnRSAlOI7wAJnoZTZOejhXEHPsAvg1J7ux8lNsBRXPYYoP jOjg== X-Gm-Message-State: AFqh2kpG42UaiUFdzBScnBxj9uPOqEFxFAEt7vYQpwFQHYjr73qzIMSd 9Fkh74qVyXuiTKG70ho68jnjiSRllTc= X-Google-Smtp-Source: AMrXdXsgRoQ65LBjYP43rAhOZwkullUfxjtMCFni+rVGxcMcFW3HjLYwHPZxyP+euefbg2tLQGIbZA== X-Received: by 2002:adf:ed0c:0:b0:2bd:ec92:d979 with SMTP id a12-20020adfed0c000000b002bdec92d979mr5414616wro.2.1674641417908; Wed, 25 Jan 2023 02:10:17 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id w14-20020a5d608e000000b002bc84c55758sm4844052wrt.63.2023.01.25.02.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 02:10:17 -0800 (PST) From: zimoun To: Frank Pursel , 60976@debbugs.gnu.org Subject: Re: [bug#60976] [PATCH] gnu: Add ditaa. In-Reply-To: <87wn5bxr7e.fsf@Ginko.mail-host-address-is-not-set> References: <63cb23b3.650a0220.26d15.f66d@mx.google.com> <87wn5bxr7e.fsf@Ginko.mail-host-address-is-not-set> Date: Wed, 25 Jan 2023 11:10:01 +0100 Message-ID: <86pmb353ie.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Tue, 24 Jan 2023 at 18:50, Frank Pursel wrote: > Another reason not to want to split this commit is because, per the > reference manual, It seemed to me that this was also 'one set of > related changes' enabling ditaa. java-libbatik and java-jericho-html > are unlikely to be used in support of anything else but cannot be > commited separately without breaking ditaa. I also suspect their > purpose would quickly become unclear if mixed with other java > packages. No, there are independent. This package java-jericho-html does not depend on the others so it deserves its proper commit mentioning its addition. --8<---------------cut here---------------start------------->8--- +(define-public java-jericho-html [...] + (native-inputs (list java-junit java-slf4j-api java-log4j-api + java-commons-logging-minimal)) --8<---------------cut here---------------end--------------->8--- Then, it is similar for this other one: --8<---------------cut here---------------start------------->8--- +(define-public java-libbatik [...] + (native-inputs (list rhino java-xmlgraphics-commons libxslt + java-jaxen java-junit java-jaxp java-xerces + java-jdom quickjs)) --8<---------------cut here---------------end--------------->8--- Therefore, I would expect three commits, like this: gnu: Add java-jericho-html. gnu: Add java-libbatik. gnu: Add ditaa. > If there were another application that also built upon the concrete > java-libbatik then I think the argument for moving it into batik.scm > would be stronger but don't think there is one because batik.scm > remains more abstract. I think that is ok. 'batik.scm' is java > internally uses an svg api but ditaa leverages svg to produce other > than svg output and is independent of java. It is a tool that > is likely to be used in non-java environments. Well, I am not convinced by this argument about java-libbatik. :-) Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 25 12:43:01 2023 Received: (at 60976) by debbugs.gnu.org; 25 Jan 2023 17:43:01 +0000 Received: from localhost ([127.0.0.1]:59881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKjnY-0000TC-Om for submit@debbugs.gnu.org; Wed, 25 Jan 2023 12:43:01 -0500 Received: from mail-pj1-f51.google.com ([209.85.216.51]:44838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKjnX-0000T0-Fj for 60976@debbugs.gnu.org; Wed, 25 Jan 2023 12:42:59 -0500 Received: by mail-pj1-f51.google.com with SMTP id h5-20020a17090a9c0500b0022bb85eb35dso2808404pjp.3 for <60976@debbugs.gnu.org>; Wed, 25 Jan 2023 09:42:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=WlQDCQm5VvPjIuuEYfenFm4+Bbh1QuwuC5PE0OnW8h8=; b=ZTGi8SwWmG8xY1FiukHsJmmd4zEnpDOw2LsvRByEXyeMoRizEwPuYepoE7rw4UpkEl GL1V2Wt52+v3SQEdO0KVQPKEcFyzCasATemFfd3xFHrMtsgj62dnNWCMwrqnPcmvPiBp foOWjDY9tTZiEKq7ckKsCeCfRUpLbMefVMJmL8TOVKo1fmevJLhyh8pTQuiZrW3j9fp4 3LYfXA7IQV1hSFrOGfSd1B4gVE3xVjutMhWMrDfGjZ6KJ1O5FnZU2iZX/Tc8Trc02WjO Aj+Qx46rOFc3y0dEIbnTDSFEA6kFedIiBDV82dFeDPWUMVq26ayR0mkBOjNIdHFuKO46 czKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WlQDCQm5VvPjIuuEYfenFm4+Bbh1QuwuC5PE0OnW8h8=; b=6jLSjAytT1f7jkHs9ISKnljEdmJ61Zenl3dp+EqMe1w34vRojIhmlkEf+7Gre84LF8 ngkIH1oc6WJnqxwixsar8VyBcXpnv3H4gMhWHkIbiI/YD5eaQO3aLjsx0+vOCdyXYHjP YDleuLB33SLY+k1C+hDREK3Ej5ZFxYivA+07ec1bGKszeM6Kwo/FYtHOwf68/Fh4LdCm RtFyZ113JrHS7hfdAE2aaDdJLoUYvtODnvymPiKwa6rjKtYZ9m7qRGlwdkjXXrUp2T+s 4cEgqhdT5M0NoeJqemwCwlDO9wVG30t6n4v8VnoxiSdLzypIGWpXizNdb822h3Ug2ggH vhrw== X-Gm-Message-State: AFqh2krxj4eXpzGtl0miuyqDI67f4lKwNmgDbraiHeIwbpwr1H+ao0fi Ql6XYdvVSUBz6pliCRv4wsmDJ/PN1pw= X-Google-Smtp-Source: AMrXdXutayQA1uV+UkPk2hN67dh3e8Zh3gDEp9QSS3UFwTqsAr6cDCN0Wc2TY7t5JlOclVJ3M0tJug== X-Received: by 2002:a17:902:f542:b0:195:ed79:4846 with SMTP id h2-20020a170902f54200b00195ed794846mr22354885plf.22.1674668573244; Wed, 25 Jan 2023 09:42:53 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id 6-20020a170902c20600b00188fadb71ecsm3936446pll.16.2023.01.25.09.42.52 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 09:42:52 -0800 (PST) From: Frank Pursel X-Google-Original-From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH] gnu: Add ditaa. Date: Wed, 25 Jan 2023 09:42:51 -0800 Message-ID: <87tu0ey0h0.fsf@Ginko.mail-host-address-is-not-set> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Zimoun, Ok, so, after some additional looking around, I think this is what we want to do: Three commits, as follows 1. java-libbatik -> batik.scm (gnu: java-libbatik) 2. java-jericho-html -> java-xml.scm, (gnu: java-jericho-html) 3. ditaa -> New file ditaa.scm, (gnu: add ditaa) Let me know how this sounds. Regards, Frank From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 08:06:48 2023 Received: (at 60976) by debbugs.gnu.org; 26 Jan 2023 13:06:48 +0000 Received: from localhost ([127.0.0.1]:60963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL1xo-0002DT-C1 for submit@debbugs.gnu.org; Thu, 26 Jan 2023 08:06:48 -0500 Received: from mail-wr1-f50.google.com ([209.85.221.50]:36645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL1xi-0002CO-MB for 60976@debbugs.gnu.org; Thu, 26 Jan 2023 08:06:43 -0500 Received: by mail-wr1-f50.google.com with SMTP id b7so1725371wrt.3 for <60976@debbugs.gnu.org>; Thu, 26 Jan 2023 05:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=XQYsLXHkPjtojraPMG66o/ShngYVbQHKcZc2tsxRQqY=; b=lygY42D5m2bR+Xw3P8UeJPQALId70YUrvKxmLEBZDbqDgb1WQvUFmXZYMf03tCIJLN kCFQNbs13QDunLZZrrcp9oI/amk4FYUBvI38Jo9tMY7T1mEf3LnJqHlHpCHPKA5+89nW A3QcR7rUkiGk84bTeKXSIVeAa2wTEJXggI8wfO+aoTaqgqFO0YH0niBFeDaUsySWZ3M/ n3STS7k/s/0xCqEyjOivUAxJ/wpWVbe+aPkHOBHeO66emYl95zYL056aYUvl0F9P/UCN VED66FrwSBZ4R5OtYpJ+nbCIYtCg4eozrrBCtopcuXfQsjQRbOzi0AZIICtGvWUhmd0A owVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XQYsLXHkPjtojraPMG66o/ShngYVbQHKcZc2tsxRQqY=; b=tq34p31K6xijwDsXvMRpJBeHPBC+M/L0kd3SYr3s9L3Q5lKMZSzhJ4GECe+KenZzXc 1lb4gW/kniL5jbHPSIK59XtJmC5AJmcv/o05xYsNXlH6U5g1Hco1MyygeeDEoWoIrR8S Zh+DO51hUHW5fzxbmMo19OxwqevtC2oQ3y9I8bUsf4pNBKhOmJ22k+iMcUlVLx8sKErS 79b5Fwq1AcyxUcdoNjTxtdDSrDaM9tSPMAQzvFs4laDp5zfny1QCJ/9/MpB6FJ4r29t0 Dv2CNUNCq6vu2TwN7/yGKcIMGtbzXxUE/U9NAfdLQAHDJoxTsDi8UN7u0qkBC+ov1Klp fv2Q== X-Gm-Message-State: AFqh2kq5C/wNBXIr2eJArlKp6U8eM5vrBMmpVkpeHwvQ21/ZIwwn5VXP Y4AM6ghWi70x+SryHeS10YVLHLOPuFA= X-Google-Smtp-Source: AMrXdXuZEpVIZDViIEc2JMOXnK1DC6YW4GB+AfXT1QyB8dudK+H7R9Dzj3pyyCtC1KvjK1CapkRphA== X-Received: by 2002:adf:fd0f:0:b0:2be:4639:ee27 with SMTP id e15-20020adffd0f000000b002be4639ee27mr4251685wrr.1.1674738396513; Thu, 26 Jan 2023 05:06:36 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id z3-20020a5d4c83000000b002423dc3b1a9sm1327441wrs.52.2023.01.26.05.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 05:06:36 -0800 (PST) From: Simon Tournier To: Frank Pursel , 60976@debbugs.gnu.org Subject: Re: [bug#60976] [PATCH] gnu: Add ditaa. In-Reply-To: <87tu0ey0h0.fsf@Ginko.mail-host-address-is-not-set> References: <63cb23b3.650a0220.26d15.f66d@mx.google.com> <87tu0ey0h0.fsf@Ginko.mail-host-address-is-not-set> Date: Thu, 26 Jan 2023 13:36:46 +0100 Message-ID: <86r0vhqxpd.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Frank, On Wed, 25 Jan 2023 at 09:42, Frank Pursel wrote: > Three commits, as follows > > 1. java-libbatik -> batik.scm (gnu: java-libbatik) > 2. java-jericho-html -> java-xml.scm, (gnu: java-jericho-html) > 3. ditaa -> New file ditaa.scm, (gnu: add ditaa) > > Let me know how this sounds. This sounds good. :-) Thanks. Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 12:18:18 2023 Received: (at 60976) by debbugs.gnu.org; 26 Jan 2023 17:18:18 +0000 Received: from localhost ([127.0.0.1]:36089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5tC-0005qG-6C for submit@debbugs.gnu.org; Thu, 26 Jan 2023 12:18:18 -0500 Received: from mail-pj1-f54.google.com ([209.85.216.54]:37397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5tA-0005q2-IB for 60976@debbugs.gnu.org; Thu, 26 Jan 2023 12:18:17 -0500 Received: by mail-pj1-f54.google.com with SMTP id x2-20020a17090a46c200b002295ca9855aso5935550pjg.2 for <60976@debbugs.gnu.org>; Thu, 26 Jan 2023 09:18:16 -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=ZoPapW4/hwDHMAR7f8ca8kpyTghaHejnP5lSgknzNF8=; b=eEtxKQKSMikLYfhK250NVM0ZtII62NXIttJUdoq8NMTEXMYmDZmvnJEzfE5DRFVQ1w FYV5FSLgiuU55OeKn9g/qceOCDS18aWoH62nIQl7zWrnfSb9XGQ/tSJteYAyh0UvNw5x lCnjVOnpBum5CGs7pdbNYaFn+etR1YR8CfR3Fte9th5jDNxZ5lCSV7Zw/H+RL8VfzPLT L2/YrVhs4tcIegUAe9kgIzkHa7RBSByG7K+rYdumI0EJ2NL+knAtJWQ/UpKLmAT9fN/h 4v35j2WyQpA1xvza3u0dUU0EXYGmnUDJVpCc6y+BLjfVwRf79cqD2a2NlTuqC87em3jE 3upw== 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=ZoPapW4/hwDHMAR7f8ca8kpyTghaHejnP5lSgknzNF8=; b=xVMo4pq4VY20EK5O7oNgWnS7Ut561YtwjMJxPrKWe8z+1/32ILcJxB+qpUGgrel8RB tO2CXUb45cVcXGvKWsqZnlr8rtgPBom+ztur1aTyVp8KchHs32XL6TaXlXAdx2f9+3b1 OOVMXdL6J3xacPgOutbnKWlBBL10rGvqYDuXXVfc6ftdfmA3Uo9HraQcdu13J57QMj8c pSfuYXiTqRz9DKY4RdcYNxK7UC6rcmH0FzZ0cwfQKyy+VvxzyxAR+/T9o5nHmB7g6OAt pMwg4HYppsjkNM+A/AZ9ck27+6UXCVXjX8OTmoE2Rk7Nd7vLWWXoC2ML0kJ+EeW4UVdN nI5A== X-Gm-Message-State: AO0yUKVgPzfKcTGBivpS6gc74JsB2HLKPCGvc64mrWFeefN5yQfqBVR8 PVgI4MmGRLIeyq3ujd2uXgaCvi+qRzQ= X-Google-Smtp-Source: AK7set/PqVmyX+j6+3re6usNg2fjHJjdTBJY8BaLDWd0YspRJoPyy3GgRfjv/wUegUz+0Se6g5BYrg== X-Received: by 2002:a17:903:1d1:b0:196:2ade:6e21 with SMTP id e17-20020a17090301d100b001962ade6e21mr7691858plh.14.1674753489604; Thu, 26 Jan 2023 09:18:09 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id u5-20020a17090341c500b0018853dd8832sm1264608ple.4.2023.01.26.09.18.08 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 09:18:09 -0800 (PST) Message-ID: <63d2b5d1.170a0220.22b42.2952@mx.google.com> X-Google-Original-Message-ID: <1351eea169a28d30040826b14079fb49de3c98b8.1674752933.git.frank.pursel@gmail.com> From 1351eea169a28d30040826b14079fb49de3c98b8 Mon Sep 17 00:00:00 2001 From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH 1/3] gnu: Add java-jericho-html 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-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) --- 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.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 12:19:35 2023 Received: (at 60976) by debbugs.gnu.org; 26 Jan 2023 17:19:35 +0000 Received: from localhost ([127.0.0.1]:36093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5uQ-0005sE-Mh for submit@debbugs.gnu.org; Thu, 26 Jan 2023 12:19:35 -0500 Received: from mail-pj1-f44.google.com ([209.85.216.44]:44797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5uP-0005s1-Aa for 60976@debbugs.gnu.org; Thu, 26 Jan 2023 12:19:33 -0500 Received: by mail-pj1-f44.google.com with SMTP id h5-20020a17090a9c0500b0022bb85eb35dso2378451pjp.3 for <60976@debbugs.gnu.org>; Thu, 26 Jan 2023 09:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:date:in-reply-to :subject:to:from:message-id:from:to:cc:subject:date:message-id :reply-to; bh=XUFhXheDIdetPOrZmvvNj32BCBH2ReY/GBLjtEmCQs8=; b=KZXrcC9O+bMqOanRcHXFbdLP5q4nlsF2CsFtpIkuLbqEfQgLeN8xfFxlcm3PC3AxqZ 0/QKkGWqCYzEm9XBarINfGUNgmmnwYwdRURSBaLalpAUI1IbZa9eZ/D8uvjvXnnAyzak UsGK3ODoo9iOhd/LnLpixjV+1Xr8jXwpvG4SdoVi6YIQ0LjvQ9i8QKa3Xu5IQ/oNBWWI AC9/YbAHYc/RoCONnRY01vFdPEV3uzULiiCcLNQlTyoyTUWR9iB4oxmDoJlZcHI1dpTp havF8qiXJlOY19hH4eBndmwE9tIsagSZnV9IOWAzOlcic9QopW7ACRXFO7gkpx5BIvxg eHbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:date:in-reply-to :subject:to:from:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=XUFhXheDIdetPOrZmvvNj32BCBH2ReY/GBLjtEmCQs8=; b=nW3AonrsoU12UQHpIer+99iDJjGOaPOkWYxssips4oC5yfxMfwp3YaJ//P2e7f+Voh 5w+G7/UKq6yrVZHwdDLOy33RQ9dyD4H0EqCMd5jIhS2kX6yxIWy7X2AERCD3fIleMpho dZv080fPup3AdlnCnCZLpe1YMiAXB5TFgPuvgX8wGJ5zlHJJae7uxHn9Sam8N1f+7RfG TAk5acDg2TMjJdjT7owEhVduL3nwIix9kWTC2+w4zsL2ckU4BEBiX9uWqZZom0y8TwYw dpT8JfkeZvdTboOGybTqf4iQhRRkBVpc/fyn2nuayiArDEWlukFIldVkPx5rTpBcBtjF MhLw== X-Gm-Message-State: AO0yUKXXHb0drnX6VRnr6SXBIzUARADc5+Au+jGmWrloRHEdgmligxek OLogaLROaIK2JwNQbxBwggu7pFZxgSc= X-Google-Smtp-Source: AK7set9s6Ud7ts3Q/fPBBG6Gn1exLSjgaNQkuMJi23KtIU0c7Xt5PsWsiNd3vl2saj7uMsKlqMUZRQ== X-Received: by 2002:a17:902:dac9:b0:194:645a:fa9a with SMTP id q9-20020a170902dac900b00194645afa9amr7757948plx.8.1674753567114; Thu, 26 Jan 2023 09:19:27 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id e6-20020a170902744600b0018c7a5e052asm1211256plt.225.2023.01.26.09.19.26 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 09:19:26 -0800 (PST) Message-ID: <63d2b61e.170a0220.d16b8.225e@mx.google.com> X-Google-Original-Message-ID: <4dded0fd7cc5556c2468bba775ecfe1a290ff5e2.1674752933.git.frank.pursel@gmail.com> From 4dded0fd7cc5556c2468bba775ecfe1a290ff5e2 Mon Sep 17 00:00:00 2001 From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH 2/3] gnu: Add java-libbatik In-Reply-To: <1351eea169a28d30040826b14079fb49de3c98b8.1674752933.git.frank.pursel@gmail.com> Date: Thu, 26 Jan 2023 08:53:09 -0800 References: <1351eea169a28d30040826b14079fb49de3c98b8.1674752933.git.frank.pursel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- 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 =C2=A9 2018 Danny Milosavljevic ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 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/"=20 + name "_"=20 + 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.=20 + (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=20 +applets that want to use images in the Scalable Vector Graphics (SVG)=20 +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0) ) ) =20 (define-public java-w3c-smil-3.0 (package --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 12:20:54 2023 Received: (at 60976) by debbugs.gnu.org; 26 Jan 2023 17:20:54 +0000 Received: from localhost ([127.0.0.1]:36097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5vi-0005uN-7r for submit@debbugs.gnu.org; Thu, 26 Jan 2023 12:20:54 -0500 Received: from mail-pg1-f170.google.com ([209.85.215.170]:42795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5vg-0005uA-A2 for 60976@debbugs.gnu.org; Thu, 26 Jan 2023 12:20:52 -0500 Received: by mail-pg1-f170.google.com with SMTP id e10so1489810pgc.9 for <60976@debbugs.gnu.org>; Thu, 26 Jan 2023 09:20:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:date:in-reply-to :subject:to:from:message-id:from:to:cc:subject:date:message-id :reply-to; bh=n44Ow1RAtD2bsmnjsld5WqPFbglpR7t+o5BBiuIR2WA=; b=TFQvAyqkx6gtyMERiUkDNUOUHrH8OlX8lHewxZsQRgdY4NjYIFZ2E9XvtQp/Qcf6NR ktBF0g2muIgOUnVmWj529aR45Utp5U0k+LL+ZaOlPCA4a4Zk3hYEVQFzSPeHqmmxdEum kD/Kx6eLhjoSw0W18hokQ70TL/ntaDH0WH8z4ETo5YcxME7RlMC1UtPjVXcumm5LMonc QZR/dXwVBjoxMCArtR8JxFjYsWlPWECJUUnciOnmwdGOXVrdTZCwzrmMpcZY+OdWZMda kiPSAtyZweGcASdsne+/b9H3IFdkRcy8fuUflKXYDL3GO1LuwpZDzzq8Cp2Y/J5PYPi5 f3DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:date:in-reply-to :subject:to:from:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=n44Ow1RAtD2bsmnjsld5WqPFbglpR7t+o5BBiuIR2WA=; b=eKy9XpVNYZRaRcWnZ0IxyYqSzz9iXSP+qGx9y8h3+MZLZNxgy8DkgFW16LMwkD8jKZ qTeeFZhxHXo8q1Y1DrgwEsCsAzs4jkRaD1ztRZEESyW98wrHziQdKiX+aTAqrzF1JMdX j53Sy8ZQTuiK7jI8MpLQ9sOW/+9K+A3nVrpbymL92WofemgzCjhfTedVacBbjBNslOQG nUW37/IweFzHBhNrqaZSy+QQDlqNC0Gc7kw0o40KT/P7K668OpVPwqOSthfL2yiMhlxA tW6+7Q2D/DDdM1yZmgHMwLAw8YixC6nyhqHNRatB1KBwXHQMRxZtqIroqzrA6GHpoX2Z cdsg== X-Gm-Message-State: AO0yUKUOyZfTfkgj7mQ1gBp+oPaXUrVsdadyh7PAG3udCDoM3Cow0by/ 5oNTLVkgJ76xNCLxZYfqRy8ZvrhBJjg= X-Google-Smtp-Source: AK7set/YYf3Ni25314xUScUcOOo/34uyggQYUWR5O0aZ0YPU3Wsw2+tQRaAmizN4d+AShLfqsBUKKg== X-Received: by 2002:aa7:9099:0:b0:592:44f5:c764 with SMTP id i25-20020aa79099000000b0059244f5c764mr1684245pfa.19.1674753645890; Thu, 26 Jan 2023 09:20:45 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id i14-20020aa796ee000000b0058bb0b8750csm1084917pfq.88.2023.01.26.09.20.45 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 09:20:45 -0800 (PST) Message-ID: <63d2b66d.a70a0220.ecd70.18ac@mx.google.com> X-Google-Original-Message-ID: <51d9aae0d048aebfccc46b5363271dc4f2bc64be.1674752933.git.frank.pursel@gmail.com> From 51d9aae0d048aebfccc46b5363271dc4f2bc64be Mon Sep 17 00:00:00 2001 From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH 3/3] gnu: Add ditaa In-Reply-To: <1351eea169a28d30040826b14079fb49de3c98b8.1674752933.git.frank.pursel@gmail.com> Date: Thu, 26 Jan 2023 09:01:17 -0800 References: <1351eea169a28d30040826b14079fb49de3c98b8.1674752933.git.frank.pursel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- 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 =C2=A9 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=3D\"1.6\"") + "source=3D\"7\"") + (("") + (string-append "" + "\n" "")))) + #t)) + (replace 'build + (lambda* _ + (setenv "ANT_OPTS" + (string-append "-Dversion.string=3D" + ,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=3D" + ,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=3D~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=20 +that converts diagrams drawn using ascii art=20 +('drawings' that contain characters that resemble lines like | / - ),=20 +into proper bitmap graphics.") + (license license:lgpl3))) + + + + + --=20 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 27 08:41:34 2023 Received: (at 60976) by debbugs.gnu.org; 27 Jan 2023 13:41:34 +0000 Received: from localhost ([127.0.0.1]:36944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLOyz-0003Zu-QZ for submit@debbugs.gnu.org; Fri, 27 Jan 2023 08:41:34 -0500 Received: from mail-pl1-f172.google.com ([209.85.214.172]:39894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLOyx-0003Zb-EA for 60976@debbugs.gnu.org; Fri, 27 Jan 2023 08:41:32 -0500 Received: by mail-pl1-f172.google.com with SMTP id z13so4950632plg.6 for <60976@debbugs.gnu.org>; Fri, 27 Jan 2023 05:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=0eYwO45d/rGwrbHZzrLkeYjLA3L9QwClEjr+c+TTkq4=; b=VtyOWWHQK7vzGg3U8Pr3Sd0lhsSbQZIomEJggjCrF4wCiJ9Tijm3NIfBsWTxw3PkIS LreNuT38JM3oIgNjUxPPpl1ZEpsb+qhXQKrf2CYBff8NmuFy9yPRtqEJ7NOGU3ruswQj 4tvtgztzCyt6szbZTOTZhWD4gWsjnvJuVnPf/Z4gnVuUHFoserIM2t+tckW/dQBczVQ+ sViwHSiuGpHJCmq8jg1aaz/zY+92w67p9kGA/kWSGaEq+TclDroBgw/ETeUBH9oOrD6M Cb7E/6eokaFRf2R7aZEKd3A//GCwg7sZFJO6iogf0Zl0fT2EGRW221hhCemX0gvcAbLE suIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0eYwO45d/rGwrbHZzrLkeYjLA3L9QwClEjr+c+TTkq4=; b=GeoDqxvXlAYzD+lR0bQ91CEQn+9ougqANKdfEWdshX4p9CjaG3HQrqKtpIkqarUt7n ntIDDv9TmJxoszZ9236grFClVburpxxnPzJ0CpDThnDdD1WjFKr33eeKmOimdsHZ40HC mDBmV/9kFOw50VW2Eb0INiYeMB8GB53Xfgc22z385hdcEuyRJBjJvrIdfE5g4/Lo2nEC JGGNIEhQ33KTeihyWoyMV2lBhw6gArzitPQ96vKHdWP/XQmBb2sK3/yealEXNAuDMsO/ mbxmWCFrKTvMo4kfA0T0CUrkkX7DO1Y5iqrja420LFNMD2yu0dKChZE8cqzr6qwJhuil MKQA== X-Gm-Message-State: AFqh2kq6Jm8slRB+/3e0MZbkXdgfy2tagMS2qqUUApF1HFllJ2+8b9aR FuP/ZxGTW5qcbUMbleJtWL5X+zhYoMk= X-Google-Smtp-Source: AMrXdXs4G9FLIUHjGTmtoQwHH0G5n2ILO3GzL7GsNO/u9TYkKmXW2+xZMbQBqxfrqtVuN+CTaoUmdA== X-Received: by 2002:a05:6a20:bf20:b0:a4:64c7:a7f1 with SMTP id gc32-20020a056a20bf2000b000a464c7a7f1mr41267754pzb.14.1674826884746; Fri, 27 Jan 2023 05:41:24 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id v11-20020a170902b7cb00b001925c3ec34esm2844225plz.196.2023.01.27.05.41.23 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 05:41:24 -0800 (PST) From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH 3/3] Add ditaa Date: Fri, 27 Jan 2023 05:41:23 -0800 Message-ID: <87fsbwxfgc.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) My experience has been that after making a change it takes 4 days for the QA process to produce other than an 'Unkown' outcome. Maybe the size of the change has some impact but I suspect it has more to do with the size of the outstanding queue. From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 27 23:50:10 2023 Received: (at 60976) by debbugs.gnu.org; 28 Jan 2023 04:50:10 +0000 Received: from localhost ([127.0.0.1]:39319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLdAI-0002wH-7b for submit@debbugs.gnu.org; Fri, 27 Jan 2023 23:50:10 -0500 Received: from mail-pj1-f44.google.com ([209.85.216.44]:44777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLdAE-0002vf-4B for 60976@debbugs.gnu.org; Fri, 27 Jan 2023 23:50:08 -0500 Received: by mail-pj1-f44.google.com with SMTP id h5-20020a17090a9c0500b0022bb85eb35dso6529022pjp.3 for <60976@debbugs.gnu.org>; Fri, 27 Jan 2023 20:50:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=8OkCOF6R/pgK53vUKeAeW9BkPOUZGKD+efyaS4LYmfw=; b=iW03KPC7BfNlFOxtgbKQkzwR8F29Nq38/Sg8oVN/Rvgpr95Bih9HFABqJWT6ODur9k JIIi13cDlyIwQKtlEvoDaxij18cVAjJknn3iDCNdfLirilAbtAD85N98Se2AnxKt3z64 xWEA8B84BllM9edixzzbMlnNpmo5k66Atoppc6D+g6TM0kaswnpafgcwgn4R7Ny31JpF GJeEJSrhwPfd/jVSxAoU4aGKSD9z9hvMC8rflBXE8K+JoVeM2+QDIDAB7Jh/LeUqeYdZ pcu1MDWvB7tmYp1D4Orz1t8GRAfM12j5j/5fs+faz0u9i+aChIRo3kykL1l3aTl1hlb/ G8nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8OkCOF6R/pgK53vUKeAeW9BkPOUZGKD+efyaS4LYmfw=; b=jIql2xZSrt6e6TQ9C9euf4sj4oOcyTU2nnIKovypVowYvtOw4xr0c1nICIXLgEmJr/ nMH4gbDZ/O8WWRCNtbH+BFMq4ucEXHUP08pCSW0Mgl2x5jEtV098mZjWmeAOMgESovIo yJZSaizseIAFQDWe3+STKCRPghL3urftUxIGri4SPBR2MVEJp1+c0gjPY3pxvv8wMqxz mfhJ9VvOpU+iUIVpVgv5ZERR+2Hh14V9+jpzpUXPeLaXeNiknJMyZL7V/hyBqLUTBhDR bh/729ugQPW1sPq/85JQyAIzVwRXYeqIpRDPpoK7W7LLXtQ8HkpSJAMMTSuVki6bJUWl LESQ== X-Gm-Message-State: AFqh2kp8KVB62T3z06M5QnHxLGzo3nPz6E7KnQ+NzzZ3ONyFlchXm6DS ul+UFVHvNfFU7OisqrA2MuqOk0YDJiY= X-Google-Smtp-Source: AMrXdXtp82I7YF3QnbbU1wIXBhaHt7Prr01w89keN2o0wtMQlj/ErmA1q7BRqQ8hmlUUjWbLIZPF/Q== X-Received: by 2002:a17:90a:7f8a:b0:229:3d3a:49cb with SMTP id m10-20020a17090a7f8a00b002293d3a49cbmr45993145pjl.4.1674881399485; Fri, 27 Jan 2023 20:49:59 -0800 (PST) Received: from fpp-Latitude-7280 ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id n8-20020a17090a9f0800b0022c503c1897sm1765450pjp.3.2023.01.27.20.49.58 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 20:49:58 -0800 (PST) From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH] gnu: Add ditaa. Date: Fri, 27 Jan 2023 20:49:57 -0800 Message-ID: <87v8kr4616.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Well, it took only about 36 hours to move from 'Unknown' to 'Succeeding'. That is much better than my recent prior experience. Kudos is owed to the qa team. :) From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 25 19:30:36 2023 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 To: 60976@debbugs.gnu.org Subject: [PATCH v3 1/4] gnu: Add java-jericho-html 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-Spam-Score: 2.8 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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 ja [...] Content analysis details: (2.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.182 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.214.182 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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 ja [...] Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.182 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.214.182 listed in list.dnswl.org] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --- 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 25 19:31:40 2023 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 To: 60976@debbugs.gnu.org Subject: [PATCH v3 2/4] gnu: Add java-libbatik 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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 p [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.214.172 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.214.172 listed in list.dnswl.org] X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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 p [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.214.172 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.214.172 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --- 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 =C2=A9 2018 Danny Milosavljevic ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 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/"=20 + name "_"=20 + 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.=20 + (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=20 +applets that want to use images in the Scalable Vector Graphics (SVG)=20 +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0) ) ) =20 (define-public java-w3c-smil-3.0 (package --=20 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 25 19:32:37 2023 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 To: 60976@debbugs.gnu.org Subject: [PATCH v3 3/4] gnu: Add ditaa 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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 [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.210.182 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.210.182 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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 [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.210.182 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.210.182 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --- 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 =C2=A9 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=3D\"1.6\"") + "source=3D\"7\"") + (("") + (string-append "" + "\n" "")))) + #t)) + (replace 'build + (lambda* _ + (setenv "ANT_OPTS" + (string-append "-Dversion.string=3D" + ,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=3D" + ,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=3D~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=20 +that converts diagrams drawn using ascii art=20 +('drawings' that contain characters that resemble lines like | / - ),=20 +into proper bitmap graphics.") + (license license:lgpl3))) + + + + + --=20 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 25 19:33:29 2023 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 00:33:29 +0000 Received: from localhost ([127.0.0.1]:41860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4ym-0006va-N2 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 19:33:29 -0500 Received: from mail-pj1-f47.google.com ([209.85.216.47]:33400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4yk-0006vN-Tf for 60976@debbugs.gnu.org; Sat, 25 Feb 2023 19:33:27 -0500 Received: by mail-pj1-f47.google.com with SMTP id m3-20020a17090ade0300b00229eec90a7fso9165382pjv.0 for <60976@debbugs.gnu.org>; Sat, 25 Feb 2023 16:33:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:references:date:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=8glh1Qxand1Gnoc5VNCHXhXfMkVHGSvfoeljwvosL7M=; b=dCxuoykiB57WSZUtEiVkLhfBoHTzPatIYPhdCmkiq0gwWL7r8RaLhapQ87anJSVVCK 5GJlaq7K2YckG8wfE1rVjCWB77VCYAQMhpfjRSJE3flOyemftTIyPslqDm9kNw7HPBp4 T8mTtRg4Q2InaHK+Um8SuPcXrxlD8hmjQ9unrk7PS2A6HtJ9fdS3RHzx66z2EONOFGTu m06E2AMKpyP3aXbhqIiu8IfmNfLWXbqWgXJ4iAZvr0rlXoF2EZbpbslr5XO4Xyngkflt wAJ/4nfHQRRIj8NdnQqw6fw1Czs6a190f2OEMk5U8Y1Lo4M8pNjQLhlGowS7zswu0Z0L 9mtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=8glh1Qxand1Gnoc5VNCHXhXfMkVHGSvfoeljwvosL7M=; b=JZpkyb5LB1tYM8DW/9T5ZYFzqQyEKyHaRJzFyeBTGWY/G5rElzj8S1EofcGpj5Oz76 QTaAJ4bZlTG03bdri4Fn+j2mhzBX/QWI4ER/i+tXwpSu3IdCNAFn6zukO+DCZljuG8jM VsZn2ep6eZ2CmnnJTKOoYG9//RyGIrSDqyJodj8ItsIOfWGXvno++fwjhJUvhYcntngt 1PcLHbjNz3+gX2RbyCKeEH/OgSDYscmKTKMs/M6GE9VB0aO/S3O1rO0iZTn3eRRNwjOM SuinsLadfqHSq4xucN5QdIDh/PGuFa+7474zANt21E+HYoO7i1TnVUGGJ9I+CN3Pjn+C lsiQ== X-Gm-Message-State: AO0yUKVi2SXdTWkqjE6sm+cPsyTbl058o0sK/6xAFaXqezXzfB9g5wFk 7RSCt3u1tyhZiflelL0CH+bv+RN9o5o= X-Google-Smtp-Source: AK7set/Eqsp36RFpTyepFlexg8LUXo0bO86JPK+4rngZO7Ewfn2/hy/xXDQ+fOGBG39Q9B794rQPYQ== X-Received: by 2002:a17:903:124f:b0:19c:be03:d1a3 with SMTP id u15-20020a170903124f00b0019cbe03d1a3mr11182615plh.40.1677371600542; Sat, 25 Feb 2023 16:33:20 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id g12-20020a170902fe0c00b0019a7f493151sm1770837plj.212.2023.02.25.16.33.19 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 16:33:19 -0800 (PST) From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH v3 4/4] java-jericho-html: Using bzr-fetch and complete testing. In-Reply-To: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Date: Thu, 23 Feb 2023 13:00:27 -0800 References: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Message-Id: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) --- gnu/packages/java-xml.scm | 118 +++++++++++++++----------------------- 1 file changed, 46 insertions(+), 72 deletions(-) diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 9cf256549b..739b525fa0 100644 --- a/gnu/packages/java-xml.scm +++ b/gnu/packages/java-xml.scm @@ -30,6 +30,7 @@ (define-module (gnu packages java-xml) #:use-module (gnu packages compression) #:use-module (gnu packages gtk) #:use-module (gnu packages java) + #:use-module (guix bzr-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) #:use-module (guix packages) @@ -39,82 +40,55 @@ (define-module (gnu packages java-xml) #: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 + (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=iso-8859-1") + (let ((match-str + (string-append "jerichohtml-" ,version))) + (substitute* "build.xml" + ((match-str) + ""))) + #t)) + (add-after 'build 'check-prep + (lambda* (#:key source #:allow-other-keys) + (mkdir-p "src/test/java") + #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))))) + (synopsis "Java HTML Parser library") + (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0)))) (define-public java-simple-xml (package -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 26 02:48:13 2023 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 To: Frank Pursel , 60976@debbugs.gnu.org Subject: Re: [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html 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-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 26 02:59:27 2023 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 07:59:27 +0000 Received: from localhost ([127.0.0.1]:42242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWBwN-0004Pt-AC for submit@debbugs.gnu.org; Sun, 26 Feb 2023 02:59:27 -0500 Received: from lepiller.eu ([89.234.186.109]:45222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWBwL-0004Pj-6F for 60976@debbugs.gnu.org; Sun, 26 Feb 2023 02:59:25 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 7ccc8fa7; Sun, 26 Feb 2023 07:59:24 +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=ihHhfT+cpjHM 2LYwESUseE3ZWlGlvflIvmNen+6Mp1o=; b=MPYr47cgA6z5G//s5xxgRFenOAMh BaFtdQ6zrvjQoV1QzQyIntfiPOOCrOOzK9qzWKok2a35G99hkM7BrOSyZar/g3bV SUJhkZB6y0YWjL5mNTmPUNE33y5ipv1SE7W1mGXILc3OhTEWFNIXRNf22/nCXPX6 GbtoyK/6dGK897fMpVEAFdVjAdEhmONpr2VZJnalXu0ZRkOBGuOMMDIRgrzS1YDR v1aGfDJWLUoquW5+eRAKKaC6ahuIKptVMQn8dyTCQJHXlmZk6P/2s7oAAEniBZmY REdK3HJ9t0V3OE8oAmPyuur6MXlAHDajQfrVSwk9ppnybnTVmtrVRLdfgw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d9af7717 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 26 Feb 2023 07:59:23 +0000 (UTC) Date: Sun, 26 Feb 2023 08:59:21 +0100 From: Julien Lepiller To: Frank Pursel , 60976@debbugs.gnu.org Subject: Re: [bug#60976] [PATCH v3 2/4] gnu: Add java-libbatik User-Agent: K-9 Mail for Android In-Reply-To: <4dded0fd7cc5556c2468bba775ecfe1a290ff5e2.1677369969.git.frank.pursel@gmail.com> References: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> <4dded0fd7cc5556c2468bba775ecfe1a290ff5e2.1677369969.git.frank.pursel@gmail.com> Message-ID: <161649C1-1D1D-4AC4-86A5-858D0873189A@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Thanks for the patch, some comments below=2E Le 26 janvier 2023 17:53:09 GMT+01:00, Frank Pursel a =C3=A9crit=C2=A0: >--- > gnu/packages/batik=2Escm | 82 +++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 81 insertions(+), 1 deletion(-) > >diff --git a/gnu/packages/batik=2Escm b/gnu/packages/batik=2Escm >index 7f159010a5=2E=2E662c4f5cd5 100644 >--- a/gnu/packages/batik=2Escm >+++ b/gnu/packages/batik=2Escm >@@ -1,6 +1,7 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2018 Danny Milosavljevic > ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice >+;;; Copyright =C2=A9 2023 Frank Pursel > ;;; > ;;; This file is part of GNU Guix=2E > ;;; >@@ -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") So is this batik or libbatik? >+ (version "1=2E16+dfsg") >+ (source >+ (origin >+ (method url-fetch) >+ (uri (string-append >+ "https://deb=2Edebian=2Eorg/debian/pool/main/b/batik/"=20 >+ name "_"=20 >+ version "=2Eorig=2Etar=2Exz")) I'm wondering why you need to fetch a Debian archive instead of upstream s= ources? Is there no upstream? >+ (sha256 (base32 >+ "1xnmnnadp4l74dz55d3ask236lwy0iwg981851d01j2zlrgpw4p9")) >+ (modules '((guix build utils))) >+ (snippet >+ '(begin >+ ;; Identify and delete bundled jars=2E >+ (format #t "~%~a~%" "Removing sourced jars") >+ (for-each >+ (lambda (f) >+ (delete-file f) >+ (format #t "Deleted: ~a~%" f)) >+ (find-files "=2E" "\\=2Ejar$")) >+ )))) These should be on the previous line=2E >+ (build-system ant-build-system) >+ (arguments >+ `(#:jar-name (string-append ,name "=2Ejar") Usually, you'd just say #:jar-name "batik=2Ejar" >+ #:source-dir "sources/src/main/java" >+ #:test-dir "sources/src/test" >+ #:test-exclude (list "**/util/*=2Ejava") That sounds like a lot of tests to exclude=2E Is there a reason? >+ #: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=2E=20 >+ (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" ) )) Maybe use delete-recursively instead? >+ #t) ) ) ) ) No need to end a phase with #t anymore=2E >+ (native-inputs (list rhino java-xmlgraphics-commons libxslt >+ java-jaxen java-junit java-jaxp java-xerces >+ java-jdom quickjs)) Please have one input per line, and maybe order alphabetically=2E >+ (home-page "https://xmlgraphics=2Eapache=2Eorg/batik") >+ (synopsis "The java based toolkit for Scalable Vector Graphics") Synopsis shouldn't start with "The", you could simply remove that word and= start with "Java-based"=2E >+ (description "Batik is a Java-based toolkit for applications or=20 >+applets that want to use images in the Scalable Vector Graphics (SVG)=20 >+format for various purposes, such as display, generation or manipulation= =2E") >+ (license license:asl2=2E0) ) ) Great, thanks! >=20 > (define-public java-w3c-smil-3=2E0 > (package From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 26 03:19:33 2023 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 08:19:33 +0000 Received: from localhost ([127.0.0.1]:42251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWCFo-0004xL-NN for submit@debbugs.gnu.org; Sun, 26 Feb 2023 03:19:33 -0500 Received: from lepiller.eu ([89.234.186.109]:34944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWCFl-0004x8-Rj for 60976@debbugs.gnu.org; Sun, 26 Feb 2023 03:19:31 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 04799aab; Sun, 26 Feb 2023 08:19:27 +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=F6e3zxTEbPAe IJKz19NeSisrpv/eWBn7PPjOd95k2gg=; b=jPUAk5YtjKF4CII9QOB8Ct0LLBcN vEArvbreef3h6V64AKcoEPOc1HX0rqEc4CtGb9pY0iZru+pwoPUhJJsM7Q+ViU/T /hFecdZiQmLCDdcdE3ogqp0io410um0UgjzKPk3mSuC11ADKhOYaksysLFNSLM15 D/wP/E6JxBtS6PibX4ZcpNqme/qbvdQ/VNaZHrkjACGbH2JWOsX6E6CiANtbpSbN u2dT9q6tdZS8M3nWQvC3mi4/2c/pcTmcN8j4eNqAeJ6rN+7pES1i6VPTk08WwHFn bPXsZmjluzKD8qTNDfGVnED6P9uZksKYOf72Kn7wJhT1BwlyFYmLhNu5oA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 90b9e164 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 26 Feb 2023 08:19:26 +0000 (UTC) Date: Sun, 26 Feb 2023 09:19:25 +0100 From: Julien Lepiller To: Frank Pursel , 60976@debbugs.gnu.org Subject: Re: [bug#60976] [PATCH v3 3/4] gnu: Add ditaa User-Agent: K-9 Mail for Android In-Reply-To: <51d9aae0d048aebfccc46b5363271dc4f2bc64be.1677369969.git.frank.pursel@gmail.com> References: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> <51d9aae0d048aebfccc46b5363271dc4f2bc64be.1677369969.git.frank.pursel@gmail.com> Message-ID: <5B15B2D7-0E82-4D0C-A188-7086E45BDB8C@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Thanks again for the patch series=2E Comments below=2E Could you adress th= ese and the others, and send a v2 for this patch series? I think "guix lint" would have caught most of these ;) Well, first I'm not sure this requires a new file=2E Maybe java-graphics= =2Escm would be a better place? If you add a new file anyway, you need to a= dd it to the list in gnu/local=2Emk too and add it to the commit log=2E Le 26 janvier 2023 18:01:17 GMT+01:00, Frank Pursel a =C3=A9crit=C2=A0: >--- > gnu/packages/ditaa=2Escm | 145 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 145 insertions(+) > create mode 100644 gnu/packages/ditaa=2Escm > >diff --git a/gnu/packages/ditaa=2Escm b/gnu/packages/ditaa=2Escm >new file mode 100644 >index 0000000000=2E=2Ee1f063e179 >--- /dev/null >+++ b/gnu/packages/ditaa=2Escm >@@ -0,0 +1,145 @@ >+;;; GNU Guix --- Functional package management for GNU >+;;; >+;;; This file is part of GNU Guix=2E >+;;; >+;;; 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 (a= t >+;;; your option) any later version=2E >+;;; >+;;; 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=2E See the >+;;; GNU General Public License for more details=2E >+;;; >+;;; You should have received a copy of the GNU General Public License >+;;; along with GNU Guix=2E If not, see =2E >+;;; >+;;; Copyright =C2=A9 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) >+ ) This parenthesis feels lonely :) >+ >+(define-public ditaa >+ (package >+ (name "ditaa") >+ (version "0=2E11=2E0") >+ (source (origin >+ (method git-fetch) >+ (uri (git-reference >+ (url "https://github=2Ecom/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= =2E") Nitpicking, but "embedded" might be a better term, wdyt? >+ (for-each >+ (lambda (jarf) >+ (delete-file jarf) >+ (format #t "Deleted: ~a~%" jarf)) >+ (find-files "=2E" "\\=2Ejar$")))))) >+ (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)= ) You shouldn't need icedtea in native-inputs, it's already added by the ant= -build-system=2E Maybe you need the default output instead? To get a "java"= binary from a small package instead of depending on the whole jdk at runti= me? >+ (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=2E Also some of the source requires java7=2E >+ (add-before 'build 'build-prep >+ (lambda* (#:key inputs outputs #:allow-other-keys) >+ (let* ((batik-jar (search-input-file inputs >+ "share/java/batik=2E= jar")) >+ (commons-cli-jar (search-input-file inputs >+ "lib/m2/common= s-cli/commons-cli/1=2E4/commons-cli-1=2E4=2Ejar"))) >+ (mkdir-p "lib") >+ (copy-file batik-jar "=2E/lib/batik=2Ejar") >+ (copy-file commons-cli-jar "=2E/lib/commons-cli=2Ejar")= ) >+ (with-directory-excursion "build" >+ (substitute* "release=2Exml" >+ (("source=3D\"1=2E6\"") >+ "source=3D\"7\"") >+ (("") >+ (string-append "= " >+ "\n" ""= )))) >+ #t)) Again, no need to end with #t=2E >+ (replace 'build >+ (lambda* _ >+ (setenv "ANT_OPTS" >+ (string-append "-Dversion=2Estring=3D" >+ ,version)) >+ (with-directory-excursion "build" >+ (invoke "ant" "-f" "release=2Exml" "release-jar")) #t)) Same here=2E >+ (replace 'check >+ (lambda* (#:key tests? #:allow-other-keys) >+ (if tests? >+ (begin >+ (setenv "ANT_OPTS" >+ (string-append "-Dversion=2Estring=3D" >+ ,version)) >+ (mkdir-p "tests/testlib") >+ (with-directory-excursion "build" >+ (invoke "ant" "-f" "release=2Exml" >+ "generate-test-images") >+ (invoke "ant" "test"))) #f))) And here=2E >+ (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 "=2Ejar"))) >+ (with-directory-excursion "releases" >+ (install-file jar-name lib)) >+ (mkdir-p bin) >+ (with-output-to-file ditaa >+ (lambda _ >+ (format #t "#!~a~%JAVA_HOME=3D~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 "=2E" "=2E*README\\=2Emd"))) #t))= ))) No need for #t=2E >+ (home-page "https://github=2Ecom/stathissideris/ditaa") >+ (synopsis "Create graphics from ascii art") >+ (description >+ "ditaa is a small command-line utility=20 >+that converts diagrams drawn using ascii art=20 >+('drawings' that contain characters that resemble lines like | / - ),=20 >+into proper bitmap graphics=2E") Maybe @samp{|}, @samp{/}, =E2=80=A6 >+ (license license:lgpl3))) >+ >+ >+ >+ >+ And remove these additional empty lines=2E From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 01 16:35:52 2023 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 To: 60976@debbugs.gnu.org, julien@lepiller.eu Subject: [PATCH v4 1/3] gnu: Add java-jericho-html 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-Spam-Score: 2.8 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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(-) Content analysis details: (2.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.53 listed in list.dnswl.org] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.53 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- 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(-) Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.53 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.53 listed in list.dnswl.org] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: jericho.htmlparser.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --- 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 01 16:41:24 2023 Received: (at 60976) by debbugs.gnu.org; 1 Mar 2023 21:41:24 +0000 Received: from localhost ([127.0.0.1]:55159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXUCS-0001Ss-4v for submit@debbugs.gnu.org; Wed, 01 Mar 2023 16:41:24 -0500 Received: from mail-pj1-f42.google.com ([209.85.216.42]:56260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXUCP-0001Sa-Vi for 60976@debbugs.gnu.org; Wed, 01 Mar 2023 16:41:22 -0500 Received: by mail-pj1-f42.google.com with SMTP id oj5so10824386pjb.5 for <60976@debbugs.gnu.org>; Wed, 01 Mar 2023 13:41:21 -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=1LqXalVIXaLdeLa5tGQ/+HbkQuBHlAqpcHR8NDoqx5o=; b=AHZUaRipmgWlVAhMJwwGzCN8CI8mXMNEpypD4vXqUv2b8Lx8AlLyLtzkPGmdoohDS/ IQiotNObr8Hctlqc2yyKGCt+g7JMFUsXxsLDNBSnkzP0sKdHScGwY4EUeb3iE1m7f1Fn fivhgzXGt/zkjXk1g+tjmt2CONqA87Pqza4nr6NrHv4aZM3ZqqNV0MAwaU4nF4CIqDFb QljHBTtwoX5wlfWIsQtmQ9Qo+n8C38bme3AFfcRyyt6pvlg+mvGdsQW7gCkuyd1Sy+HG W6W7IC1sjUpuDhwDVsSL7JYNyPMD/LNTIH8+fzh3rUHlPceQjv3CinGpfXIpmM/bcsBO Abnw== 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=1LqXalVIXaLdeLa5tGQ/+HbkQuBHlAqpcHR8NDoqx5o=; b=rtVgFnPGT6Od73xrFwngj8qTJRfSHukva0CHo3HAhaHfJVsaax92L8taKhT4cNq13L ayWsfj6AcZVH0I8ujibBDoPHrQCqjH8QIN7XXQVufp0HEqEXyIXh0OgWupcG1yjPNbub RPiGpyaMcVcqmW1Wmzt+0HPaSwuJShSmsTQrWXpqgEq0CrQEQPX/TZX1V5DL1+Y/hsfv mh3MC6Wfe/SSQDCSzS28hQU7IHTNQrqNMUlGQNksXswxYh50pkSo8ILOBCKF9PmPmLIK ZFlPRxPMZIAA/6vhRGnxgbF+ruY/QSkmkkqM6yi4e3HmECKpujSHkKBM9SOF2zXTB9xW pwJw== X-Gm-Message-State: AO0yUKXZcuWmbdvvI+ozFMwzRD0yp+2Xce+UJbTckoYcOAC0VWJiGGxs T0ROI//kskBvKhJUbYeYVus= X-Google-Smtp-Source: AK7set90MMV4rs5vGMAIQGz+TUHcTErCC3jwHWisoq+U3+wz5APoGMO0AWBbzYA7ohjRWGFsteRkvw== X-Received: by 2002:a17:902:cecf:b0:19c:fa22:e98a with SMTP id d15-20020a170902cecf00b0019cfa22e98amr10052938plg.8.1677706875889; Wed, 01 Mar 2023 13:41:15 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id jj22-20020a170903049600b0019a75ea08e5sm8915110plb.33.2023.03.01.13.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 13:41:15 -0800 (PST) From: Frank Pursel To: 60976@debbugs.gnu.org, julien@lepiller.eu Subject: [PATCH v4 2/3] gnu: Add java-libbatik In-Reply-To: <48adf8ab622e5051d0012bfb45703c8a73cad92c.1677706130.git.frank.pursel@gmail.com> Date: Thu, 26 Jan 2023 08:53:09 -0800 References: <48adf8ab622e5051d0012bfb45703c8a73cad92c.1677706130.git.frank.pursel@gmail.com> Message-Id: <9c92ee5173bb46ddfbd0fcb165b409874ae4b23d.1677706130.git.frank.pursel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- Revised patch for java-libbatik. I don't believe I had access to the upstream apache sources when I first posted this but this now points to the apache upstream rather than debian sources. gnu/packages/batik.scm | 100 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 7 deletions(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.42 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.42 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- Revised patch for java-libbatik. I don't believe I had access to the upstream apache sources when I first posted this but this now points to the apache upstream rather than debian sources. gnu/packages/batik.scm | 100 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 7 deletions(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.42 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.42 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --- Revised patch for java-libbatik. I don't believe I had access to the upstream apache sources when I first posted this but this now points to the apache upstream rather than debian sources. gnu/packages/batik.scm | 100 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 7 deletions(-) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 7f159010a5..22824a6575 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2018 Danny Milosavljevic ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,16 +20,101 @@ =20 (define-module (gnu packages batik) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix utils) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix build-system ant) - #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java) #:use-module (gnu packages java-xml) - #:use-module (gnu packages textutils)) + #:use-module (gnu packages javascript) + #:use-module (gnu packages textutils) + #:use-module (gnu packages xml) + #:use-module (gnu packages) + #:use-module (guix build-system ant) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public java-libbatik + (package + (name "java-libbatik") + (version "1.16") + (source + (origin + (method url-fetch) + (uri (string-append + "https://dlcdn.apache.org/xmlgraphics/batik/source/batik-src-" + version + ".tar.gz")) + (sha256 (base32 + "18ys0j7i861ydvimbm3a7dyvny48x5b37zfkvznlys7vcb2qz5z1")) + (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 "batik.jar" + #:source-dir "sources/src/main/java" + #:test-dir "sources/src/test" + ;; Tests are successful -- exclusions in lieu of + ;; deleting duplicated util tests. + #: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)) + ;; Test prep + (copy-recursively + "test-resources" "sources") + ;; Remove scripting subdirs for jpython, and jacl.=20 + (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")))))))) + (native-inputs (list + java-jaxen + java-jdom quickjs + java-jaxp + java-junit + java-xerces + java-xmlgraphics-commons + libxslt + rhino)) + (home-page "https://xmlgraphics.apache.org/batik") + (synopsis "Java based toolkit for Scalable Vector Graphics") + (description "Batik is a Java-based toolkit for applications or=20 +applets that want to use images in the Scalable Vector Graphics (SVG)=20 +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0))) =20 (define-public java-w3c-smil-3.0 (package --=20 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 01 16:44:59 2023 Received: (at 60976) by debbugs.gnu.org; 1 Mar 2023 21:45:00 +0000 Received: from localhost ([127.0.0.1]:55181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXUFv-0001Yy-E0 for submit@debbugs.gnu.org; Wed, 01 Mar 2023 16:44:59 -0500 Received: from mail-pj1-f48.google.com ([209.85.216.48]:44985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXUFt-0001Yn-RV for 60976@debbugs.gnu.org; Wed, 01 Mar 2023 16:44:58 -0500 Received: by mail-pj1-f48.google.com with SMTP id h11-20020a17090a2ecb00b00237c740335cso683893pjs.3 for <60976@debbugs.gnu.org>; Wed, 01 Mar 2023 13:44:57 -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=EyXCuX9ZAblLxDdYzVpY8q5K3/W7HxUmui5TRvPlsf4=; b=IGAiBV7sHzYqA74L/9+i29ft1A+flGlKENA+OwdaTHc8IVwEag2cMcjnd5aDesgQwW Pnlc9SYJ0od0Qf8sTY4hS4X2xyne1Az0zYwWmAH+jZ6zgl6pj22SNC/rG9Y8+NcX7STH s5IyduMgogtGAaNh1stlbOLCioInhnExUdVxkMzrUyy9D6J0Vklm6eV8NAWOvCXuuU9l sOba3TYYvm3nXLzCVqp3lzL7OSKcXmkDAVE2MV4z/qmwtEPI5P2uxPg03x3gTKAasJWC zUBauYzgWN1P8rljLe6r2eo38m1Gv7vt3IPIfirYDta3zWW0V1p5VKzkNql3zKS5QAja OESw== 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=EyXCuX9ZAblLxDdYzVpY8q5K3/W7HxUmui5TRvPlsf4=; b=2Yl2QUgqpkoYV2RLPiGqjSr6GRv96KIt2hzpu4TlMN1SM8eG8/DlFIQH6pRx7/Wam7 11s1aPazSKvTLbmFxagNkhjfBF/crmvrUuyiBC2pIHA7ypnH1JXRuwAFmc6Lo4wYR1nG pyQuY3sbguy71xXmDxegoTcSYCwC5eOxGKfza4D5AVFAgOKck6xuCWAr0iB+f1cV+5y2 G81zJ6pGeBcd4WLP7T7xmbCITo6iQpgBi9HUioQBewE8n4kyrNsz3l1cP26OnnhzzIqI 02SafR5mCs0Idu7fFKQtyURbTXPfu0OkJ3kIhsW7y5alVbvScjcXnK9e/OCAPiIjIePP VMvw== X-Gm-Message-State: AO0yUKWMJDUvLzNKm/bZRxhxdF/lR60RthnDxwpWsv/AUftMmdRT2eUX KeScVDV8/BnherZQlvIAiVnCdvXwypA= X-Google-Smtp-Source: AK7set+xfIhdyaWMOPIDqHRqDshsu3qAoxlyHp2DyIF17Y0s/aPyhALo752ssgSDGXz1OoDdmSqNIw== X-Received: by 2002:a17:90b:4f84:b0:237:9c41:de07 with SMTP id qe4-20020a17090b4f8400b002379c41de07mr18171040pjb.5.1677707091962; Wed, 01 Mar 2023 13:44:51 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id c13-20020a17090ab28d00b0023440af7aafsm250582pjr.9.2023.03.01.13.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 13:44:51 -0800 (PST) From: Frank Pursel To: 60976@debbugs.gnu.org, julien@lepillar.eu Subject: [PATCH v4 3/3] gnu: Add ditaa In-Reply-To: <48adf8ab622e5051d0012bfb45703c8a73cad92c.1677706130.git.frank.pursel@gmail.com> Date: Thu, 26 Jan 2023 09:01:17 -0800 References: <48adf8ab622e5051d0012bfb45703c8a73cad92c.1677706130.git.frank.pursel@gmail.com> Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- The final piece, again. I've moved it into java-graphic.scm. Thanks for the feedback to get this on track. Regards, Frank Pursel Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.48 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.48 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- The final piece, again. I've moved it into java-graphic.scm. Thanks for the feedback to get this on track. Regards, Frank Pursel Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.48 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.48 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (frank.pursel[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --- The final piece, again. I've moved it into java-graphic.scm. Thanks for the feedback to get this on track. Regards, Frank Pursel gnu/packages/java-graphics.scm | 131 +++++++++++++++++++++++++++++++-- 1 file changed, 126 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm index 9a71548b9c..6178bfbe4f 100644 --- a/gnu/packages/java-graphics.scm +++ b/gnu/packages/java-graphics.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2019 Ricardo Wurmus +;;; Copyright =C2=A9 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,15 +19,135 @@ =20 (define-module (gnu packages java-graphics) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix utils) - #:use-module (guix build-system ant) - #: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 (gnu packages xorg) + #:use-module (gnu packages) + #:use-module (guix build utils) + #:use-module (guix build-system ant) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix modules) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (ice-9 match)) =20 +(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 embedded 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-commons-cli + java-jericho-html + java-junit + java-libbatik + java-w3c-svg)) + (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=3D\"1.6\"") + "source=3D\"7\"") + (("") + (string-append "" + "\n" ""))))= )) + (replace 'build + (lambda* _ + (setenv "ANT_OPTS" + (string-append "-Dversion.string=3D" + ,version)) + (with-directory-excursion "build" + (invoke "ant" "-f" "release.xml" "release-jar")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "ANT_OPTS" + (string-append "-Dversion.string=3D" + ,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=3D~a ~a -jar ~a/~a $@~%" + bash jre java lib jar-name))) + (chmod ditaa #o755)))) + (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")))))))) + (home-page "https://github.com/stathissideris/ditaa") + (synopsis "Create graphics from ascii art") + (description + "ditaa is a small command-line utility=20 +that converts diagrams drawn using ascii art=20 +('drawings' that contain characters that resemble lines like @samp{|}=20 +@samp{/} @samp{-}),=20 +into proper bitmap graphics.") + (license license:lgpl3))) + (define-public java-piccolo2d-core (package (name "java-piccolo2d-core") --=20 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 08 19:25:59 2023 Received: (at 60976) by debbugs.gnu.org; 9 Mar 2023 00:25:59 +0000 Received: from localhost ([127.0.0.1]:50450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pa46Z-0001ZK-4o for submit@debbugs.gnu.org; Wed, 08 Mar 2023 19:25:59 -0500 Received: from mail-pl1-f178.google.com ([209.85.214.178]:40466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pa46X-0001Z8-Ay for 60976@debbugs.gnu.org; Wed, 08 Mar 2023 19:25:57 -0500 Received: by mail-pl1-f178.google.com with SMTP id u5so281474plq.7 for <60976@debbugs.gnu.org>; Wed, 08 Mar 2023 16:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678321551; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=lbiKBO/BoD4lDpCwC7CQUhOpt0Mvs/H0KOZbmKRvtUE=; b=koFZJrKQQBGtnlpdb1yu3DPQfEUKWSTFi8Atp3zSwv00vd3gC/DDsWK7JA543Fkbwi qKFJ4vt31u1OuahZ1nkkIMrxaFj7oJtL+fn57caoomwO1pwOAiP17ORrzhLniXGnQ7kw 1O5Tkx4fyc7uTj8LUSvthbhdX2RJbpQUg9MQoEnSLh+GU0SMm/Mg+vpy6yyF55dpUANo epnfmYsSjnDWWfLV4aqIw/pfFCcj+LPf07XUpqE4nYEc3bbC+POpYLhbLucu9fTLHilG gKBX7gtLIjpYfMA8EuWqFwdFUj3agumSm/tM35sZ0Yxqeu3DpvyCbcAdTIFtpkHPCUcF t7aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678321551; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lbiKBO/BoD4lDpCwC7CQUhOpt0Mvs/H0KOZbmKRvtUE=; b=04+eqAMsCEjtCVWZQRroS856J/l/C1eMb1R1i4iM0kmkJxTwWWjn/mD+yqMdhPbmn+ Cy6/nSbaMrl4HcabMNsejmdF1wsKObAuhPWZK3JntOCov35vMXX96n8E6q7vJf+9Ys4i 15ED4BOpD79tFaeI+/aRfWrpBan0RCwbvG+xjHl0FBbiUKiXXFsQxtDbLDU3kxShkz7E BrbMDdE1Zch7M53JoRGvXTalPS1kzWMm/DydVwv8Ockq2KSTfDH/Uunju3clQmRgXDDl k0VBSAF6Rdegq7KiyNh23ffOd+xWlMXKM1XHOh8/K74GhCRD7/F3XMk50z32oUJSxILw JQsQ== X-Gm-Message-State: AO0yUKWWCjeFnjsldqyaHkBUtHCGQd2T3AMnDK+sGLtJheYSLsxxXxpm CI1xvPC2IYgdNfRplyGiCxGhNxMO7oE= X-Google-Smtp-Source: AK7set/R/oZyteHbjtpj59kweZF8PWk7Gjr5zcI85uRiFJqSdhVeXkTiwh8xY8sx1dKVuA5FYTPQ3g== X-Received: by 2002:a17:90a:498b:b0:236:84a:8d9d with SMTP id d11-20020a17090a498b00b00236084a8d9dmr20699012pjh.39.1678321550694; Wed, 08 Mar 2023 16:25:50 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id 5-20020a630905000000b004fb26a80875sm9591694pgj.22.2023.03.08.16.25.48 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 16:25:49 -0800 (PST) From: Frank Pursel X-Google-Original-From: Frank Pursel To: 60976@debbugs.gnu.org Subject: [PATCH] gnu: Add ditaa. Date: Wed, 08 Mar 2023 16:25:47 -0800 Message-ID: <871qlypy7o.fsf@Ginko.mail-host-address-is-not-set> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) It is odd that this latest patchset obtained the qa successful badge a few days after it was posted but then, seemingly spontaneously, the qa badge reverted to unknown. This is not the first time I've seen the system complete testing and post the results only to lose it's memory and then reschedule the work. Seems like a persistence or memoization mechanism is failing. Regards, Frank From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 28 18:51:09 2023 Received: (at 60976-done) by debbugs.gnu.org; 28 Aug 2023 22:51:09 +0000 Received: from localhost ([127.0.0.1]:49161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qal4f-00059w-2d for submit@debbugs.gnu.org; Mon, 28 Aug 2023 18:51:09 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:47662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qal4c-00059Q-92 for 60976-done@debbugs.gnu.org; Mon, 28 Aug 2023 18:51:07 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 49C4A1ADE8; Mon, 28 Aug 2023 15:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1693263050; bh=qLCio/j1lgZgW9WJdpXH/09WpIv/4FyQv0DKvG9/yJA=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=eJiSXG1JEtKOGPKpdRC1Vnf8OPjo23sStMD92ui1jNDNWCFhZXD1MOX6ZFePUQXIA Vd5P+TAfeVUBjHm8E0olo0cITeYXMmey6Ph9jYBPv2qVMbRknevkhx7Mxd9+dCcTVH 0Em0l4DIeSjfVlsc1zjhv33/HJtUI7d9WlYC3dXUNakgpphFt0ISLmLzfbAZ7OfjZX uBpkPjNkj4+bsx3E41+1tjhhqnozoiitP0kYnjjjc076CuHbJ/6ts3UDxbCQxFc9oo KWiDW6iaDxqXrtOzqUONO0SFlTQUCLU52y8+AbeHnnZI4u7WvSWrOIfNOCogo/F6k1 2c7zRqQivk4Og== From: Vagrant Cascadian To: Frank Pursel Subject: Re: [bug#60976] [PATCH v4 3/3] gnu: Add ditaa In-Reply-To: References: <48adf8ab622e5051d0012bfb45703c8a73cad92c.1677706130.git.frank.pursel@gmail.com> Date: Mon, 28 Aug 2023 15:50:47 -0700 Message-ID: <87jztedbnc.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976-done Cc: 60976-done@debbugs.gnu.org, julien@lepillar.eu X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2023-01-26, Frank Pursel wrote: > The final piece, again. I've moved it into java-graphic.scm. > > Thanks for the feedback to get this on track. I've pushed this series as 541b1c3e74cbb7965b7398d342882a038c893fbb. I fixed some minor things, namely: * updated the commit messages. * fixed some trailing whitespace. * ran "guix style" on each package (keeping one-line per input, as requested in earlier bug review) * fixed some long line issues discovered by "guix lint" for each package. * Reverted re-ordering the use-modules sections to keep the diff only relevent to the changes introduced by these packages. Thanks for your contribution! live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZO0kxwAKCRDcUY/If5cW qjrcAP0aMEb+zPvCaobc7oio1vGPr7WONNTjcIAwujB81sYBywEAkJ3vWkgXTkMS 6p//DXn4UDCREa2oaP/DbyxOT75yKAE= =sWfF -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Aug 17 07:00:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 26 Sep 2023 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator