From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: 61435@debbugs.gnu.org
Subject: [bug#61435] [PATCH 2/2] gnu: httrack: Update to 3.49.4.
Date: Sat, 11 Feb 2023 17:50:10 +0100 [thread overview]
Message-ID: <20230211165010.2070585-2-mail@nicolasgoaziou.fr> (raw)
In-Reply-To: <20230211165010.2070585-1-mail@nicolasgoaziou.fr>
* 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 <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>
@@ -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
next prev parent reply other threads:[~2023-02-11 16:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-11 16:48 [bug#61435] [PATCH 0/2] Update httrack to 3.49.4 Nicolas Goaziou
2023-02-11 16:50 ` [bug#61435] [PATCH 1/2] gnu: Add coucal Nicolas Goaziou
2023-02-11 16:50 ` Nicolas Goaziou [this message]
2023-02-13 18:13 ` [bug#61435] [PATCH 0/2] Update httrack to 3.49.4 Christopher Baines
2023-02-17 23:10 ` bug#61435: " Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230211165010.2070585-2-mail@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=61435@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).