Received: (at 60976) by debbugs.gnu.org; 25 Jan 2023 02:50:57 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 24 21:50:57 2023 Received: from localhost ([127.0.0.1]:57963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pKVsG-0003gz-Pg for submit <at> 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 <frank.pursel@HIDDEN>) id 1pKVsE-0003gl-EU for 60976 <at> 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 <at> 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 <at> 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 <frank.pursel@HIDDEN> X-Google-Original-From: Frank Pursel <fpp@HIDDEN> To: 60976 <at> debbugs.gnu.org Subject: [PATCH] gnu: Add ditaa. Date: Tue, 24 Jan 2023 18:50:45 -0800 Message-ID: <87wn5bxr7e.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60976 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> 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
guix-patches@HIDDEN:bug#60976; Package guix-patches.
Full text available.
Received: (at 60976) by debbugs.gnu.org; 24 Jan 2023 12:35:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 24 07:35:16 2023
Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pKIWB-0003KL-MC
for submit <at> 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 <zimon.toutoune@HIDDEN>) id 1pKIW7-0003Jc-0o
for 60976 <at> 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 <at> 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 <zimon.toutoune@HIDDEN>
To: Frank Pursel <frank.pursel@HIDDEN>, 60976 <at> debbugs.gnu.org
Subject: Re: [bug#60976] [PATCH] gnu: Add ditaa.
In-Reply-To: <63cb23b3.650a0220.26d15.f66d@HIDDEN>
References: <63cb23b3.650a0220.26d15.f66d@HIDDEN>
Date: Tue, 24 Jan 2023 11:44:58 +0100
Message-ID: <87o7qop5xx.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 60976
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Thanks for your contribution.
Several minor things.
On ven., 06 janv. 2023 at 10:46, Frank Pursel <frank.pursel@HIDDEN> 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
guix-patches@HIDDEN:bug#60976; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 20 Jan 2023 23:29:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 20 18:29:00 2023
Received: from localhost ([127.0.0.1]:47465 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pJ0oe-00052Q-3q
for submit <at> 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 <frank.pursel@HIDDEN>) id 1pJ0ob-00052I-Vv
for submit <at> 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 <frank.pursel@HIDDEN>)
id 1pJ0ob-0006UZ-MV
for guix-patches@HIDDEN; 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 <frank.pursel@HIDDEN>)
id 1pJ0oZ-0005D9-A5
for guix-patches@HIDDEN; Fri, 20 Jan 2023 18:28:57 -0500
Received: by mail-pl1-x635.google.com with SMTP id p24so6613253plw.11
for <guix-patches@HIDDEN>; 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 <guix-patches@HIDDEN>
(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@HIDDEN>
X-Google-Original-Message-ID: <fe6fb328ce756aed0ac0a123483192f8af1ebc65.1674255499.git.frank.pursel@HIDDEN>
From fe6fb328ce756aed0ac0a123483192f8af1ebc65 Mon Sep 17 00:00:00 2001
From: Frank Pursel <frank.pursel@HIDDEN>
To: guix-patches@HIDDEN
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@HIDDEN; 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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <http://www.gnu.org/licenses/>.
+;;;
+;;; Copyright =C2=A9 2023 Frank Pursel <frank.pursel@HIDDEN>
+;;;
+
+(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\"")
+ (("<file name=3D\"commons-cli-1.2.jar\"/>")
+ (string-append "<file name=3D\"commons-cli.jar\"/>"
+ "\n" "<file name=3D\"batik.jar\"/>"))))
+ #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
Frank Pursel <frank.pursel@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#60976; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.