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: 46426 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 BF7DF27BBED; Thu, 26 Jan 2023 17:19:26 +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=-3.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB2BB27BBE9 for ; Thu, 26 Jan 2023 17:19:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5ty-0003i9-8M; Thu, 26 Jan 2023 12:19: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 1pL5tv-0003dS-1J for guix-patches@gnu.org; Thu, 26 Jan 2023 12:19:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL5tu-0003ej-Ow for guix-patches@gnu.org; Thu, 26 Jan 2023 12:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5tu-0005rI-5V for guix-patches@gnu.org; Thu, 26 Jan 2023 12:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH 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: Thu, 26 Jan 2023 17:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60976@debbugs.gnu.org Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167475349822466 (code B ref 60976); Thu, 26 Jan 2023 17:19:02 +0000 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 Date: Thu, 26 Jan 2023 08:46:25 -0800 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/java-xml.scm | 79 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42 diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 5b16806e27..9cf256549b 100644 --- a/gnu/packages/java-xml.scm +++ b/gnu/packages/java-xml.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Léo Le Bouter ;;; Copyright © 2022 Christopher Baines +;;; Copyright © 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,84 @@ (define-module (gnu packages java-xml) #:use-module (guix build-system ant) #:use-module (guix utils)) +(define-public java-jericho-html + (let ((ver "3.4") + (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i") + (internal-name "jericho-html")) + (package + (name "java-jericho-html") + (version ver) + (source (origin + (method url-fetch/zipbomb) + (uri (string-append + "https://sourceforge.net/projects/jerichohtml" + "/files/jericho-html/3.4/jericho-html-3.4.zip/download")) + (sha256 + (base32 + hash)) + (modules '((guix build utils))) + (snippet '(begin + (format #t "~%~a~%" "Removing sourced jar files.") + (for-each (lambda (jarf) + (delete-file jarf) + (format #t "Deleted: ~a~%" jarf)) + (find-files "." "\\.jar$")))))) + (build-system ant-build-system) + (arguments + `(#:jar-name (string-append ,name ".jar") + #:source-dir (string-append ,internal-name "-" + ,ver "/src/") + #:test-dir (string-append ,internal-name "-" + ,ver "/test/") + #:test-exclude (list "**/StAXTest.java" + "**/NodeIteratorTest.java" + "**/ScriptTest.java" + "**/SegmentGetStyleURISegmentsTest.java" + "**/SegmentTest.java" + "**/StreamedSourceTest.java" + "**/HTMLSanitiserTest.java") + #:phases (modify-phases %standard-phases + (add-before 'build 'add-ant-env-options + (lambda* _ + (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1") #t)) + (add-after 'build 'check-prep + (lambda* (#:key source #:allow-other-keys) + (let* ((cwd (getcwd)) + (jericho-test (string-append cwd "/" ,internal-name + "-" ,ver "/test")) + (test (string-append jericho-test "/test")) + (test-data (string-append jericho-test "/data")) + (test-src (string-append jericho-test "/src")) + (test-src-data (string-append test-src "/data"))) + (format #t "~%Check Prep dir: ~s\n" cwd) + (substitute* "build.xml" + (("\\$\\{test\\.home\\}/java") + "${test.home}/src")) + (mkdir-p (string-append cwd "/build/test-classes")) + (copy-recursively (string-append cwd + "/" + ,internal-name + "-" + ,ver + "/samples/console/classes") + (string-append cwd + "/build/test-classes/")) + (mkdir-p test-src-data) + (copy-recursively test-data + test-src-data)) + #t))))) + (native-inputs (list java-junit java-slf4j-api java-log4j-api + java-commons-logging-minimal)) + (home-page "http://jericho.htmlparser.net/docs/index.html") + (description + "A java library allowing analysis and manipulation of +parts of an HTML document, including server-side tags, while +reproducing verbatim any unrecognised or invalid HTML. It also +provides high-level HTML form manipulation functions. +") + (synopsis "Java HTML Parser library") + (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0))))) + (define-public java-simple-xml (package (name "java-simple-xml") From patchwork Thu Jan 26 16:53:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 46427 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 2FBE427BBED; Thu, 26 Jan 2023 17:20:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0989627BBE9 for ; Thu, 26 Jan 2023 17:20:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5uu-0004EP-Ml; Thu, 26 Jan 2023 12:20: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 1pL5us-0004Dm-2B for guix-patches@gnu.org; Thu, 26 Jan 2023 12:20: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 1pL5ur-0003pz-Pj for guix-patches@gnu.org; Thu, 26 Jan 2023 12:20:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5ur-0005sx-J3 for guix-patches@gnu.org; Thu, 26 Jan 2023 12:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH 2/3] gnu: Add java-libbatik Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Jan 2023 17:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60976@debbugs.gnu.org Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167475357522586 (code B ref 60976); Thu, 26 Jan 2023 17:20:01 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/batik.scm | 82 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 7f159010a5..662c4f5cd5 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,8 +28,87 @@ (define-module (gnu packages batik) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java) + #:use-module (gnu packages javascript) #:use-module (gnu packages java-xml) - #:use-module (gnu packages textutils)) + #:use-module (gnu packages textutils) + #:use-module (gnu packages xml)) + +(define-public java-libbatik + (package + (name "batik") + (version "1.16+dfsg") + (source + (origin + (method url-fetch) + (uri (string-append + "https://deb.debian.org/debian/pool/main/b/batik/" + name "_" + version ".orig.tar.xz")) + (sha256 (base32 + "1xnmnnadp4l74dz55d3ask236lwy0iwg981851d01j2zlrgpw4p9")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Identify and delete bundled jars. + (format #t "~%~a~%" "Removing sourced jars") + (for-each + (lambda (f) + (delete-file f) + (format #t "Deleted: ~a~%" f)) + (find-files "." "\\.jar$")) + )))) + (build-system ant-build-system) + (arguments + `(#:jar-name (string-append ,name ".jar") + #:source-dir "sources/src/main/java" + #:test-dir "sources/src/test" + #:test-exclude (list "**/util/*.java") + #:phases + (modify-phases %standard-phases + (add-after + 'unpack 'src-consolidation + (lambda _ + (mkdir-p "sources") + (let ((cwd (getcwd)) + (sub-dirs (list "anim" "awt-util" "bridge" + "codec" "constants" "css" + "dom" "ext" "extension" + "gui-util" "gvt" "i18n" + "parser" "script" "slideshow" + "svgbrowser" "svg-dom" + "svggen" "svgpp" + "svgrasterizer" "swing" "test" + "test-svg" "transcoder" "ttf2svg" + "util" "xml" "test-swing")) ) + (for-each + (lambda (sdir) + (copy-recursively + (string-append + "batik-" sdir) "sources/") ) + sub-dirs) ) + ;; Prep testing + (copy-recursively + "test-resources" "sources") + ;; Remove scripting subdirs for jpython, and jacl. + (for-each + (lambda (rfile) + (delete-file rfile) + (format #t "Deleted: ~s\n" rfile)) + (append + (find-files + "sources/src/main/java/org/apache/batik/script/jpython" ) + (find-files + "sources/src/main/java/org/apache/batik/script/jacl" ) )) + #t) ) ) ) ) + (native-inputs (list rhino java-xmlgraphics-commons libxslt + java-jaxen java-junit java-jaxp java-xerces + java-jdom quickjs)) + (home-page "https://xmlgraphics.apache.org/batik") + (synopsis "The java based toolkit for Scalable Vector Graphics") + (description "Batik is a Java-based toolkit for applications or +applets that want to use images in the Scalable Vector Graphics (SVG) +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0) ) ) (define-public java-w3c-smil-3.0 (package From patchwork Thu Jan 26 17:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 46428 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 CD31427BBEB; Thu, 26 Jan 2023 17:21: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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1739F27BBE9 for ; Thu, 26 Jan 2023 17:21:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5w3-0004lV-2w; Thu, 26 Jan 2023 12:21:15 -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 1pL5vr-0004kw-5z for guix-patches@gnu.org; Thu, 26 Jan 2023 12:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL5vq-0004NK-Ty for guix-patches@gnu.org; Thu, 26 Jan 2023 12:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5vq-0005v8-IC for guix-patches@gnu.org; Thu, 26 Jan 2023 12:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH 3/3] gnu: Add ditaa Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Jan 2023 17:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60976@debbugs.gnu.org Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167475365422720 (code B ref 60976); Thu, 26 Jan 2023 17:21:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/ditaa.scm | 145 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 gnu/packages/ditaa.scm diff --git a/gnu/packages/ditaa.scm b/gnu/packages/ditaa.scm new file mode 100644 index 0000000000..e1f063e179 --- /dev/null +++ b/gnu/packages/ditaa.scm @@ -0,0 +1,145 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . +;;; +;;; Copyright © 2023 Frank Pursel +;;; + +(define-module (gnu packages ditaa) + #:use-module (gnu packages) + #:use-module (gnu packages bash) + #:use-module (gnu packages batik) + #:use-module (gnu packages java) + #:use-module (gnu packages java-xml) + #:use-module (gnu packages xml) + #:use-module (guix build-system ant) + #:use-module (guix build utils) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix modules) + ) + +(define-public ditaa + (package + (name "ditaa") + (version "0.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stathissideris/ditaa") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y3g17wp1wvb05m56pp25avww2njpgh0gk0jsbsf25scj7hyyj26")) + (modules '((guix build utils))) + (snippet + '(begin + (format #t "~%~a~%" "Finding and removing sourced jars.") + (for-each + (lambda (jarf) + (delete-file jarf) + (format #t "Deleted: ~a~%" jarf)) + (find-files "." "\\.jar$")))))) + (build-system ant-build-system) + (inputs (list bash-minimal)) + (native-inputs (list java-libbatik java-commons-cli java-w3c-svg + java-jericho-html `(,icedtea "jdk") java-junit)) + (arguments + `(#:build-target "release-all" + #:phases + (modify-phases %standard-phases + ;; Ant's buildfile and build tree need to be modified + ;; to provide access to the guix builds of the + ;; batik and the java-commons-cli + ;; jar files. Also some of the source requires java7. + (add-before 'build 'build-prep + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((batik-jar (search-input-file inputs + "share/java/batik.jar")) + (commons-cli-jar (search-input-file inputs + "lib/m2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar"))) + (mkdir-p "lib") + (copy-file batik-jar "./lib/batik.jar") + (copy-file commons-cli-jar "./lib/commons-cli.jar")) + (with-directory-excursion "build" + (substitute* "release.xml" + (("source=\"1.6\"") + "source=\"7\"") + (("") + (string-append "" + "\n" "")))) + #t)) + (replace 'build + (lambda* _ + (setenv "ANT_OPTS" + (string-append "-Dversion.string=" + ,version)) + (with-directory-excursion "build" + (invoke "ant" "-f" "release.xml" "release-jar")) #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "ANT_OPTS" + (string-append "-Dversion.string=" + ,version)) + (mkdir-p "tests/testlib") + (with-directory-excursion "build" + (invoke "ant" "-f" "release.xml" + "generate-test-images") + (invoke "ant" "test"))) #f))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (bin (string-append out "/bin")) + (bash (search-input-file inputs "bin/bash")) + (java (search-input-file inputs "bin/java")) + (jre (search-input-directory inputs "jre")) + (ditaa (string-append out "/bin/ditaa")) + (jar-name (string-append ,name + ,version ".jar"))) + (with-directory-excursion "releases" + (install-file jar-name lib)) + (mkdir-p bin) + (with-output-to-file ditaa + (lambda _ + (format #t "#!~a~%JAVA_HOME=~a ~a -jar ~a/~a $@~%" + bash jre java lib jar-name))) + (chmod ditaa #o755)) #t)) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "out") + "/share/doc/"))) + (for-each (lambda (filen) + (install-file filen doc)) + (find-files "." ".*README\\.md"))) #t))))) + (home-page "https://github.com/stathissideris/ditaa") + (synopsis "Create graphics from ascii art") + (description + "ditaa is a small command-line utility +that converts diagrams drawn using ascii art +('drawings' that contain characters that resemble lines like | / - ), +into proper bitmap graphics.") + (license license:lgpl3))) + + + + +