From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 kB0iJsvG/2MVSAEAbAwnHQ (envelope-from ) for ; Wed, 01 Mar 2023 22:42:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uI4bJcvG/2N+2QAAG6o9tA (envelope-from ) for ; Wed, 01 Mar 2023 22:42:35 +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 3A25E844E for ; Wed, 1 Mar 2023 22:42:35 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=AHZUaRip; 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=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677706955; 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=1LqXalVIXaLdeLa5tGQ/+HbkQuBHlAqpcHR8NDoqx5o=; b=bwnXpG3+ntsNIoYXl1apFpk+dzAURBsx3CR/tggl8b6wEQ82JjXaFkMelbRr8NlWmwOYSb BSPLFAtnRuFjUlSusMnRuuCpuM+AyxZvyGzr2+iSoYx6OC4bDfnJP8d91GhfIPPRMDQ7Jv 475ExdzQPuE5UDZaPepuTuELeLzA7DjJ3ZO3USb8V5/ShGYA2/oeQpkmi07ESJu2gy6S1b I5lXM2LzxHrzEgkYKatPSfkAnSYknmFOJ+Gh+hkHbZ4reCSogqZQ2nJQEtDD9Nb4mS7Js2 +p3LiwckE5nxHyYZLn1Gv0O1/yAopYg8a0vUgMiJL4mnp8Fk8tH+nXf8ylKmkA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=AHZUaRip; 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=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677706955; a=rsa-sha256; cv=none; b=sC8mocP2EDHafVsPLO1yQly2XRuooslF+q2oEgujrUoYYcw4QaQrxExtcPjMOBuwfW7KzT 4UgmXfm9JGdBPdeu+5Y6JSUPk9C0++Pnm8CHhp+g9VJRRuo00fqsRI2XzoLB4Z6S/B4Mxs Bgr1h3DG8EY57AYrCoOYoQqGK1A3NjX8+9i+Ct3qgsveMFNW/jmjLgUIxtqd4QeD1Nl3L+ Vv/AUV3eHN4zrHXAX+I9odsJ5wp+pVEtumLEQibZaiZrmXbpbxsO+GEbwLTc92BVOza1cU /FW4HihwLsAxnzAy2RPct0hDHGmgJZ56W6g0hVyDUZ0XxBldKtnGJK8LDvyqCw== 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 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-Spam-Score: -1.49 X-Spam-Score: -1.49 X-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: 3A25E844E 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-Country: US X-Migadu-Flow: FLOW_IN X-TUID: NQFyFhq3lzLq --- Revised patch for java-libbatik. I don't believe I had access to the upstream apache sources when I first posted this but this now points to the apache upstream rather than debian sources. gnu/packages/batik.scm | 100 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 7 deletions(-) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 7f159010a5..22824a6575 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2018 Danny Milosavljevic ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,16 +20,101 @@ =20 (define-module (gnu packages batik) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix utils) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix build-system ant) - #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java) #:use-module (gnu packages java-xml) - #:use-module (gnu packages textutils)) + #:use-module (gnu packages javascript) + #:use-module (gnu packages textutils) + #:use-module (gnu packages xml) + #:use-module (gnu packages) + #:use-module (guix build-system ant) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public java-libbatik + (package + (name "java-libbatik") + (version "1.16") + (source + (origin + (method url-fetch) + (uri (string-append + "https://dlcdn.apache.org/xmlgraphics/batik/source/batik-src-" + version + ".tar.gz")) + (sha256 (base32 + "18ys0j7i861ydvimbm3a7dyvny48x5b37zfkvznlys7vcb2qz5z1")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Identify and delete bundled jars. + (format #t "~%~a~%" "Removing sourced jars") + (for-each + (lambda (f) + (delete-file f) + (format #t "Deleted: ~a~%" f)) + (find-files "." "\\.jar$")))))) + (build-system ant-build-system) + (arguments + `(#:jar-name "batik.jar" + #:source-dir "sources/src/main/java" + #:test-dir "sources/src/test" + ;; Tests are successful -- exclusions in lieu of + ;; deleting duplicated util tests. + #:test-exclude (list "**/util/*.java") + #:phases + (modify-phases %standard-phases + (add-after + 'unpack 'src-consolidation + (lambda _ + (mkdir-p "sources") + (let ((cwd (getcwd)) + (sub-dirs (list "anim" "awt-util" "bridge" + "codec" "constants" "css" + "dom" "ext" "extension" + "gui-util" "gvt" "i18n" + "parser" "script" "slideshow" + "svgbrowser" "svg-dom" + "svggen" "svgpp" + "svgrasterizer" "swing" "test" + "test-svg" "transcoder" "ttf2svg" + "util" "xml" "test-swing"))) + (for-each + (lambda (sdir) + (copy-recursively + (string-append + "batik-" sdir) "sources/")) + sub-dirs)) + ;; Test prep + (copy-recursively + "test-resources" "sources") + ;; Remove scripting subdirs for jpython, and jacl.=20 + (for-each + (lambda (rfile) + (delete-file rfile) + (format #t "Deleted: ~s\n" rfile)) + (append + (find-files + "sources/src/main/java/org/apache/batik/script/jpython") + (find-files + "sources/src/main/java/org/apache/batik/script/jacl")))))))) + (native-inputs (list + java-jaxen + java-jdom quickjs + java-jaxp + java-junit + java-xerces + java-xmlgraphics-commons + libxslt + rhino)) + (home-page "https://xmlgraphics.apache.org/batik") + (synopsis "Java based toolkit for Scalable Vector Graphics") + (description "Batik is a Java-based toolkit for applications or=20 +applets that want to use images in the Scalable Vector Graphics (SVG)=20 +format for various purposes, such as display, generation or manipulation.") + (license license:asl2.0))) =20 (define-public java-w3c-smil-3.0 (package --=20 2.39.1