GNU bug report logs - #31158
[PATCH] gnu: subversion: Update to 1.10.0.

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 31158 in the body.
You can then email your comments to 31158 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: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: subversion: Update to 1.10.0.
Date: Sat, 14 Apr 2018 22:48:13 -0400

Tested by building Git and some svn-fetch sources. The new dependencies
are new requirements. Subversion gained compatibility with Python 3 in
this release, so we switch to it.

* gnu/packages/version-control.scm (subversion): Update to 1.10.0.
(arguments): Patch a hidden shebang in a new 'patch-test-sh' phase.
(inputs): Add lz4 and utf8proc. Switch from python-2 to python-wrapper <at> 3.
---
 gnu/packages/version-control.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cccdb31fb..71ede4f54 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -90,6 +90,7 @@
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages tcl)
+  #:use-module (gnu packages textutils)
   #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages)
@@ -1069,7 +1070,7 @@ following features:
 (define-public subversion
   (package
     (name "subversion")
-    (version "1.8.19")
+    (version "1.10.0")
     (source (origin
              (method url-fetch)
              (uri
@@ -1080,7 +1081,7 @@ following features:
                                 "subversion-" version ".tar.bz2")))
              (sha256
               (base32
-               "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n"))))
+               "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -1096,6 +1097,11 @@ following features:
                (substitute* "libtool"
                  (("\\\\`ls") (string-append "\\`" coreutils "/bin/ls")))
                #t)))
+         (add-before 'build 'patch-test-sh
+           (lambda _
+             (substitute* "subversion/tests/libsvn_repos/repos-test.c"
+               (("#!/bin/sh") (string-append "#!" (which "sh"))))
+             #t))
          (add-after 'install 'install-perl-bindings
            (lambda* (#:key outputs #:allow-other-keys)
              ;; Follow the instructions from 'subversion/bindings/swig/INSTALL'.
@@ -1124,10 +1130,12 @@ following features:
     (inputs
       `(("apr" ,apr)
         ("apr-util" ,apr-util)
+        ("lz4" ,lz4)
         ("serf" ,serf)
         ("perl" ,perl)
-        ("python" ,python-2) ; incompatible with Python 3 (print syntax)
+        ("python" ,python-wrapper)
         ("sqlite" ,sqlite)
+        ("utf8proc" ,utf8proc)
         ("zlib" ,zlib)))
     (home-page "https://subversion.apache.org/")
     (synopsis "Revision control system")
-- 
2.17.0

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

From: Marius Bakke <mbakke <at> fastmail.com>
To: Leo Famulari <leo <at> famulari.name>, 31158 <at> debbugs.gnu.org
Subject: Re: [bug#31158] [PATCH] gnu: subversion: Update to 1.10.0.
Date: Tue, 17 Apr 2018 00:17:50 +0200

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

Leo Famulari <leo <at> famulari.name> writes:

> Tested by building Git and some svn-fetch sources. The new dependencies
> are new requirements. Subversion gained compatibility with Python 3 in
> this release, so we switch to it.
>
> * gnu/packages/version-control.scm (subversion): Update to 1.10.0.
> (arguments): Patch a hidden shebang in a new 'patch-test-sh' phase.
> (inputs): Add lz4 and utf8proc. Switch from python-2 to python-wrapper <at> 3.

LGTM, thank you!

[signature.asc (application/pgp-signature, inline)]

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

From: Leo Famulari <leo <at> famulari.name>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 31158-done <at> debbugs.gnu.org
Subject: Re: [bug#31158] [PATCH] gnu: subversion: Update to 1.10.0.
Date: Tue, 17 Apr 2018 14:38:02 -0400

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

On Tue, Apr 17, 2018 at 12:17:50AM +0200, Marius Bakke wrote:
> Leo Famulari <leo <at> famulari.name> writes:
> 
> > Tested by building Git and some svn-fetch sources. The new dependencies
> > are new requirements. Subversion gained compatibility with Python 3 in
> > this release, so we switch to it.
> >
> > * gnu/packages/version-control.scm (subversion): Update to 1.10.0.
> > (arguments): Patch a hidden shebang in a new 'patch-test-sh' phase.
> > (inputs): Add lz4 and utf8proc. Switch from python-2 to python-wrapper <at> 3.
> 
> LGTM, thank you!

Thanks! Pushed as 71653653ea39410d91ea7cc06cbb71790cc4da3c

[signature.asc (application/pgp-signature, inline)]

Previous Next

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