GNU bug report logs - #75285
[PATCH] gnu: Add xmlpatch.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75285 in the body.
You can then email your comments to 75285 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Lars Bilke <lars.bilke <at> ufz.de>
To: guix-patches <at> gnu.org
Cc: Lars Bilke <lars.bilke <at> ufz.de>
Subject: [PATCH] gnu: Add xmlpatch.
Date: Thu, 02 Jan 2025 15:33:24 +0100

* gnu/packages/xml.scm (xmlpatch): New variable.

Change-Id: I557f2dfbaadfef11c8ca592bb03ec829782fcb4e
---
 gnu/packages/xml.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 5bbd1dd64e..bc354e74f7 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2023,3 +2023,25 @@ (define-public xml-namespace-xsd
 schema language defined by the XML Schema Recommendation Second Edition of 28 October
 2004.")
     (license license:w3c)))
+
+(define-public xmlpatch
+  (package
+    (name "xmlpatch")
+    (synopsis "XML patch library")
+    (license license:lgpl2.1)
+    (description
+     "A C++ library for patching XML files with XPath expressions.")
+    (home-page "https://xmlpatch.sourceforge.net")
+    (version "0.4.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ufz/xmlpatch")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "120r0hm83nwvybjprmjaiilz5yj1qb46c9klawg61kqby6wsnaa8"))))
+    (build-system cmake-build-system)
+    (inputs (list libxml2))
+    (arguments
+     `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")))))

base-commit: ab43d883a0a88adbcfd3c3ab8d4c097cd9054b90
-- 
2.46.1

Message #8 received at 75285 <at> debbugs.gnu.org (full text, mbox):

From: Lars Bilke <lars.bilke <at> ufz.de>
To: 75285 <at> debbugs.gnu.org
Cc: Lars Bilke <lars.bilke <at> ufz.de>
Subject: [PATCH v2] gnu: Add xmlpatch.
Date: Fri, 03 Jan 2025 08:05:22 +0100

* gnu/packages/xml.scm (xmlpatch): New variable.

Change-Id: I557f2dfbaadfef11c8ca592bb03ec829782fcb4e
---
 gnu/packages/xml.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 5bbd1dd64e..a42a9e0e0d 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2023,3 +2023,25 @@ (define-public xml-namespace-xsd
 schema language defined by the XML Schema Recommendation Second Edition of 28 October
 2004.")
     (license license:w3c)))
+
+(define-public xmlpatch
+  (package
+    (name "xmlpatch")
+    (version "0.4.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ufz/xmlpatch")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "120r0hm83nwvybjprmjaiilz5yj1qb46c9klawg61kqby6wsnaa8"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")))
+    (inputs (list libxml2))
+    (home-page "https://xmlpatch.sourceforge.net")
+    (synopsis "XML patch library")
+    (description
+     "A C++ library for patching XML files with XPath expressions.")
+    (license license:lgpl2.1)))

base-commit: ab43d883a0a88adbcfd3c3ab8d4c097cd9054b90
-- 
2.46.1

Message #11 received at 75285 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Lars Bilke <lars.bilke <at> ufz.de>
Cc: 75285 <at> debbugs.gnu.org
Subject: Re: [bug#75285] [PATCH v2] gnu: Add xmlpatch.
Date: Mon, 27 Jan 2025 14:13:34 +0100

[Message part 1 (text/plain, inline)]

Hi Lars,

Lars Bilke <lars.bilke <at> ufz.de> skribis:

> * gnu/packages/xml.scm (xmlpatch): New variable.
>
> Change-Id: I557f2dfbaadfef11c8ca592bb03ec829782fcb4e

I think we at least need the changes below.

Looking at ‘xml-patch.spec.in’, it seems that the RPM package also
installs the ‘xml-patch’ and ‘xml-diff’ programs, which are not
installed here.

Could you take a look?

Thanks,
Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 3ef045fc03..7cd1b4d4af 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2051,6 +2051,7 @@ (define-public xmlpatch
        (uri (git-reference
              (url "https://github.com/ufz/xmlpatch")
              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32 "120r0hm83nwvybjprmjaiilz5yj1qb46c9klawg61kqby6wsnaa8"))))
     (build-system cmake-build-system)
@@ -2060,5 +2061,6 @@ (define-public xmlpatch
     (home-page "https://xmlpatch.sourceforge.net")
     (synopsis "XML patch library")
     (description
-     "A C++ library for patching XML files with XPath expressions.")
-    (license license:lgpl2.1)))
+     "XML Patch is a C++ library for patching XML files with XPath
+expressions.")
+    (license license:lgpl2.1+)))

Message #14 received at 75285 <at> debbugs.gnu.org (full text, mbox):

From: Lars Bilke <lars.bilke <at> ufz.de>
To: 75285 <at> debbugs.gnu.org, ludovic.courtes <at> inria.fr
Cc: Lars Bilke <lars.bilke <at> ufz.de>
Subject: [PATCH v3] gnu: Add xmlpatch.
Date: Tue, 28 Jan 2025 09:51:28 +0100

* gnu/packages/xml.scm (xmlpatch): New variable.

Change-Id: I557f2dfbaadfef11c8ca592bb03ec829782fcb4e
---
 gnu/packages/xml.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index ea36774d36..31488ea309 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2040,3 +2040,28 @@ (define-public xml-namespace-xsd
 schema language defined by the XML Schema Recommendation Second Edition of 28 October
 2004.")
     (license license:w3c)))
+
+(define-public xmlpatch
+  (package
+    (name "xmlpatch")
+    (version "0.4.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ufz/xmlpatch")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "10kjg7lz9p4xnv96053mj18dmc7lj7iqzx98z3aagnw6hfwdri7f"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")))
+    (native-inputs (list pkg-config))
+    (inputs (list libxml2 glib))
+    (home-page "https://xmlpatch.sourceforge.net")
+    (synopsis "XML patch library")
+    (description
+     "XML Patch is a C++ library for patching XML files with XPath
+expressions.")
+    (license license:lgpl2.1+)))

base-commit: 44d9f05fb3a8f20044873597762e6d8d6a895783
-- 
2.46.1

Message #17 received at 75285 <at> debbugs.gnu.org (full text, mbox):

From: Lars Bilke <lars.bilke <at> ufz.de>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 75285 <at> debbugs.gnu.org
Subject: Re: [bug#75285] [PATCH v2] gnu: Add xmlpatch.
Date: Tue, 28 Jan 2025 09:53:22 +0100

[Message part 1 (text/plain, inline)]

Hi Ludovic,

thanks for your comments. I have addressed all issues in v3, also 
packaging xml-patch and xml-diff binaries.

Sincerely,
Lars

On 27 Jan 2025, at 14:13, Ludovic Courtès wrote:

> Hi Lars,
>
> Lars Bilke <lars.bilke <at> ufz.de> skribis:
>
>> * gnu/packages/xml.scm (xmlpatch): New variable.
>>
>> Change-Id: I557f2dfbaadfef11c8ca592bb03ec829782fcb4e
>
> I think we at least need the changes below.
>
> Looking at ‘xml-patch.spec.in’, it seems that the RPM package also
> installs the ‘xml-patch’ and ‘xml-diff’ programs, which are 
> not
> installed here.
>
> Could you take a look?
>
> Thanks,
> Ludo’.

[Message part 2 (text/html, inline)]

Message #22 received at 75285-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Lars Bilke <lars.bilke <at> ufz.de>
Cc: 75285-done <at> debbugs.gnu.org
Subject: Re: [bug#75285] [PATCH v3] gnu: Add xmlpatch.
Date: Tue, 28 Jan 2025 11:47:04 +0100

[Message part 1 (text/plain, inline)]

Hi,

Applied v3 with the changes below.  Thanks!

Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 31488ea309..10cd6d98fa 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2062,6 +2062,7 @@ (define-public xmlpatch
     (home-page "https://xmlpatch.sourceforge.net")
     (synopsis "XML patch library")
     (description
-     "XML Patch is a C++ library for patching XML files with XPath
-expressions.")
+     "XML Patch is a C++ library and command-line interface
+(the @command{xml-diff} and @command{xml-patch} commands) for patching XML
+files with XPath expressions.")
     (license license:lgpl2.1+)))

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.