From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8GKUIpAR+2O1eAAAbAwnHQ (envelope-from ) for ; Sun, 26 Feb 2023 09:00:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id aJeIIpAR+2NQnwAAauVa8A (envelope-from ) for ; Sun, 26 Feb 2023 09:00:16 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1992D2D4C3 for ; Sun, 26 Feb 2023 09:00:16 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=MPYr47cg; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677398416; a=rsa-sha256; cv=none; b=qORJt0PQ3ix9U+7SzNRTLJKCP76PKCgPxMmUgdO3gQv9CG0IUQPJFc57QZDziSTyH8l2Rh 0DJqtAblzFGJvFfPD0z0xUNB6HyEzTt/GR69WCgLUUtWHhzVPdwezoMvKqtXAyX3a+QnNZ YR0g5ZRYo/OhiIlb7GEFoMaxhns0SH5Watgt68pZS6zej9llVhXcXpFB64qJjl1dbgfbdu UPeihhNsLCDyXZra3aCsQh9NxilhOtcFi/tx4DcPMTXOCeNBBP3iM+gMUw0kThM9QHRWRY CaxOc7TKE0Y0nzFgzE/xMWKzgvaLm1EAKeyBQr9GFHYYG3ME9EDGAOdfRJkpSg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=MPYr47cg; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677398416; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lp+10g1n99WwZG/U+/D/Li9O7kHmhkbYOulxKmLvEcY=; b=Tn+sSsAHBkMZmKHGNlhYDEVI9MOL8OunCBWRRUFAgpIuyy/Mv8eT2GmPgeOtkWLnOkSQi1 TPorklqxIAHd2vuQzbENDHrtFDn1l0rroGAyXbbbo0wITGC6mKCm/yxa6M+dVsXAVOX9Y8 a8WerWh84Za6MYoisr3Yup0c+tVUcxOqmsE0IQgnzoeHIrUVKj32rbAi+kg7tbbBl7x3NK Rhlk2fteGXGHNDtVyWQu04HXINXoOKJRLY5qghIRDHDGYPiHiNHKARI4ILgyyF/6OiEElR QesiIw42G3pL5jeBBnnu3t7t0JzGbvy3tMqHiIa8wqo2w1zs+pqzSNdrXHvCtA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWBx3-0004tN-Hm; Sun, 26 Feb 2023 03:00:09 -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 1pWBwx-0004t5-Lh for guix-patches@gnu.org; Sun, 26 Feb 2023 03:00: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 1pWBwx-000485-Ae for guix-patches@gnu.org; Sun, 26 Feb 2023 03:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWBww-0004RO-Sk for guix-patches@gnu.org; Sun, 26 Feb 2023 03:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v3 2/4] gnu: Add java-libbatik Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2023 08:00: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: Frank Pursel , 60976@debbugs.gnu.org Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167739836716986 (code B ref 60976); Sun, 26 Feb 2023 08:00:02 +0000 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 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-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: X-Migadu-Queue-Id: 1992D2D4C3 X-Spam-Score: -2.58 X-Migadu-Spam-Score: -2.58 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-TUID: FUCKP6qWuRBt 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