diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-02-11 17:32:43 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-02-17 23:58:59 +0100 |
commit | 6dce27abbba01cb4e249c9bdb3c132cecc0a5c51 (patch) | |
tree | e30b32111da6467862bc0cd43296562fe1419ec8 | |
parent | 46c06fedbc155e52f9f5173846d531130ab8c8fc (diff) | |
download | guix-patches-6dce27abbba01cb4e249c9bdb3c132cecc0a5c51.tar guix-patches-6dce27abbba01cb4e249c9bdb3c132cecc0a5c51.tar.gz |
gnu: httrack: Update to 3.49.4.
* gnu/packages/web.scm (httrack): Update to 3.49.4.
[source]<origin>: Switch to GtiHub.
[arguments]: Add phases to prevent retrieving Coucal submodule and unbundle
it, although it is still compiled.
[native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL.
[inputs]: Add COUCAL.
-rw-r--r-- | gnu/packages/web.scm | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 271c6ffa81..98db004482 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> -;;; Copyright © 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2019, 2020-2021, 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> @@ -121,6 +121,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages django) #:use-module (gnu packages docbook) + #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) #:use-module (gnu packages emacs-xyz) @@ -7890,17 +7891,41 @@ instructions on how to use Guix in a shared HPC environment.") (define-public httrack (package (name "httrack") - (version "3.49.2") - (source (origin - (method url-fetch) - (uri (string-append "https://mirror.httrack.com/historical/" - "httrack-" version ".tar.gz")) - (sha256 - (base32 - "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl")))) + (version "3.49.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xroche/httrack") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1izn1h7gaxb2barclm2pj5kaz1mmddx2c35n70m0552q8ms4lvks")))) (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'autogen + ;; Force reconfiguration to generate "test-driver". + (lambda _ + (substitute* "configure.ac" + ;; Fix errors when running "configure" script. + (("AX_CHECK_(COMPILE|LINK)_FLAG\\(.*") "") + (("AX_CHECK_ALIGNED_ACCESS_REQUIRED") "") + (("gl_VISIBILITY") "")) + (invoke "autoreconf" "-vif"))) + (add-after 'unpack 'copy-coucal-source + ;; Install Coucal source to work around missing submodule. + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (f) (install-file f "src/coucal")) + (find-files #$(this-package-input "coucal") + "\\.(c|h|diff|orig)$"))))))) + (native-inputs + (list autoconf automake libtool)) (inputs - (list libressl zlib)) + (list coucal libressl zlib)) (home-page "https://www.httrack.com/") (synopsis "Easy-to-use offline browser utility") (description "HTTrack allows you to download a World Wide Web site from |