From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 11:48:45 2023 Received: (at submit) by debbugs.gnu.org; 11 Feb 2023 16:48:45 +0000 Received: from localhost ([127.0.0.1]:42985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQt3N-0004J7-Bn for submit@debbugs.gnu.org; Sat, 11 Feb 2023 11:48:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:48056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQt3K-0004Iz-84 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 11:48:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQt3K-0001Xt-1v for guix-patches@gnu.org; Sat, 11 Feb 2023 11:48:42 -0500 Received: from relay3-d.mail.gandi.net ([2001:4b98:dc4:8::223]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQt3I-0006Sx-5d for guix-patches@gnu.org; Sat, 11 Feb 2023 11:48:41 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 9601260003 for ; Sat, 11 Feb 2023 16:48:33 +0000 (UTC) From: Nicolas Goaziou To: guix-patches@gnu.org Subject: [PATCH 0/2] Update httrack to 3.49.4. Date: Sat, 11 Feb 2023 17:48:21 +0100 Message-Id: <20230211164821.2070553-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4b98:dc4:8::223; envelope-from=mail@nicolasgoaziou.fr; helo=relay3-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 11:50:32 2023 Received: (at 61435) by debbugs.gnu.org; 11 Feb 2023 16:50:32 +0000 Received: from localhost ([127.0.0.1]:42991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQt55-0004Mo-TX for submit@debbugs.gnu.org; Sat, 11 Feb 2023 11:50:32 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:51965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQt54-0004MV-34 for 61435@debbugs.gnu.org; Sat, 11 Feb 2023 11:50:30 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id B075BE0004 for <61435@debbugs.gnu.org>; Sat, 11 Feb 2023 16:50:23 +0000 (UTC) From: Nicolas Goaziou To: 61435@debbugs.gnu.org Subject: [PATCH 2/2] gnu: httrack: Update to 3.49.4. Date: Sat, 11 Feb 2023 17:50:10 +0100 Message-Id: <20230211165010.2070585-2-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211165010.2070585-1-mail@nicolasgoaziou.fr> References: <20230211165010.2070585-1-mail@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61435 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (httrack): Update to 3.49.4. [source]: 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 ;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019, 2020, 2021 Nicolas Goaziou +;;; Copyright © 2019, 2020, 2021, 2023 Nicolas Goaziou ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel @@ -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 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 11:50:34 2023 Received: (at 61435) by debbugs.gnu.org; 11 Feb 2023 16:50:34 +0000 Received: from localhost ([127.0.0.1]:42993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQt58-0004Mx-GC for submit@debbugs.gnu.org; Sat, 11 Feb 2023 11:50:34 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:46481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQt54-0004MS-2a for 61435@debbugs.gnu.org; Sat, 11 Feb 2023 11:50:31 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 35DD4E0005 for <61435@debbugs.gnu.org>; Sat, 11 Feb 2023 16:50:22 +0000 (UTC) From: Nicolas Goaziou To: 61435@debbugs.gnu.org Subject: [PATCH 1/2] gnu: Add coucal. Date: Sat, 11 Feb 2023 17:50:09 +0100 Message-Id: <20230211165010.2070585-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61435 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 13 13:13:37 2023 Received: (at submit) by debbugs.gnu.org; 13 Feb 2023 18:13:37 +0000 Received: from localhost ([127.0.0.1]:51514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRdKa-0002iV-RQ for submit@debbugs.gnu.org; Mon, 13 Feb 2023 13:13:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:45702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRdKZ-0002iC-JN for submit@debbugs.gnu.org; Mon, 13 Feb 2023 13:13:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pRdKU-0006bX-7Q for guix-patches@gnu.org; Mon, 13 Feb 2023 13:13:30 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRdKR-0003JE-4c for guix-patches@gnu.org; Mon, 13 Feb 2023 13:13:28 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id E86201658F; Mon, 13 Feb 2023 18:13:24 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 9e49caa4; Mon, 13 Feb 2023 18:13:24 +0000 (UTC) References: <20230211164821.2070553-1-mail@nicolasgoaziou.fr> User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines To: Nicolas Goaziou Subject: Re: [bug#61435] [PATCH 0/2] Update httrack to 3.49.4. Date: Mon, 13 Feb 2023 18:13:18 +0000 In-reply-to: <20230211164821.2070553-1-mail@nicolasgoaziou.fr> Message-ID: <87fsb9303f.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: guix-patches@gnu.org, 61435@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Nicolas Goaziou 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 :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPqfcRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdugRAApU2v1FnEdOTzxe/ZrXquD215zhXQ5wgd 97RsvXDnH1Z2AoLFTdkEuY5W5E5aIzbUX+qCYObEUtAur7ljUSDawe/fmRMTbF8L TCnbIgw3dd41dn41MTlTRvDsqIFET9dM7rbkrCuNsYWpaTnPLZOVfgbeENXUgNei 7bcDnKvY2zSmukU2vTo/4oy+i5ZZfV1mURuRjZFMQPSh3Wv1dw1t23IaAmC64v/k akzqlEi5aan2dbfbB7ah88iyIWjhR5jfFuNNTY6yP0XexVWyQpUlCvE9s3hqh6dO b//AMV7Y4EclDeck/EUgrW+/TYAoHuWkNIVZSUxh9N3JRnmwRRMoh+sYeBxJfm9/ Vd8LVD5KzrkDDVnhmBwQsWP9WU6Fk8HeMq72p2tXW9yEwqeVioDJ+2c7jE1cujJO A+qkOTbQs+qwodD/XK7BhYKXmDJTqsJTbsSeK0LvsMuxlQgGjNLPcAD7eMxMqn2O w8m3SyOlkO4a4vfeMw6btw4JHjLJ3k+KAzIIFpZYxjly5D9PNmCK208Twh/96S/q aeVez9vZLf29wJ6ZQWEBrRGFbwSta4AqndIQkMLk2Ktr2o+QufBuapZuPyXKNUSi rVd6Xp4UVnwxkX8KwRrjmNpqaW6CWPqAzIBQ14+FDwxF4bS59Jf+cEc+hfmm3K9T 1dWmbYr0V8M= =2QwO -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 17 18:10:49 2023 Received: (at 61435-done) by debbugs.gnu.org; 17 Feb 2023 23:10:50 +0000 Received: from localhost ([127.0.0.1]:41830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT9sP-0005Vu-LQ for submit@debbugs.gnu.org; Fri, 17 Feb 2023 18:10:49 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT9sM-0005Vb-94 for 61435-done@debbugs.gnu.org; Fri, 17 Feb 2023 18:10:48 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 561B560003; Fri, 17 Feb 2023 23:10:38 +0000 (UTC) From: Nicolas Goaziou To: Christopher Baines Subject: Re: [bug#61435] [PATCH 0/2] Update httrack to 3.49.4. References: <20230211164821.2070553-1-mail@nicolasgoaziou.fr> <87fsb9303f.fsf@cbaines.net> Date: Sat, 18 Feb 2023 00:10:31 +0100 In-Reply-To: <87fsb9303f.fsf@cbaines.net> (Christopher Baines's message of "Mon, 13 Feb 2023 18:13:18 +0000") Message-ID: <87k00fubvc.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61435-done Cc: 61435-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Christopher Baines writes: > Nicolas Goaziou 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 From unknown Wed Sep 10 13:55:52 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 18 Mar 2023 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator