From patchwork Thu Jan 26 16:46:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 47518 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A7CCC16C75; Wed, 1 Mar 2023 21:36:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E059216B72 for ; Wed, 1 Mar 2023 21:36:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXU7H-0005CS-Ko; Wed, 01 Mar 2023 16:36:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXU7G-0005Bl-BF for guix-patches@gnu.org; Wed, 01 Mar 2023 16:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXU7G-0000QM-2j for guix-patches@gnu.org; Wed, 01 Mar 2023 16:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXU7F-0001JF-VB for guix-patches@gnu.org; Wed, 01 Mar 2023 16:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v4 1/3] gnu: Add java-jericho-html References: <63cb23b3.650a0220.26d15.f66d@mx.google.com> In-Reply-To: <63cb23b3.650a0220.26d15.f66d@mx.google.com> Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Mar 2023 21:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60976@debbugs.gnu.org, julien@lepiller.eu Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.16777065525008 (code B ref 60976); Wed, 01 Mar 2023 21:36:01 +0000 Received: (at 60976) by debbugs.gnu.org; 1 Mar 2023 21:35:52 +0000 Received: from localhost ([127.0.0.1]:55134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXU76-0001Ii-47 for submit@debbugs.gnu.org; Wed, 01 Mar 2023 16:35:52 -0500 Received: from mail-pj1-f53.google.com ([209.85.216.53]:40670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXU74-0001IS-5k for 60976@debbugs.gnu.org; Wed, 01 Mar 2023 16:35:50 -0500 Received: by mail-pj1-f53.google.com with SMTP id m20-20020a17090ab79400b00239d8e182efso675474pjr.5 for <60976@debbugs.gnu.org>; Wed, 01 Mar 2023 13:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=f8OJJnhNDE9a50xSpH6EKQaWbUJYmNHVkTWWGRikttc=; b=UQOLuCyP2UdjwsvkciZUHVp+n54HsVy23mqg6mCIAcOGHf3ASvxiRaEffh7muLlHWJ yiugmgmqqEsCuS7c/XzNUlXINrEmhchTJrdBJvoccOlJy633IcbngFzx4hetOstWoFGZ aBpxYOsKO9F69ECE6hUekHub2W1rTG63nUC9SzoIIlEDOkHyD5mzzjmPEkEuddiK9du+ mhD/xkYiOYe6GnqA7rVJxmaKAFcX4Z0K6lWq2m3RdDbghP451a3YKYiwnMcDtAlKH5WT 37mrVTMccTnnte/yE+CkkSEjIcb1dzQQ1XlVgPNsmBYlhykWLPYd3S/iYb+/mOV6ZL7Z wHUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f8OJJnhNDE9a50xSpH6EKQaWbUJYmNHVkTWWGRikttc=; b=2e/AFhXcBe0WdXGIb5zywaBxu/zuG6+UCHzpajagItFj63FAs/WX9axllqr7WhKRG9 CLgQn2ROnxObhTgWBQyPnCz09sDbKWpzoGDtTRCRH7yVtHPn0N53bLxdY15ckeyrhiuE ULKFCqQ7/wbkQDyQp479g2pG6+9KgANawdp3cTt5ONTPSlNq6Aw7FRwP8PuQ9fQncSlU zdYmOF3RcLlDg0enw32k9C7zBACl+chfJiZf6yZa1cxctvRleWclTWBdYM8UujqaGfYC fbO5iN3+N/lZ8YbfW2s2Xk6r/+NbqG1pHe/QesNyb1LfJCWpxchh4EddIOHyatKibCLX yTZQ== X-Gm-Message-State: AO0yUKXbk9PthU5ydVH6pyfVi3IjQGfvM88YYr5QnUn34b7JhSeNjtsg bRJJugmJV344bL1qL5hki/mGVtL7A/k= X-Google-Smtp-Source: AK7set+ygYMzmG/teeuiNOGqM9D1fUw1ZJxMR/RMOBdkU2ZFZp/E/Vi8tsaG0UO6N4glwQvB3YAzLA== X-Received: by 2002:a17:90b:4d8e:b0:237:373e:9ded with SMTP id oj14-20020a17090b4d8e00b00237373e9dedmr8947971pjb.22.1677706543893; Wed, 01 Mar 2023 13:35:43 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id b3-20020a17090acc0300b00232cc61e16bsm214371pju.35.2023.03.01.13.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 13:35:43 -0800 (PST) From: Frank Pursel Date: Thu, 26 Jan 2023 08:46:25 -0800 Message-Id: <48adf8ab622e5051d0012bfb45703c8a73cad92c.1677706130.git.frank.pursel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- 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(-) base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42 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 © 2020 Vincent Legoll ;;; Copyright © 2021 Léo Le Bouter ;;; Copyright © 2022 Christopher Baines +;;; Copyright © 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,20 +24,72 @@ ;;; along with GNU Guix. If not, see . (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)) +(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=iso-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") From patchwork Thu Jan 26 16:53:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 47519 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 939C116C75; Wed, 1 Mar 2023 21:42:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 62A3616B72 for ; Wed, 1 Mar 2023 21:42:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXUD8-0002Sg-2l; Wed, 01 Mar 2023 16:42:06 -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 1pXUD4-0002RT-Ju for guix-patches@gnu.org; Wed, 01 Mar 2023 16:42:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXUD4-0002Zz-Aj for guix-patches@gnu.org; Wed, 01 Mar 2023 16:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXUD4-0001UK-1n for guix-patches@gnu.org; Wed, 01 Mar 2023 16:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v4 2/3] gnu: Add java-libbatik Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Mar 2023 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60976@debbugs.gnu.org, julien@lepiller.eu Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.16777068845638 (code B ref 60976); Wed, 01 Mar 2023 21:42:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- 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 © 2018 Danny Milosavljevic ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,16 +20,101 @@ (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. + (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 +applets that want to use images in the Scalable Vector Graphics (SVG) +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0))) (define-public java-w3c-smil-3.0 (package From patchwork Thu Jan 26 17:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 47520 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B483316C75; Wed, 1 Mar 2023 21:45:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D836C16B72 for ; Wed, 1 Mar 2023 21:45:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXUG0-0006T4-E8; Wed, 01 Mar 2023 16:45:04 -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 1pXUFy-0006O8-PU for guix-patches@gnu.org; Wed, 01 Mar 2023 16:45:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXUFy-0003PO-Fx for guix-patches@gnu.org; Wed, 01 Mar 2023 16:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXUFy-0001ZW-Cd for guix-patches@gnu.org; Wed, 01 Mar 2023 16:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v4 3/3] gnu: Add ditaa Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Mar 2023 21:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60976@debbugs.gnu.org, julien@lepillar.eu Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.16777071006016 (code B ref 60976); Wed, 01 Mar 2023 21:45:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- The 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 © 2019 Ricardo Wurmus +;;; Copyright © 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,15 +19,135 @@ (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)) +(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=\"1.6\"") + "source=\"7\"") + (("") + (string-append "" + "\n" "")))))) + (replace 'build + (lambda* _ + (setenv "ANT_OPTS" + (string-append "-Dversion.string=" + ,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=" + ,version)) + (mkdir-p "tests/testlib") + (with-directory-excursion "build" + (invoke "ant" "-f" "release.xml" + "generate-test-images") + (invoke "ant" "test"))) #f))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (bin (string-append out "/bin")) + (bash (search-input-file inputs "bin/bash")) + (java (search-input-file inputs "bin/java")) + (jre (search-input-directory inputs "jre")) + (ditaa (string-append out "/bin/ditaa")) + (jar-name (string-append ,name + ,version ".jar"))) + (with-directory-excursion "releases" + (install-file jar-name lib)) + (mkdir-p bin) + (with-output-to-file ditaa + (lambda _ + (format #t "#!~a~%JAVA_HOME=~a ~a -jar ~a/~a $@~%" + bash jre java lib jar-name))) + (chmod ditaa #o755)))) + (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 +that converts diagrams drawn using ascii art +('drawings' that contain characters that resemble lines like @samp{|} +@samp{/} @samp{-}), +into proper bitmap graphics.") + (license license:lgpl3))) + (define-public java-piccolo2d-core (package (name "java-piccolo2d-core")