From 757bbaaf14183419a9c6e56072f3b202ea1bff3d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 1 May 2024 08:45:04 +0300 Subject: [PATCH] gnu: gource: Update to 0.54. * gnu/packages/version-control.scm (gource)[version]: Update to 0.54. [arguments]<#:disallowed-references>: Add tzdata-for-tests. <#:phases>: Unbundle tinyxml. Set TZDIR environment variable. <#:configure-flags>: Add --with-tinyxml argument. [native-inputs]: Add tzdata-for-tests. [inputs]: Replace pcre with pcre2. Add tinyxml. Change-Id: I67c2a1ee74582ed3e0a4ec5e6d229c948f9d5265 --- gnu/packages/version-control.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 0c7c496c82..2567acd2af 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2017, 2020 EuAndreh ;;; Copyright © 2017, 2018, 2020, 2022 Marius Bakke ;;; Copyright © 2017 Stefan Reichör -;;; Copyright © 2017, 2020 Oleg Pykhalov +;;; Copyright © 2017, 2020, 2024 Oleg Pykhalov ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2018 Timothy Sample @@ -3158,7 +3158,7 @@ (define-public stagit (define-public gource (package (name "gource") - (version "0.51") + (version "0.54") (source (origin (method url-fetch) (uri (string-append @@ -3166,15 +3166,26 @@ (define-public gource "/gource-" version "/gource-" version ".tar.gz")) (sha256 (base32 - "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr")))) + "1rgsssff5ygafc5svg19p046r4h2q9a3wqqbzrllvkyjcpgwxjqx")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--with-boost-libdir=" (assoc-ref %build-inputs "boost") - "/lib")))) + "/lib") + "--with-tinyxml") + #:disallowed-references (,tzdata-for-tests) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle + (lambda _ + (delete-file-recursively "src/tinyxml"))) + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZDIR" ; for src/test/datetime_tests.cpp + (search-input-directory inputs + "share/zoneinfo"))))))) (native-inputs - (list pkg-config)) + (list pkg-config tzdata-for-tests)) (inputs (list boost ftgl @@ -3183,8 +3194,9 @@ (define-public gource glu libpng mesa - pcre - (sdl-union (list sdl2 sdl2-image)))) + pcre2 + (sdl-union (list sdl2 sdl2-image)) + tinyxml)) (home-page "https://gource.io/") (synopsis "3D visualisation tool for source control repositories") (description "@code{gource} provides a software version control