* [bug#61435] [PATCH 0/2] Update httrack to 3.49.4.
@ 2023-02-11 16:48 Nicolas Goaziou
2023-02-11 16:50 ` [bug#61435] [PATCH 1/2] gnu: Add coucal Nicolas Goaziou
2023-02-13 18:13 ` [bug#61435] [PATCH 0/2] Update httrack " Christopher Baines
0 siblings, 2 replies; 5+ messages in thread
From: Nicolas Goaziou @ 2023-02-11 16:48 UTC (permalink / raw)
To: 61435
Hello,
This patch set updates httrack to 3.49.4. In the process I need to partly unbundle coucal library.
Nicolas Goaziou (2):
gnu: Add coucal.
gnu: httrack: Update to 3.49.4.
gnu/packages/datastructures.scm | 50 +++++++++++++++++++++++++++++++++
gnu/packages/web.scm | 45 ++++++++++++++++++++++-------
2 files changed, 85 insertions(+), 10 deletions(-)
base-commit: 222eef1999d60f33053e6069ecd4ea86a030834f
--
2.39.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#61435] [PATCH 1/2] gnu: Add coucal.
2023-02-11 16:48 [bug#61435] [PATCH 0/2] Update httrack to 3.49.4 Nicolas Goaziou
@ 2023-02-11 16:50 ` Nicolas Goaziou
2023-02-11 16:50 ` [bug#61435] [PATCH 2/2] gnu: httrack: Update to 3.49.4 Nicolas Goaziou
2023-02-13 18:13 ` [bug#61435] [PATCH 0/2] Update httrack " Christopher Baines
1 sibling, 1 reply; 5+ messages in thread
From: Nicolas Goaziou @ 2023-02-11 16:50 UTC (permalink / raw)
To: 61435
* gnu/packages/datastructures.scm (coucal): New variable.
---
gnu/packages/datastructures.scm | 50 +++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index d40051506f..481109dea0 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -35,6 +35,56 @@ (define-module (gnu packages datastructures)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson))
+(define-public coucal
+ (let ((commit "73ada075553b7607d083037a87cb9c73b3683bfc")
+ (revision "1"))
+ (package
+ (name "coucal")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xroche/coucal")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "01996vda3wj5ywpwg9yhysaq6cyi44xnkyhihbwwi43hrj1ic2vm"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'do-not-run-tests-early
+ (lambda _
+ (substitute* "Makefile"
+ (("(all: ).*" _ lead) (string-append lead "gcc")))))
+ (add-after 'unpack 'remove-Werror
+ ;; Prevent "this statement may fall through
+ ;; [-Wimplicit-fallthrough=]" errors from "murmurhash3.h" file.
+ (lambda _
+ (substitute* "Makefile"
+ (("-Werror ") ""))))
+ (delete 'configure) ;no configure script
+ (replace 'install ;no install target
+ (lambda _
+ (let ((doc (string-append #$output
+ "/share/doc/" #$name "-" #$version)))
+ (install-file "README.md" doc))
+ (for-each (lambda (f) (install-file f #$output))
+ (find-files "." "(coucal|murmurhash)"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "tests" "runtests")))))))
+ (home-page "https://github.com/xroche/coucal")
+ (synopsis "Cuckoo-hashing-based hashtable with stash area C library")
+ (description "Coucal is an implementation of the Cuckoo hashing
+algorithm with a stash area using by default the MurmurHash hash function.")
+ ;; Library is released under Expat terms, but the source includes
+ ;; "murmurhash3.h", which is placed in the public domain.
+ (license (list license:expat license:public-domain)))))
+
(define-public gdsl
(package
(name "gdsl")
--
2.39.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#61435] [PATCH 2/2] gnu: httrack: Update to 3.49.4.
2023-02-11 16:50 ` [bug#61435] [PATCH 1/2] gnu: Add coucal Nicolas Goaziou
@ 2023-02-11 16:50 ` Nicolas Goaziou
0 siblings, 0 replies; 5+ messages in thread
From: Nicolas Goaziou @ 2023-02-11 16:50 UTC (permalink / raw)
To: 61435
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#61435] [PATCH 0/2] Update httrack to 3.49.4.
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-13 18:13 ` Christopher Baines
2023-02-17 23:10 ` bug#61435: " Nicolas Goaziou
1 sibling, 1 reply; 5+ messages in thread
From: Christopher Baines @ 2023-02-13 18:13 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: 61435
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Hello,
>
> This patch set updates httrack to 3.49.4. In the process I need to partly unbundle coucal library.
>
> Nicolas Goaziou (2):
> gnu: Add coucal.
> gnu: httrack: Update to 3.49.4.
>
> gnu/packages/datastructures.scm | 50 +++++++++++++++++++++++++++++++++
> gnu/packages/web.scm | 45 ++++++++++++++++++++++-------
> 2 files changed, 85 insertions(+), 10 deletions(-)
Looks good to me :)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#61435: [PATCH 0/2] Update httrack to 3.49.4.
2023-02-13 18:13 ` [bug#61435] [PATCH 0/2] Update httrack " Christopher Baines
@ 2023-02-17 23:10 ` Nicolas Goaziou
0 siblings, 0 replies; 5+ messages in thread
From: Nicolas Goaziou @ 2023-02-17 23:10 UTC (permalink / raw)
To: Christopher Baines; +Cc: 61435-done
Hello,
Christopher Baines <mail@cbaines.net> writes:
> Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
>
>> Hello,
>>
>> This patch set updates httrack to 3.49.4. In the process I need to partly unbundle coucal library.
>>
>> Nicolas Goaziou (2):
>> gnu: Add coucal.
>> gnu: httrack: Update to 3.49.4.
>>
>> gnu/packages/datastructures.scm | 50 +++++++++++++++++++++++++++++++++
>> gnu/packages/web.scm | 45 ++++++++++++++++++++++-------
>> 2 files changed, 85 insertions(+), 10 deletions(-)
>
> Looks good to me :)
Applied. Thank you for the feedback.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-17 23:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [bug#61435] [PATCH 2/2] gnu: httrack: Update to 3.49.4 Nicolas Goaziou
2023-02-13 18:13 ` [bug#61435] [PATCH 0/2] Update httrack " Christopher Baines
2023-02-17 23:10 ` bug#61435: " Nicolas Goaziou
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).