Subject: [bug#61435] [PATCH 2/2] gnu: httrack: Update to 3.49.4.

From: Nicolas Goaziou <[email-masked]>
Date: Sat, 11 Feb 2023 17:50:10 +0100

* 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.
---
 gnu/packages/web.scm | 45 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a2c4709855..83a97a63dc 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -30,7 +30,7 @@
 ;;; Copyright © 2018 Gábor Boskovits <[email-masked]>
 ;;; Copyright © 2018 Mădălin Ionel Patrașcu <[email-masked]>
 ;;; Copyright © 2018 Alex Vong <[email-masked]>
-;;; Copyright © 2019, 2020, 2021 Nicolas Goaziou <[email-masked]>
+;;; Copyright © 2019, 2020, 2021, 2023 Nicolas Goaziou <[email-masked]>
 ;;; Copyright © 2019 Brendan Tildesley <[email-masked]>
 ;;; Copyright © 2019 Alex Griffin <[email-masked]>
 ;;; Copyright © 2019 Hartmut Goebel <[email-masked]>
@@ -122,6 +122,7 @@ (define-module (gnu packages web)
   #: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)
@@ -7891,17 +7892,41 @@ (define-public hpcguix-web
 (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
-- 
2.39.1