From patchwork Mon Nov 4 21:26:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 69871 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 B34D427BBEA; Mon, 4 Nov 2024 21:27: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 D876E27BBE2 for ; Mon, 4 Nov 2024 21:27:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t84bJ-0002Ot-Po; Mon, 04 Nov 2024 16:27:05 -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 1t84bH-0002OS-Gq for guix-patches@gnu.org; Mon, 04 Nov 2024 16:27:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t84bH-0007Fe-8O for guix-patches@gnu.org; Mon, 04 Nov 2024 16:27:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Yzf1dYuBFiy9LhWk85qLdl6sQUCaKCEqPXxCBIgzcdg=; b=Tu0uUZH4uHji98EAdxQdO+uamuB77WOoUe53sZ+aso/p9HKpTPf37bplS0aPqv5PQw8TJu/D6G/RmH7V8iN37RH+cgcaN08FEFv7QvPzX4pXqZvES/tZqTjfGWGgc3VKh+ZxrreKWmUdxQbygL1WRGuWZypB2wI94PYF5VoiJLO/M1wnshOg1c8CwynDMaPfhX2GjkqZyLZ4OQfkgxHc88njVpljhcP/qgd70HJheqy54dwttKtFJXsw/X97y547KBrJqLgJRi04jGSMQ/v99lYBQyzV7b8jp0C2ac7ZRfcdVD2tUswsUrDM21nnHT2kPGPirS1l0Tk5mOGm6pXLaA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t84bG-0001mH-Ne for guix-patches@gnu.org; Mon, 04 Nov 2024 16:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74206] [PATCH] gnu: Fix java-jaxen. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2024 21:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74206@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17307556006816 (code B ref -1); Mon, 04 Nov 2024 21:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2024 21:26:40 +0000 Received: from localhost ([127.0.0.1]:42441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t84au-0001ls-5w for submit@debbugs.gnu.org; Mon, 04 Nov 2024 16:26:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:39870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t84as-0001lm-Oq for submit@debbugs.gnu.org; Mon, 04 Nov 2024 16:26:39 -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 1t84as-0002Ku-GP for guix-patches@gnu.org; Mon, 04 Nov 2024 16:26:38 -0500 Received: from mail02.noris.net ([62.128.1.232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t84ap-0007DS-HC for guix-patches@gnu.org; Mon, 04 Nov 2024 16:26:38 -0500 Received: from p57b098bb.dip0.t-ipconnect.de ([87.176.152.187] helo=hermia.goebel-consult.de) by mail02.noris.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) (envelope-from ) id 1t84ai-0006sj-R6 for guix-patches@gnu.org; Mon, 04 Nov 2024 22:26:28 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id EAA975F4DE; Mon, 4 Nov 2024 22:26:25 +0100 (CET) From: Hartmut Goebel Date: Mon, 4 Nov 2024 22:26:25 +0100 Message-ID: <5715f36b461fb1bd61966a21f7b69fc6049955a2.1730755471.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.41.1 MIME-Version: 1.0 X-Noris-IP: 87.176.152.187 Received-SPF: pass client-ip=62.128.1.232; envelope-from=h.goebel@crazy-compilers.com; helo=mail02.noris.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 java-jaxen was missing the dom4j and xom sub-packages. This was caused by java-jaxen-bootstrap deleting the respective directories (which is okay) and java-javen not removing the phase that does this. Solve this by basing java-jaxen-bootstrap on java-jaxen instead of vice-versa. * gnu/packages/java-xml.scm (java-jaxen) Define based on former java-jaxen-bootstrap, while keeping the former's inputs and removing the later's build-phases. (java-jaxen-bootstrap): Inherit from java-jaxen, keeping the pre-existing bootstrap build-ohases and inputs. --- gnu/packages/java-xml.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) base-commit: 33665c52c4670bc3b4d337c89ac9cc6c4c69b26f diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 9ec11fa83e..09fdab8c0c 100644 --- a/gnu/packages/java-xml.scm +++ b/gnu/packages/java-xml.scm @@ -200,11 +200,9 @@ (define-public java-apache-xml-commons-resolver @end itemize") (license license:asl2.0))) -;; Jaxen requires java-dom4j and java-xom that in turn require jaxen. -;; This package is a bootstrap version without dependencies on dom4j and xom. -(define java-jaxen-bootstrap +(define-public java-jaxen (package - (name "java-jaxen-bootstrap") + (name "java-jaxen") (version "1.1.6") (source (origin (method url-fetch) @@ -218,16 +216,9 @@ (define java-jaxen-bootstrap (arguments `(#:jar-name "jaxen.jar" #:source-dir "src" - #:tests? #f; no tests - #:phases - (modify-phases %standard-phases - (add-before 'build 'remove-dom4j - (lambda _ - (delete-file-recursively "src/org/jaxen/dom4j") - (delete-file-recursively "src/org/jaxen/xom") - #t))))) + #:tests? #f)) ; no tests (inputs - `(("java-jdom" ,java-jdom))) + (list java-jdom java-xom java-dom4j)) (home-page "https://github.com/jaxen-xpath/jaxen") (synopsis "XPath library") (description "Jaxen is an XPath library written in Java. It is adaptable @@ -237,12 +228,23 @@ (define java-jaxen-bootstrap with XPath too.") (license license:bsd-3))) -(define-public java-jaxen +;; Jaxen requires java-dom4j and java-xom that in turn require jaxen. +;; This package is a bootstrap version without dependencies on dom4j and xom. +(define java-jaxen-bootstrap (package - (inherit java-jaxen-bootstrap) - (name "java-jaxen") + (inherit java-jaxen) + (name "java-jaxen-bootstrap") + (arguments + (substitute-keyword-arguments (package-arguments java-jaxen) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-before 'build 'remove-dom4j + (lambda _ + (delete-file-recursively "src/org/jaxen/dom4j") + (delete-file-recursively "src/org/jaxen/xom") + #t)))))) (inputs - (list java-jdom java-xom java-dom4j)))) + (list java-jdom)))) (define-public java-xom (package