From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 19:15:56 2022 Received: (at submit) by debbugs.gnu.org; 8 Sep 2022 23:15:56 +0000 Received: from localhost ([127.0.0.1]:60466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWQkW-0001MH-15 for submit@debbugs.gnu.org; Thu, 08 Sep 2022 19:15:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:40118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWQkT-0001M8-8d for submit@debbugs.gnu.org; Thu, 08 Sep 2022 19:15:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWQkT-0006dk-3V for guix-patches@gnu.org; Thu, 08 Sep 2022 19:15:53 -0400 Received: from mx1.dismail.de ([78.46.223.134]:24816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWQkQ-0002Ae-SS for guix-patches@gnu.org; Thu, 08 Sep 2022 19:15:52 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 708e0a90 for ; Fri, 9 Sep 2022 01:15:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=0kxEPCcRrQtTTveithXO5 OZhz/xj0FINC0OrtKmgxRM=; b=nde298fLPjN7cRGzKf0FMwzLZ2TR+NsRaVSXe fKCWVXPo8eNqM7KhtIyfn7HaHEme9tBXXnFTmYB3gh7CZXfr2bhC575ca4JJXnlO gZ/5HznJEKg1tWYpdTKGrUXj/c95xKJmz80afF0WjS1Wycg7A9Is3u06zJ2f7ocb 7z5OI6JiHVYv9NIqKno8e3/xd1vTR2+8XVuUHDQ0srEoat1s5Npzqwax6UE67zm+ /id2RSci/TF6IzSMAZS6O5m4/ucDA8uldPkR9U25hoC3RPKIigo7OcyGHpKGLdT/ TlKFmKdt3b9hXr0rICpYADL/rX3MfWkLU5eOg3M2VSz64VEMw== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id ba8b80e9 for ; Fri, 9 Sep 2022 01:15:45 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 6a8bca20 for ; Fri, 9 Sep 2022 01:15:45 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 747e172c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Sep 2022 01:15:43 +0200 (CEST) From: jgart To: guix-patches@gnu.org Subject: [PATCH] gnu: Add wiggle. Date: Thu, 8 Sep 2022 18:15:00 -0500 Message-Id: <20220908231459.20365-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=78.46.223.134; envelope-from=jgart@dismail.de; helo=mx1.dismail.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: jgart 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: -0.4 (/) * gnu/packages/patchutils.scm (wiggle): New variable. Here's wiggle ~ jgart --- gnu/packages/patchutils.scm | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..4c2eb4f6cb 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) @@ -441,6 +443,47 @@ (define pythonpath (home-page "http://jk.ozlabs.org/projects/patchwork/") (license gpl2+))) +(define-public wiggle + (package + (name "wiggle") + (version "1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/neilbrown/wiggle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf")))) + (build-system gnu-build-system) + (native-inputs (list groff)) + (inputs + (list ncurses)) + (arguments + `(#:make-flags + (list "-I. -O3" + (string-append "CC=" ,(cc-for-target)) + "INSTALL=\"install\"" + "STRIP=-s" + (string-append "BINDIR=" %output "/bin") + (string-append "MANDIR=" %output "/share/man") + (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key inputs ouputs #:allow-other-keys) + (invoke "./dotest")))))) + (home-page "http://neil.brown.name/wiggle/") + (synopsis "Tool for applying patches with conflicts") + (description +"@code{wiggle} attempts to apply patches to a file even if the file +doesn't match the target file perfectly.") + (license gpl2+))) + (define-public pwclient (package (name "pwclient") -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 19:25:11 2022 Received: (at 57688) by debbugs.gnu.org; 8 Sep 2022 23:25:11 +0000 Received: from localhost ([127.0.0.1]:60478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWQtS-0001ad-Fq for submit@debbugs.gnu.org; Thu, 08 Sep 2022 19:25:10 -0400 Received: from mx1.dismail.de ([78.46.223.134]:15773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWQtR-0001aN-9Y for 57688@debbugs.gnu.org; Thu, 08 Sep 2022 19:25:10 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 383f71bb for <57688@debbugs.gnu.org>; Fri, 9 Sep 2022 01:25:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=kRUyM2AuTm0r6d7tx0Uv2 1JByq7nIy2wjWqjfh5vmS8=; b=OO9l6Lp/SebhWhgqr4P7Mur+84N0bsIr81ilp srf8l127byMTXRIKzTApSgpx6nJ9cVMS0Dkiz6lrZQ5txQk+cC7FuEO6hULWflxL ne3DnygPjVw8It0xv5etJ7Y7oJihcWruLsTLx6rBxGNiWjeIqSQorPvFbfZBYexF YoYPPfrwyMYhAzstXPG1tML/kXa0aJ4JvHb1VJ81HU8RVu5rElIL4TlwoEYFEsFm oXR6nmqG9TNj7o62dXf/KrAxm/S1EKNF1SSLWjnuddcdBA9q/iY5DpUso/JvhSeL ruyuMXj7sxh5HGqtBkn1TODJKvZ6Y94ZGaNFEoB8SPWwD1laQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 4923f8fc for <57688@debbugs.gnu.org>; Fri, 9 Sep 2022 01:25:01 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 95442a74 for <57688@debbugs.gnu.org>; Fri, 9 Sep 2022 01:25:01 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 67004f1a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Sep 2022 01:25:00 +0200 (CEST) From: jgart To: 57688@debbugs.gnu.org Subject: [PATCH v2] gnu: Add wiggle. Date: Thu, 8 Sep 2022 18:24:26 -0500 Message-Id: <20220908232425.21061-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patchutils.scm (wiggle): New variable. Here's version 2. I just reworded the description. --- gnu/packages/patchutils.scm | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 57688 Cc: jgart 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: 0.3 (/) * gnu/packages/patchutils.scm (wiggle): New variable. Here's version 2. I just reworded the description. --- gnu/packages/patchutils.scm | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..b81d13e9ca 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) @@ -441,6 +443,47 @@ (define pythonpath (home-page "http://jk.ozlabs.org/projects/patchwork/") (license gpl2+))) +(define-public wiggle + (package + (name "wiggle") + (version "1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/neilbrown/wiggle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf")))) + (build-system gnu-build-system) + (native-inputs (list groff)) + (inputs + (list ncurses)) + (arguments + `(#:make-flags + (list "-I. -O3" + (string-append "CC=" ,(cc-for-target)) + "INSTALL=\"install\"" + "STRIP=-s" + (string-append "BINDIR=" %output "/bin") + (string-append "MANDIR=" %output "/share/man") + (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key inputs ouputs #:allow-other-keys) + (invoke "./dotest")))))) + (home-page "http://neil.brown.name/wiggle/") + (synopsis "Tool for applying patches with conflicts") + (description +"@code{wiggle} attempts to apply patches to a target file even if the +patches do not match perfectly.") + (license gpl2+))) + (define-public pwclient (package (name "pwclient") -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 19:51:59 2022 Received: (at 57688) by debbugs.gnu.org; 8 Sep 2022 23:51:59 +0000 Received: from localhost ([127.0.0.1]:60505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWRJO-0002HR-O4 for submit@debbugs.gnu.org; Thu, 08 Sep 2022 19:51:58 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:41182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWRJK-0002HG-Uh for 57688@debbugs.gnu.org; Thu, 08 Sep 2022 19:51:56 -0400 Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16] ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by laurent.telenet-ops.be with bizsmtp id Hbrs2800420ykKC01brsH1; Fri, 09 Sep 2022 01:51:53 +0200 Message-ID: <10eac3dd-1a36-007f-9cdc-25f1901f0e6a@telenet.be> Date: Fri, 9 Sep 2022 01:51:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [bug#57688] [PATCH] gnu: Add wiggle. Content-Language: en-US To: jgart , 57688@debbugs.gnu.org References: <20220908231459.20365-1-jgart@dismail.de> From: Maxime Devos In-Reply-To: <20220908231459.20365-1-jgart@dismail.de> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------hRJdfJ3of5t3ktxpAWzXastV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662681113; bh=urZLnhlOWs+AY4n1LC1MdKzqGdtiXPfa37TqdJcmxRs=; h=Date:Subject:To:References:From:In-Reply-To; b=ZO5NzrifkUu7IkN3wc2EtnjOMMlefTmqShdv02Oz9mZ0ineT+0W3b7EGol0Zq/7mW kIfkrdzkK4ULYZ9TMA2dterP5LS7yEeEKPcIjDG3OSi0iKo7p1ipwnstu5ErgpUi0E mYmuZrMuF9JhSpdfj1/9aqOay3JdTZbwxL4mVO90O14ESQlcwHmT0CjwI8uDarU/lW AEHYGZOMkuklIySUO35EZhPrviaiLb/tN6foDlAYqqAra9iTZnRWHTdiUzew+Ay//t KgRx+RCUgm4ukJqriLTkyE7j971tAUs0O6UMJQ299pgcoXWFhWWhHat/75ew3XXon9 iH4FdtJXqYpjA== X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57688 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.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------hRJdfJ3of5t3ktxpAWzXastV Content-Type: multipart/mixed; boundary="------------48JiRfBEQQrhdc7gqOpUUd7J"; protected-headers="v1" From: Maxime Devos To: jgart , 57688@debbugs.gnu.org Message-ID: <10eac3dd-1a36-007f-9cdc-25f1901f0e6a@telenet.be> Subject: Re: [bug#57688] [PATCH] gnu: Add wiggle. References: <20220908231459.20365-1-jgart@dismail.de> In-Reply-To: <20220908231459.20365-1-jgart@dismail.de> --------------48JiRfBEQQrhdc7gqOpUUd7J Content-Type: multipart/mixed; boundary="------------v4lSvTV2MqilLB8HI10D07Ss" --------------v4lSvTV2MqilLB8HI10D07Ss Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 DQoNCk9uIDA5LTA5LTIwMjIgMDE6MTUsIGpnYXJ0IHZpYSBHdWl4LXBhdGNoZXMgdmlhIHdy b3RlOg0KPiArICAgICAgIGAoIzptYWtlLWZsYWdzDQo+ICsgICAgICAgICAobGlzdCAiLUku IC1PMyINCj4gKyAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJDQz0iICwoY2MtZm9y LXRhcmdldCkpDQo+ICsgICAgICAgICAgICAgICAiSU5TVEFMTD1cImluc3RhbGxcIiINCj4g KyAgICAgICAgICAgICAgICJTVFJJUD0tcyINCj4gKyAgICAgICAgICAgICAgIChzdHJpbmct YXBwZW5kICJCSU5ESVI9IiAlb3V0cHV0ICIvYmluIikNCj4gKyAgICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kICJNQU5ESVI9IiAlb3V0cHV0ICIvc2hhcmUvbWFuIikNCj4gKyAgICAg ICAgICAgICAgIChzdHJpbmctYXBwZW5kICJDQz0iICwoY2MtZm9yLXRhcmdldCkpDQo+ICsg ICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiUFJFRklYPSIgJW91dHB1dCkpDQoNCiVv dXRwdXQgaXMgdW5kb2N1bWVudGVkLiAgVXNlICMkb3V0cHV0IGluc3RlYWQuDQoNCj4gKyAg ICAgICAgICAjOnBoYXNlcw0KPiArICAgICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFy ZC1waGFzZXMNCj4gKyAgICAgICAgICAgIChkZWxldGUgJ2NvbmZpZ3VyZSkNCj4gKyAgICAg ICAgICAgIChyZXBsYWNlICdjaGVjaw0KPiArICAgICAgICAgICAgICAobGFtYmRhKiAoIzpr ZXkgaW5wdXRzIG91cHV0cyAjOmFsbG93LW90aGVyLWtleXMpDQo+ICsgICAgICAgICAgICAg ICAgKGludm9rZSAiLi9kb3Rlc3QiKSkpKSkpDQoNCkJlaW5nIHVuY29uZGl0aW9uYWwsIHRo aXMgYnJlYWtzIC0td2l0aG91dC10ZXN0cy4gIEhhdmUgeW91IHJ1bg0KIi4vcHJlLWluc3Qt ZW52IGd1aXggbGludCB3aWdnbGUiPyAgVGhlcmUncyBhIGxpbnRlciBmb3IgZGV0ZWN0aW5n IHRoYXQuDQoNCkdyZWV0aW5ncywNCk1heGltZS4NCg== --------------v4lSvTV2MqilLB8HI10D07Ss Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc" Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2 ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc /gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4 LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0 k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D =3DOVqp -----END PGP PUBLIC KEY BLOCK----- --------------v4lSvTV2MqilLB8HI10D07Ss-- --------------48JiRfBEQQrhdc7gqOpUUd7J-- --------------hRJdfJ3of5t3ktxpAWzXastV Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYxqAGAUDAAAAAAAKCRBJ4+4iGRcl7rbF AP9ZmsoexINySzuzysy75wyKzYkiBbtdMt72Tk0KJQ5zBQEAkYvHvm/4FuSiYmmhRHBJ12yd3FSQ uCsHmv0Uw/7Y4wQ= =pau8 -----END PGP SIGNATURE----- --------------hRJdfJ3of5t3ktxpAWzXastV-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 21:40:36 2022 Received: (at 57688) by debbugs.gnu.org; 9 Sep 2022 01:40:36 +0000 Received: from localhost ([127.0.0.1]:60540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWT0T-0004y3-0r for submit@debbugs.gnu.org; Thu, 08 Sep 2022 21:40:36 -0400 Received: from mx1.dismail.de ([78.46.223.134]:11989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWT0M-0004xX-KR for 57688@debbugs.gnu.org; Thu, 08 Sep 2022 21:40:31 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id addce42f; Fri, 9 Sep 2022 03:40:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=UIrRBfNSqfQ26cD9t7+MN 0AD35pTOv2AUmJehqv5e24=; b=nVPUDlx3Fa74GdsnKn2GiE3nJ69YV62LAqR6R 9PX+wtsfXTDQe+hwbYMkMVb72wdlFMstJf45MnydawlS+Ok57TYz7R0O7MkLSMIN ckYsr4tEdWRcVCxsryG/5TUMjaMLea7iBeApDHzgzxn7WIVatA4zTHAIjjkyi0p4 eQEI4GtuLyLiO0rg3lL2cGUkYA3VSgb1k9wFqSQyx66a/7+uzJPu1uHhnoCWNTvm 8duawH1nBbxLt14bYWJF42HeAxnRfYNqyTgmFQoI1ZfpAXeFTprj4qNqDAghMhCC 6Spyf3xcQwS818gE2vJjtr5ktu55siK7Y7SiZm57ox03i6hbw== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id d879c705; Fri, 9 Sep 2022 03:40:15 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 9838daef; Fri, 9 Sep 2022 03:40:15 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id a2d35861 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Sep 2022 03:40:14 +0200 (CEST) From: jgart To: 57688@debbugs.gnu.org Subject: [PATCH v3] gnu: Add wiggle. Date: Thu, 8 Sep 2022 20:27:04 -0500 Message-Id: <20220909012703.26777-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patchutils.scm (wiggle): New variable. Hi Maxime, Yes, I missed that one :() Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 57688 Cc: Maxime Devos , jgart 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: 0.3 (/) * gnu/packages/patchutils.scm (wiggle): New variable. Hi Maxime, Yes, I missed that one :() Thanks for the review. Here's v3. all best, jgart --- gnu/packages/patchutils.scm | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..cd96c21ceb 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) @@ -441,6 +443,48 @@ (define pythonpath (home-page "http://jk.ozlabs.org/projects/patchwork/") (license gpl2+))) +(define-public wiggle + (package + (name "wiggle") + (version "1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/neilbrown/wiggle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf")))) + (build-system gnu-build-system) + (native-inputs (list groff)) + (inputs + (list ncurses)) + (arguments + `(#:make-flags + (list "-I. -O3" + (string-append "CC=" ,(cc-for-target)) + "INSTALL=\"install\"" + "STRIP=-s" + (string-append "BINDIR=" %output "/bin") + (string-append "MANDIR=" %output "/share/man") + (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key inputs ouputs tests? #:allow-other-keys) + (when tests? + (invoke "./dotest"))))))) + (home-page "http://neil.brown.name/wiggle/") + (synopsis "Tool for applying patches with conflicts") + (description +"@code{wiggle} attempts to apply patches to a target file even if the +patches do not match perfectly.") + (license gpl2+))) + (define-public pwclient (package (name "pwclient") -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 09 00:16:40 2022 Received: (at 57688) by debbugs.gnu.org; 9 Sep 2022 04:16:40 +0000 Received: from localhost ([127.0.0.1]:60649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWVRX-0000On-MU for submit@debbugs.gnu.org; Fri, 09 Sep 2022 00:16:40 -0400 Received: from mx1.dismail.de ([78.46.223.134]:45284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWVRU-0000OX-NG for 57688@debbugs.gnu.org; Fri, 09 Sep 2022 00:16:38 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 8711b3f0; Fri, 9 Sep 2022 06:16:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=SUH80vea3iBNOC/9BdJ/c OunH7rXWIu6vOhkQRU8Uh0=; b=erdpYlcOvEL7JxbfCMH624As624f/ujwVZpX3 VpicsJFIBrLeDVFeZ5Fz/SzFiygCZV6nrQq0wVCrUsUrxxGNXz/XNreiE+u3FomM NOjxBmic1V9gtQJvIXrtSDKQXYJve4S9aMkySmIn1YaWQYmoWgiRw+DYwf2EGwqp 3paTRxiYAiH9Gfh0u1uX5DaL0qeEHyXCw2fDTn/Mw0k8Qij0ZxB+4S65w0vNrLzR FfeM1piYW0+OXOxtT1XpbjX7OiEnhswaYanhk4qbfAclkg4nJLfYEW9ejrcgj8YA HkYvYzvHzPYmKDZZUowWXOtR4+ZYeMOsIQElPq+jcxrnI3srw== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id a8122442; Fri, 9 Sep 2022 06:16:28 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 82486145; Fri, 9 Sep 2022 06:16:28 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 8bf9c223 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Sep 2022 06:16:22 +0200 (CEST) From: jgart To: 57688@debbugs.gnu.org Subject: [PATCH v4] gnu: Add wiggle. Date: Thu, 8 Sep 2022 23:14:59 -0500 Message-Id: <20220909041458.3972-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patchutils.scm (wiggle): New variable. Hi again Maxime, Here's v4. Forgot to add the gexps everywhere. Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 57688 Cc: Maxime Devos , jgart 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: 0.3 (/) * gnu/packages/patchutils.scm (wiggle): New variable. Hi again Maxime, Here's v4. Forgot to add the gexps everywhere. #$all best, jgart --- gnu/packages/patchutils.scm | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..86e052a18f 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages patchutils) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix licenses) @@ -40,6 +42,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) @@ -441,6 +444,48 @@ (define pythonpath (home-page "http://jk.ozlabs.org/projects/patchwork/") (license gpl2+))) +(define-public wiggle + (package + (name "wiggle") + (version "1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/neilbrown/wiggle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf")))) + (build-system gnu-build-system) + (native-inputs (list groff)) + (inputs + (list ncurses)) + (arguments + (list #:make-flags + #~(list "-I. -O3" + (string-append "CC=" #$(cc-for-target)) + "INSTALL=\"install\"" + "STRIP=-s" + (string-append "BINDIR=" #$output "/bin") + (string-append "MANDIR=" #$output "/share/man") + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + '(modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key inputs ouputs tests? #:allow-other-keys) + (when tests? + (invoke "./dotest"))))))) + (home-page "http://neil.brown.name/wiggle/") + (synopsis "Tool for applying patches with conflicts") + (description +"@code{wiggle} attempts to apply patches to a target file even if the +patches do not match perfectly.") + (license gpl2+))) + (define-public pwclient (package (name "pwclient") -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 09 08:35:24 2022 Received: (at 57688) by debbugs.gnu.org; 9 Sep 2022 12:35:24 +0000 Received: from localhost ([127.0.0.1]:32777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWdEB-00074T-Ra for submit@debbugs.gnu.org; Fri, 09 Sep 2022 08:35:24 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:53116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWdE8-00074I-Ri for 57688@debbugs.gnu.org; Fri, 09 Sep 2022 08:35:22 -0400 Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16] ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by baptiste.telenet-ops.be with bizsmtp id HobH2800U20ykKC01obHVv; Fri, 09 Sep 2022 14:35:19 +0200 Message-ID: <847d87a5-b01e-07a2-1764-4d3f5ecb8b9e@telenet.be> Date: Fri, 9 Sep 2022 14:35:17 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v4] gnu: Add wiggle. Content-Language: en-US To: jgart , 57688@debbugs.gnu.org References: <20220909041458.3972-1-jgart@dismail.de> From: Maxime Devos In-Reply-To: <20220909041458.3972-1-jgart@dismail.de> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------5Tu4ibbuCu0uzj9xYLNT0Z6b" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662726919; bh=Ho/szVwWMKkchUi0PIGNrex4kbHGCxSmhUpn4dnFAW8=; h=Date:Subject:To:References:From:In-Reply-To; b=e5PtPar+t63Nc4M+w1bC9GNsnTMC8PYQjsNqE5mbUYFuhnkARpSQtzlj1SR5gYCdO uIjtcb65y9MmUoAbV99lh0ApG6m5/ZV5w4o4SQHp6W7p3Y/148UjcxgB67wxq3Xj16 YbuapowNKosXXkrjl/5P1pgA2vgHXnxaHoCGoP5rW0rrJWjPGB6kJtUNhSoCZrtUPz JsNDbkb/vNWc1UfC6RX/wa7ykZetk7Mhtjan4whh83ATe9w/M7auAlUJHPPDoL0SWi GuAofQAz3Y20teRZpAnA6imk17xRdZOPRouv8KvonkiwGwnlp4ceuqYXPLrBRx33fT jd7NgFuI8TgtA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57688 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 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------5Tu4ibbuCu0uzj9xYLNT0Z6b Content-Type: multipart/mixed; boundary="------------PFul1T0FvPypGGsaT0NbbPvc"; protected-headers="v1" From: Maxime Devos To: jgart , 57688@debbugs.gnu.org Message-ID: <847d87a5-b01e-07a2-1764-4d3f5ecb8b9e@telenet.be> Subject: Re: [PATCH v4] gnu: Add wiggle. References: <20220909041458.3972-1-jgart@dismail.de> In-Reply-To: <20220909041458.3972-1-jgart@dismail.de> --------------PFul1T0FvPypGGsaT0NbbPvc Content-Type: multipart/mixed; boundary="------------HgVu0S55A6p5Gpc7hWPaQORG" --------------HgVu0S55A6p5Gpc7hWPaQORG Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 DQoNCk9uIDA5LTA5LTIwMjIgMDY6MTQsIGpnYXJ0IHdyb3RlOg0KPiArICAgICAgKGFyZ3Vt ZW50cw0KPiArICAgICAgICAobGlzdCAjOm1ha2UtZmxhZ3MNCj4gKyAgICAgICAgICAgICAg I34obGlzdCAiLUkuIC1PMyINCj4gKyAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFw cGVuZCAiQ0M9IiAjJChjYy1mb3ItdGFyZ2V0KSkNCj4gKyAgICAgICAgICAgICAgICAgICAg ICAiSU5TVEFMTD1cImluc3RhbGxcIiINCj4gKyAgICAgICAgICAgICAgICAgICAgICAiU1RS SVA9LXMiDQo+ICsgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIkJJTkRJ Uj0iICMkb3V0cHV0ICIvYmluIikNCj4gKyAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5n LWFwcGVuZCAiTUFORElSPSIgIyRvdXRwdXQgIi9zaGFyZS9tYW4iKQ0KPiArICAgICAgICAg ICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJDQz0iICMkKGNjLWZvci10YXJnZXQpKQ0K PiArICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJQUkVGSVg9IiAjJG91 dHB1dCkpDQo+ICsgICAgICAgICAgICAgICAjOnBoYXNlcw0KPiArICAgICAgICAgICAgICAg Jyhtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMNCg0KTml0cGljazogdXNpbmcgRy1l eHAgZm9yICM6bWFrZS1mbGFncyBidXQgbm90ICM6cGhhc2VzIGlzIGluY29uc2lzdGVudCwg DQp0aG91Z2ggdGhhdCdzIHNvbWV0aGluZyBhIGNvbW1pdHRlciBjb3VsZCBhZGp1c3Qgd2l0 aG91dCBhbnkgdHJvdWJsZS4NCg0KPiArICAgICAgICAgICAgICAgICAgKGRlbGV0ZSAnY29u ZmlndXJlKQ0KPiArICAgICAgICAgICAgICAgICAgKHJlcGxhY2UgJ2NoZWNrDQo+ICsgICAg ICAgICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3VwdXRzIHRlc3RzPyAj OmFsbG93LW90aGVyLWtleXMpDQo+ICsgICAgICAgICAgICAgICAgICAgICAgKHdoZW4gdGVz dHM/DQo+ICsgICAgICAgICAgICAgICAgICAgICAgICAoaW52b2tlICIuL2RvdGVzdCIpKSkp KSkpDQoNClRoYXQncyB3aGF0IEkgaGFkIGluIG1pbmQsIHRoYW5rcy4gIEZvciBjb21wbGV0 ZW5lc3MsIGlkZWFsbHkgc29tZW9uZSANCndvdWxkIGNoZWNrIHRoZSBzb3VyY2VzIGZvciBt YWx3YXJlLCBidXQgb3RoZXJ3aXNlIExHVE0uDQoNCkdyZWV0aW5ncywNCk1heGltZS4NCg== --------------HgVu0S55A6p5Gpc7hWPaQORG Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc" Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2 ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc /gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4 LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0 k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D =3DOVqp -----END PGP PUBLIC KEY BLOCK----- --------------HgVu0S55A6p5Gpc7hWPaQORG-- --------------PFul1T0FvPypGGsaT0NbbPvc-- --------------5Tu4ibbuCu0uzj9xYLNT0Z6b Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYxszBQUDAAAAAAAKCRBJ4+4iGRcl7k6i AP9+4Z+aSwD3Kvb4fZdk3luXsraNKYsdb2/8lRd5e8/6uwD/R2N6k3QPWnsQ9Qwdm9RC6pUYEZB3 G7b1WJ8U8w1H9g8= =/J5+ -----END PGP SIGNATURE----- --------------5Tu4ibbuCu0uzj9xYLNT0Z6b-- From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 09 10:07:03 2022 Received: (at 57688) by debbugs.gnu.org; 9 Sep 2022 14:07:03 +0000 Received: from localhost ([127.0.0.1]:34865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWeet-0001U7-3U for submit@debbugs.gnu.org; Fri, 09 Sep 2022 10:07:03 -0400 Received: from mx1.dismail.de ([78.46.223.134]:39929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWeep-0001T9-Kx for 57688@debbugs.gnu.org; Fri, 09 Sep 2022 10:07:02 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 6de1acd5; Fri, 9 Sep 2022 16:06:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=hqmkg/dq9DYRDVDsF9LcE nIVwb8acavk+CmghQQTfyQ=; b=LAybILcpbCUGXC0X2/0ZF6SGBPKyZDTtjm9P3 VuV0qTpgzJpWlTzcQSakZcC28Fq+Nfa9IEy2kfTXrQo+uzIbAmHFG1YHV1M22Enu QKbAqqWzLZd//D932vERw6KcA/e7lQ8Y6XuslJyEa7sT9FXikGV0BOdUFFJ69TAx ahB74qxqol2hLLoQ8ESvvgxEUFg6WL8S7IsQGQ7mZ1nx0JRLv21qBEQ5fuTwhMSP jX3fOC5RpeqP3sj6yqhclyiNj/aO0AnEayjTvDA1wJ4V8odielPcTs9kwp5b1eOH U0wWrPy7LwIv6eb+pm/frzyfZN/9EY7/2vcZOtuU9bBDxFTng== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id c1db27a9; Fri, 9 Sep 2022 16:06:51 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id d5c10cf3; Fri, 9 Sep 2022 16:06:51 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 86db10f9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Sep 2022 16:06:50 +0200 (CEST) From: jgart To: 57688@debbugs.gnu.org Subject: [PATCH v5] gnu: Add wiggle. Date: Fri, 9 Sep 2022 09:06:13 -0500 Message-Id: <20220909140612.1910-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patchutils.scm (wiggle): New variable. no probs, here's v5 --- gnu/packages/patchutils.scm | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..e87d0a2e86 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyr [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 57688 Cc: Maxime Devos , jgart 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: 0.3 (/) * gnu/packages/patchutils.scm (wiggle): New variable. no probs, here's v5 --- gnu/packages/patchutils.scm | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..e87d0a2e86 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages patchutils) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix licenses) @@ -40,6 +42,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) @@ -441,6 +444,48 @@ (define pythonpath (home-page "http://jk.ozlabs.org/projects/patchwork/") (license gpl2+))) +(define-public wiggle + (package + (name "wiggle") + (version "1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/neilbrown/wiggle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf")))) + (build-system gnu-build-system) + (native-inputs (list groff)) + (inputs + (list ncurses)) + (arguments + (list #:make-flags + #~(list "-I. -O3" + (string-append "CC=" #$(cc-for-target)) + "INSTALL=\"install\"" + "STRIP=-s" + (string-append "BINDIR=" #$output "/bin") + (string-append "MANDIR=" #$output "/share/man") + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key inputs ouputs tests? #:allow-other-keys) + (when tests? + (invoke "./dotest"))))))) + (home-page "http://neil.brown.name/wiggle/") + (synopsis "Tool for applying patches with conflicts") + (description +"@code{wiggle} attempts to apply patches to a target file even if the +patches do not match perfectly.") + (license gpl2+))) + (define-public pwclient (package (name "pwclient") -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 09 19:03:10 2022 Received: (at 57688) by debbugs.gnu.org; 9 Sep 2022 23:03:10 +0000 Received: from localhost ([127.0.0.1]:35903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWn1h-0007zE-R3 for submit@debbugs.gnu.org; Fri, 09 Sep 2022 19:03:10 -0400 Received: from knopi.disroot.org ([178.21.23.139]:55822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWn1f-0007z3-L6 for 57688@debbugs.gnu.org; Fri, 09 Sep 2022 19:03:09 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1B4044008E; Sat, 10 Sep 2022 01:03:05 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iWfr-3zJ394o; Sat, 10 Sep 2022 01:03:03 +0200 (CEST) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1662764583; bh=7K9GDeJohZWbAOmhIwkaaVnYRjpaZGvrz2tGqXuDpvs=; h=Date:To:Cc:Subject:From:References:In-Reply-To; b=DfEOOqJyIk09lhWeT+tDkfLWecxnw6l8VoZt6BQdO6zCHYoi7fd84/lzms8KbnveM XvGNQbJtdI9KFNHjDaeM9jbJfrnRPCWTr+B7en9wZO6JyNaPpuXlbsvrj1/y/QuC33 D376X7rhsfvyurUJQRq2Kwti5AO3vtPqak3f06hlx0+vG6GwKyOx8NTKh2Oyz/cRrP pNu1QX6+BppAi/vs6/cI2AdX012p9p/InRxXSVzqAmdpTG4ePHzofC25HEE8Udz/Xc Du1Tld45cxaj2mCBedsHapP2vnkitEn6YI2SmymJzntfJYwut9I9PM5nlonuD06VLJ qrFU714aN7EjQ== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 10 Sep 2022 00:03:02 +0100 Message-Id: To: "jgart" , <57688@debbugs.gnu.org> Subject: Re: [bug#57688] [PATCH v5] gnu: Add wiggle. From: "(" References: <20220908231459.20365-1-jgart@dismail.de> <20220909140612.1910-1-jgart@dismail.de> In-Reply-To: <20220909140612.1910-1-jgart@dismail.de> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 57688 Cc: Maxime Devos 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: -0.0 (/) Hello! :D On Fri Sep 9, 2022 at 3:06 PM BST, jgart via Guix-patches via wrote: > +(define-public wiggle > + (package ^^ Unnecessary indentation here. > + (name "wiggle") > + (version "1.3") > + (source > + (origin ^^^^^^^^ Change to `(source (origin'. > + (method git-fetch) > + (uri > + (git-reference ^^^^^^^^^^^^^^^ Change to `(uri (git-reference'. > + (inputs > + (list ncurses)) ^^^^^^^ Change to `(inputs (list ...))'. > + (arguments > + (list #:make-flags ^ This extra indentation isn't the norm. > + #~(list "-I. -O3" > + (string-append "CC=3D" #$(cc-for-target)) > + "INSTALL=3D\"install\"" > + "STRIP=3D-s" > + (string-append "BINDIR=3D" #$output "/bin") > + (string-append "MANDIR=3D" #$output "/share/man") > + (string-append "CC=3D" #$(cc-for-target)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Duplicate `CC' definition. > + (string-append "PREFIX=3D" #$output)) > + #:phases > + #~(modify-phases %standard-phases > + (delete 'configure) > + (replace 'check > + (lambda* (#:key inputs ouputs tests? #:allow-other-= keys) ^^^^^^^^^^^^^ These two are unnecessary, and the latter has a typo anyway. > + (home-page "http://neil.brown.name/wiggle/") > + (synopsis "Tool for applying patches with conflicts") > + (description > +"@code{wiggle} attempts to apply patches to a target file even if the ^^^^^^^^ Add indentation here. -- ( From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 09 21:16:02 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 01:16:02 +0000 Received: from localhost ([127.0.0.1]:35984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWp6I-0002mc-01 for submit@debbugs.gnu.org; Fri, 09 Sep 2022 21:16:02 -0400 Received: from mx1.dismail.de ([78.46.223.134]:29009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWp6F-0002m4-6Y for 57688@debbugs.gnu.org; Fri, 09 Sep 2022 21:16:00 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 0b9611fa; Sat, 10 Sep 2022 03:15:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=date :message-id:from:to:cc:subject:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s= 20190914; bh=2Bhm7Fyt+QeAwZEz3n0wW5SgA9tVWcSCFvR0BwXZmbU=; b=lUy UhU3/jYxQtuH501AMUeH1e1pkBJMUIPdJyQMWviMsPXRFfk0aymcnRfaTOuFNnpL 9LwYhrOwXkuPSjgKLbmAknRAyXqBb/0zbZ4tUv+6MZTbh9RJAbTOBDG4yzN2RhxR kW3mnbDbQZB8oQqQytkyFf9FqQU9D9TKjpTKcM2/Vq70yArILp+aUXEUvr7fIk6u NTfpMQKz+sst4tj9Ci4758co9GBOvxy+ZisKX32XPycI8Sp+AQmynF26kzfi/0Ys q+6SX45WzgPPTQ1ks6ATe6xda38pw2QUd9lROCJozIKhdxNegokMclhxXBrQ5Dho CU9jzhxVzH2rpm6rQbQ== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id a0b985bd; Sat, 10 Sep 2022 03:15:50 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 9e912e79; Sat, 10 Sep 2022 03:15:50 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id fac7c74b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Sep 2022 03:15:49 +0200 (CEST) Date: Fri, 9 Sep 2022 20:15:50 -0500 Message-ID: <20220909201550.GB16381@dismail.de> From: jgart To: "(" Subject: Re: [bug#57688] [PATCH v5] gnu: Add wiggle. In-Reply-To: References: <20220908231459.20365-1-jgart@dismail.de> <20220909140612.1910-1-jgart@dismail.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57688 Cc: 57688@debbugs.gnu.org, Maxime Devos 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 (-) On Sat, 10 Sep 2022 00:03:02 +0100 "(" wrote: > Hello! :D hiya paren ;#~ ;#$ ;() > Duplicate `CC' definition. > These two are unnecessary, and the latter has a typo anyway. I edited these by hand and let `guix style` take care of the rest thanks for the review! look out for v6, jgart From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 09 21:17:47 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 01:17:47 +0000 Received: from localhost ([127.0.0.1]:35991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWp7z-0002pN-EH for submit@debbugs.gnu.org; Fri, 09 Sep 2022 21:17:47 -0400 Received: from mx1.dismail.de ([78.46.223.134]:35899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWp7w-0002p9-Tc for 57688@debbugs.gnu.org; Fri, 09 Sep 2022 21:17:45 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 77abc6cf for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 03:17:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=9Am6R1SQOMFbmaPszfiNF OBb9W24je473etgISrfnoc=; b=C4QSUBfzYdTTfFvJ1I9Bq15d3CmDjaxZxk+pP Ix4BfSwAbtSAmSSkqgoaEnu3f9vidX8p0VUL4TT1X5qo9TOM3tXK2PtaYxXMWMMK U42d6BHjqzQRfJNjuo7Prscni3NzioU/lERNZTldPXXKvEN47PaWpQiXWj71Ro0G FW8LcjSrTKK7pdeqa5x/RPnYSxxeDldssfELuDs0CapqtqM93HZN/IjVIg7cFcKV +Uodym5Pu6FUp9hWP+Ofjulmkuuw/fftJsXUROjrunOgs+7db0I6m9Ay5//s74sN KUfjV/7mv6q5fEdK/96VWCoE/x80j9Ct7newPkhanAB7R7CzA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 2f31541b for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 03:17:39 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 997cd334 for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 03:17:38 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 0e1e2644 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Sep 2022 03:17:33 +0200 (CEST) From: jgart To: 57688@debbugs.gnu.org Subject: [PATCH v6] gnu: Add wiggle. Date: Fri, 9 Sep 2022 20:17:29 -0500 Message-Id: <20220910011729.17233-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patchutils.scm (wiggle): New variable. --- gnu/packages/patchutils.scm | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..83fe6ac762 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyr [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 57688 Cc: jgart 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: 0.3 (/) * gnu/packages/patchutils.scm (wiggle): New variable. --- gnu/packages/patchutils.scm | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..83fe6ac762 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages patchutils) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix licenses) @@ -40,6 +42,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) @@ -441,6 +444,47 @@ (define pythonpath (home-page "http://jk.ozlabs.org/projects/patchwork/") (license gpl2+))) +(define-public wiggle + (package + (name "wiggle") + (version "1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/neilbrown/wiggle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf")))) + (build-system gnu-build-system) + (native-inputs (list groff)) + (inputs (list ncurses)) + (arguments + (list #:make-flags #~(list "-I. -O3" + (string-append "CC=" + #$(cc-for-target)) + "INSTALL=\"install\"" + "STRIP=-s" + (string-append "BINDIR=" + #$output "/bin") + (string-append "MANDIR=" + #$output "/share/man") + (string-append "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./dotest"))))))) + (home-page "http://neil.brown.name/wiggle/") + (synopsis "Tool for applying patches with conflicts") + (description + "@code{wiggle} attempts to apply patches to a target file even if the +patches do not match perfectly.") + (license gpl2+))) + (define-public pwclient (package (name "pwclient") -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 03:39:16 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 07:39:16 +0000 Received: from localhost ([127.0.0.1]:36493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWv59-0002lR-Ob for submit@debbugs.gnu.org; Sat, 10 Sep 2022 03:39:15 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWv54-0002lE-Ki for 57688@debbugs.gnu.org; Sat, 10 Sep 2022 03:39:14 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 300154A017; Sat, 10 Sep 2022 09:39:09 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HwEYurJHvkHY; Sat, 10 Sep 2022 09:39:08 +0200 (CEST) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1662795548; bh=pRSASEFwzc1fBnFLH0DWkQMaj+74yUyshf3T3l3H+Ig=; h=Date:Subject:From:To:References:In-Reply-To; b=cOHPfYMn76fkpQPtqWd8LtJZU8G1wdVDcWi4/OEHp3Ma09IqUkLPduHhYi7FLg3kc d1FFFVRmlX6n3wxrz6wfZk1DgE2l8uOWvDto+yW+U5c6nMLFa7zH+ajttR+1v8iMaM O9I9pBAMuSngudOpFG6HL2N7HnqKAEQJARf7Q2cJNati+svMzKTLIGsQp6u7kG4UsW fsn/i+9djQ78chr5WSx6IotwAPZCxDiagvven4ZrOSMNL0p296MZO1dnd01OPP6iOH RiZs35vA/0ol0190VmXJc90DvXOz5uPBJN4cVxBVmAhLLGWgzOFzj1OGyPsfhVNgdn XzImkBRhEDw8g== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 10 Sep 2022 08:39:07 +0100 Message-Id: Subject: Re: [bug#57688] [PATCH v6] gnu: Add wiggle. From: "(" To: "jgart" , <57688@debbugs.gnu.org> References: <20220908231459.20365-1-jgart@dismail.de> <20220910011729.17233-1-jgart@dismail.de> In-Reply-To: <20220910011729.17233-1-jgart@dismail.de> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 57688 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: -0.0 (/) Hello again! `guix style's choices can be a wee bit dubious at times, as seen below: On Sat Sep 10, 2022 at 2:17 AM BST, jgart via Guix-patches via wrote: > + (list #:make-flags #~(list "-I. -O3" ^^^^^^^^^^^^^^^ Put the value on the next line. > + (string-append "CC=3D" > + #$(cc-for-target)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Put this expression all on one line. > + "INSTALL=3D\"install\"" > + "STRIP=3D-s" > + (string-append "BINDIR=3D" > + #$output "/bin") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Same here. > + (string-append "MANDIR=3D" > + #$output "/share/man") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Same here. > + (string-append "PREFIX=3D" > + #$output)) ^^^^^^^^^^^^^^^^^^^^^^^^ Same here. > + #:phases #~(modify-phases %standard-phases ^^^^^^^^^^^ Put the value on the next line here, too. -- ( From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 10:40:57 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 14:40:57 +0000 Received: from localhost ([127.0.0.1]:40131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX1fF-0001iK-16 for submit@debbugs.gnu.org; Sat, 10 Sep 2022 10:40:57 -0400 Received: from mx1.dismail.de ([78.46.223.134]:5435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX1fC-0001i1-Jm for 57688@debbugs.gnu.org; Sat, 10 Sep 2022 10:40:55 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 785ea787; Sat, 10 Sep 2022 16:40:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=date :message-id:from:to:cc:subject:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s= 20190914; bh=6HC099w4ATac48vy4Y0nqNrIsET/3Ljb3j6dH8zKJOI=; b=Txx faJYWtx2BfroDHUGvSxYwc8QAdpsEE1lR7TkRrF+VGSZdNEdDFSD1dHZZN8UZEfB uYGpEC1UlcNOK3uH4jPoV0mydvFw3E8y/Z8WvHr41623A1/5iF9JZcKANSkfOuQy kMkYqFcX54ep09ZPw+Ek80wnQ6fBwxJCf1F0t7z8Jf+k/2g3TuWo/YajjqKl/0vC cJt2YeMdJKrp17XlzqFvINaK/zoW+PPdmlxKbwYKn7m8+GyLgGzc2Z2V3+S+bZko klGQSOyGx32NcqMGPV84yO9JNlizufKvLHUZ6s0IGhH/RYGx77xrF+7P25yWWYfP XUeRxCLYMlzSh/i1TPA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 506b5559; Sat, 10 Sep 2022 16:40:47 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 9ac33ec5; Sat, 10 Sep 2022 16:40:47 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 43ebf7a9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Sep 2022 16:40:46 +0200 (CEST) Date: Sat, 10 Sep 2022 09:40:49 -0500 Message-ID: <20220910094049.GE30614@dismail.de> From: jgart To: "(" Subject: Re: [bug#57688] [PATCH v6] gnu: Add wiggle. In-Reply-To: References: <20220908231459.20365-1-jgart@dismail.de> <20220910011729.17233-1-jgart@dismail.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57688 Cc: 57688@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 (-) On Sat, 10 Sep 2022 08:39:07 +0100 "(" wrote: This package really turned out to need a lot of wiggling. Thanks for the review. v7 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 11:43:56 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 15:43:56 +0000 Received: from localhost ([127.0.0.1]:40233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX2eC-0003Ic-Fs for submit@debbugs.gnu.org; Sat, 10 Sep 2022 11:43:56 -0400 Received: from mx1.dismail.de ([78.46.223.134]:46879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX2e7-0003IJ-Ph for 57688@debbugs.gnu.org; Sat, 10 Sep 2022 11:43:55 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 6936e48a for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 17:43:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=DCwDjXuOGZxi2ZBVxcCBf bt1+KMLZwb5vNQ7CrOtDrw=; b=tPwIoMkUIQ0hKLpHqLyHplDb2uzo0MdHdS33X RrOfNXPfGBkaEQlEHY2dlL5VSGqj6IRlVouKANdbgLiDYPJECI5nSwmSvrrm4Bkm zmGITXKG2Nb3m1hV8mN/J7tG3fb2nIg38Ed7VVAPV2fLX7DbpkG8ZZACBBephDRI vG7XzcE0l1cxJCpssEpobzYmzewGKzE+381Oe5VdA/Q3n2m+bBcjkPEzedBknz/G 5DgqTZrOZHcm5vmGSinjfHNc1bZfx6FCtrHs7CIhUPtk026JvWf8AZ7L4aZ14ZXc lV0sGNvEdCznPQXldEJkBpBVTWj16gjnpPM2U5NPn4XSFw8+w== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id e04c7980 for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 17:43:42 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 8f3c04bd for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 17:43:42 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 2871aeb1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Sep 2022 17:43:41 +0200 (CEST) From: jgart To: 57688@debbugs.gnu.org Subject: [PATCH v7] gnu: Add wiggle. Date: Sat, 10 Sep 2022 10:43:41 -0500 Message-Id: <20220910154341.8830-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patchutils.scm (wiggle): New variable. --- gnu/packages/patchutils.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..dac3ff3957 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyr [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [78.46.223.134 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 57688 Cc: jgart 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: 0.3 (/) * gnu/packages/patchutils.scm (wiggle): New variable. --- gnu/packages/patchutils.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..dac3ff3957 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages patchutils) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix licenses) @@ -40,6 +42,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) @@ -441,6 +444,44 @@ (define pythonpath (home-page "http://jk.ozlabs.org/projects/patchwork/") (license gpl2+))) +(define-public wiggle + (package + (name "wiggle") + (version "1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/neilbrown/wiggle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf")))) + (build-system gnu-build-system) + (native-inputs (list groff)) + (inputs (list ncurses)) + (arguments + (list + #:make-flags #~(list "-I. -O3" + (string-append "CC=" #$(cc-for-target)) + "INSTALL=\"install\"" + "STRIP=-s" + (string-append "BINDIR=" #$output "/bin") + (string-append "MANDIR=" #$output "/share/man") + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./dotest"))))))) + (home-page "http://neil.brown.name/wiggle/") + (synopsis "Tool for applying patches with conflicts") + (description + "@code{wiggle} attempts to apply patches to a target file even if the +patches do not match perfectly.") + (license gpl2+))) + (define-public pwclient (package (name "pwclient") -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 12:49:41 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 16:49:41 +0000 Received: from localhost ([127.0.0.1]:40281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX3fn-0004xH-Rb for submit@debbugs.gnu.org; Sat, 10 Sep 2022 12:49:41 -0400 Received: from knopi.disroot.org ([178.21.23.139]:55798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX3fh-0004x4-UV for 57688@debbugs.gnu.org; Sat, 10 Sep 2022 12:49:38 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3771249FB4; Sat, 10 Sep 2022 18:49:32 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f4quZzaxyF1n; Sat, 10 Sep 2022 18:49:31 +0200 (CEST) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1662828571; bh=JEikYoOS8vwoPhWr7K+iq36jgzxETDfl62uiW+Qm9eI=; h=Date:Subject:From:To:References:In-Reply-To; b=a0Kc+U8kqgTK/fVi40K24rIR/aWzcbaI2lzjrHSJ9fJwnlQA7pB5XAIbS5vGOrGe9 byEE4t16lwm6Y+Rhrrxy3xkokRwCGCATCoF4g3cy1lYPg2nurUbvSWFH4FC9/ydhKv rOh5n1RM9oWtUaAmfohD2Vvth6BwCgoksLJte7pyu9SJHB//htnqwx3ww9IlYdbtlS zx8DEUR4YK+MYA4WZ8UcYJ+0Il1dKJGfgs1uGtDBO8FDbH9G50HfeRvARnRgUyO0/n q/CEreneZQN/coRQ8se8bLugWnM5qYDa7sAx0t21OroHR8sFxScIOFfRFzTDeINWG6 1c9eDhqiSpz8g== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 10 Sep 2022 17:49:30 +0100 Message-Id: Subject: Re: [bug#57688] [PATCH v7] gnu: Add wiggle. From: "(" To: "jgart" , <57688@debbugs.gnu.org> References: <20220908231459.20365-1-jgart@dismail.de> <20220910154341.8830-1-jgart@dismail.de> In-Reply-To: <20220910154341.8830-1-jgart@dismail.de> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 57688 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: -0.0 (/) On Sat Sep 10, 2022 at 4:43 PM BST, jgart via Guix-patches via wrote: > + (arguments > + (list > + #:make-flags #~(list "-I. -O3" > + (string-append "CC=3D" #$(cc-for-target)) > + "INSTALL=3D\"install\"" > + "STRIP=3D-s" > + (string-append "BINDIR=3D" #$output "/bin") > + (string-append "MANDIR=3D" #$output "/share/= man") > + (string-append "PREFIX=3D" #$output)) > + #:phases #~(modify-phases %standard-phases > + (delete 'configure) > + (replace 'check > + (lambda* (#:key tests? #:allow-other-keys) > + (when tests? > + (invoke "./dotest"))))))) Ah, no, sorry, that was ambiguous. What I meant was: > + (arguments > + (list #:make-flags > + #~(list "-I. -O3" > + (string-append "CC=3D" #$(cc-for-target)) > + "INSTALL=3D\"install\"" > + "STRIP=3D-s" > + (string-append "BINDIR=3D" #$output "/bin") > + (string-append "MANDIR=3D" #$output "/share/man") > + (string-append "PREFIX=3D" #$output)) > + #:phases > + #~(modify-phases %standard-phases > + (delete 'configure) > + (replace 'check > + (lambda* (#:key tests? #:allow-other-keys) > + (when tests? > + (invoke "./dotest"))))))) -- ( From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 13:33:33 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 17:33:34 +0000 Received: from localhost ([127.0.0.1]:40334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX4MH-0008HW-MA for submit@debbugs.gnu.org; Sat, 10 Sep 2022 13:33:33 -0400 Received: from mx1.dismail.de ([78.46.223.134]:19317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX4MC-0008HD-3U for 57688@debbugs.gnu.org; Sat, 10 Sep 2022 13:33:32 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 0a9bd853; Sat, 10 Sep 2022 19:33:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=date :message-id:from:to:cc:subject:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s= 20190914; bh=Rkx2gLFUkIV62V9YFerSEb9MBYhxRZefo+30sZT5IwM=; b=a2u c5tJfLaTjApIREk312EEayMEao57sjyyvIk7FwYle83niNQJDLg77BzDZXmDbmdC 1P+wxOQ+lTnWvVJPa4f6IHeuqQUgl/58GMDaIBAZiqenzPsbg+KQ84BZif0IFDyh WYrcyoE1s1nfEO0OjP7XnT2GNvI6TUsmJz0DOm911+R53btBNYcbxn5M+S1yegHW 5qWaS4lfFh1dhAAbvKrffVb97M7QuPtmv5hZaoI0/gLeP9Fpa3vaROCjq2gPVagY a92kM8rvUBGc5kc3blEZjKdECEjkHPIOeG815UKeuuK64kcwCo0YD6xV9OIh/jJl sM7OftZul6T8thWu3wQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id cdc5d99b; Sat, 10 Sep 2022 19:33:19 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 34807680; Sat, 10 Sep 2022 19:33:19 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id dcba1683 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Sep 2022 19:33:18 +0200 (CEST) Date: Sat, 10 Sep 2022 12:33:20 -0500 Message-ID: <20220910123320.GB22293@dismail.de> From: jgart To: "(" Subject: Re: [bug#57688] [PATCH v7] gnu: Add wiggle. In-Reply-To: References: <20220908231459.20365-1-jgart@dismail.de> <20220910154341.8830-1-jgart@dismail.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57688 Cc: 57688@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 (-) On Sat, 10 Sep 2022 17:49:30 +0100 "(" wrote: > On Sat Sep 10, 2022 at 4:43 PM BST, jgart via Guix-patches via wrote: > Ah, no, sorry, that was ambiguous. What I meant was: > > > + (arguments > > + (list #:make-flags > > + #~(list "-I. -O3" > > + (string-append "CC=" #$(cc-for-target)) > > + "INSTALL=\"install\"" > > + "STRIP=-s" > > + (string-append "BINDIR=" #$output "/bin") > > + (string-append "MANDIR=" #$output "/share/man") > > + (string-append "PREFIX=" #$output)) > > + #:phases > > + #~(modify-phases %standard-phases > > + (delete 'configure) > > + (replace 'check > > + (lambda* (#:key tests? #:allow-other-keys) > > + (when tests? > > + (invoke "./dotest"))))))) > > -- ( Not sure what you mean here. If I move it back it will not be aligned with the above. Could you explain in the context of the whole v7 patch? From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 13:40:01 2022 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 17:40:01 +0000 Received: from localhost ([127.0.0.1]:40342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX4SX-0008QZ-6I for submit@debbugs.gnu.org; Sat, 10 Sep 2022 13:40:01 -0400 Received: from knopi.disroot.org ([178.21.23.139]:48540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX4SV-0008QQ-Ab for 57688@debbugs.gnu.org; Sat, 10 Sep 2022 13:40:00 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0DB0B4A056; Sat, 10 Sep 2022 19:39:58 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O9Wawzbxw1Oh; Sat, 10 Sep 2022 19:39:57 +0200 (CEST) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1662831595; bh=OGj3/x6iTCblMh3kf9tXPeHXR2ouFWw3hxD6LDGcDMM=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=EF61f8GGmtDYkUA39DYFkr2UoJRsRHAKParROLQfku9OZSkz0Fsp1b0YT8DHbeiw4 iHFiYixMZBh7u/o4+HXnU79wJg94nAPR4G7AGHxI+eLhgQckCxQlB9kM+Kky9nLXOg 7i9dEd3b6jkxm2TYEc6VZzJTCX9G4xuvOUscR1Mkmnc52PDR2pbbQwt98RsMgGtCWY 5GKqe/QzUhMua1nskmFZhdpRrC3ZJaG5lwcc7bW1XP3peNxkMepTQ4VxwpE7eRp0nE oTcHHfrIw8wihxecBAW2Hj/Or8cqFx+BKTLi2MUyTuuVbDZ/6jCvY3gZTYGWKGADD+ ojLgR4j9Rk0hg== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 10 Sep 2022 18:39:55 +0100 Message-Id: From: "(" To: "jgart" Subject: Re: [bug#57688] [PATCH v7] gnu: Add wiggle. References: <20220908231459.20365-1-jgart@dismail.de> <20220910154341.8830-1-jgart@dismail.de> <20220910123320.GB22293@dismail.de> In-Reply-To: <20220910123320.GB22293@dismail.de> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 57688 Cc: 57688@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: -0.0 (/) I basically meant that arguments should be written like #:foo bar if `bar' takes up only one line, and #:foo bar if `bar' takes up multiple lines, since #:phases #~(modify-phases %standard-phases ...) wastes a LOT of horizontal space. -- ( From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 11 06:46:41 2022 Received: (at 57688-done) by debbugs.gnu.org; 11 Sep 2022 10:46:41 +0000 Received: from localhost ([127.0.0.1]:40832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXKU5-0002Bo-EZ for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:46:41 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:45794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXKU1-0002BZ-5Y for 57688-done@debbugs.gnu.org; Sun, 11 Sep 2022 06:46:40 -0400 Received: by mail-ej1-f65.google.com with SMTP id dv25so13928980ejb.12 for <57688-done@debbugs.gnu.org>; Sun, 11 Sep 2022 03:46:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date; bh=yaSM0BI73amg90cqFw7ZgCBHloY4lkXcVG95Wu6FqYI=; b=H34VAeRhNyA+PIdm0c7iKd8reEWNSyhX3wZOoGOxLTE4zxGUEkuSGzaNCrflrpS0wZ rhxIbfqhajDwKkQ4WXpBQpPjucbV5sYIDfM0GvgBD559yuh/VFsrPMxqMuE5GVpPjqnV 2VJQGh7iAze3QlglWFB2DqM5FrR+ObCEkrN2ybybRy8h92OwGOC+nvBTX6lsNw7T9JLU mh4Ec3ordSjtfttkQPhslcYldiQWBmSQrtTxqntzGMr+ScYZ3F3NdDcyE8WAf81tHvQW H7TGYTAKpyPJeRIkkVtQY9HRtmfnJ75E6Igwl48VRr5SZrr8jKr9s5X/m7JqQWtrYC8/ JyZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date; bh=yaSM0BI73amg90cqFw7ZgCBHloY4lkXcVG95Wu6FqYI=; b=5Dd5nmWhGAy0KaVl7W53HW2QNHpUUTmvzhCHS2oP7XC+vlSJIIStXxCD9ZWszD0DVP QoGxfBdyWbstHwp83aYNne9px5XlUsAdClC1NX6zMYRZxvaKNVNOJf3mD8iQJj31IReP qWhCbQFe+a8hR5EOIIAyu82KXAGfrQxOMPdPln7P5X02FHJi3tYK7T2KQeiGKeT3pCnv ryv1jDRxKW7eLJsySdsbFB5vf9laJvG1x1xNMPD0U1SaefwXfQMngFb8NCvRP718VYO9 pZj/tkXIb+COwdQeac42hX1PonAM/mvEIFwin/om3yhXCJqgu9tNtxk8ZiwsibWcfW1O K7FA== X-Gm-Message-State: ACgBeo33pwvw2DSGDxqxiOc3okbBQVkkND5qn8NbadmHPNiKAPE8iWp0 3MQTllNxCy6J3rwJZL2vVbo= X-Google-Smtp-Source: AA6agR5sjP/DxcQGJH79MY4QyGbsjj+sBueq8zXjcZT0VIPnx9e/KwmccWvMwRMc+Ldhsj48X3HJcA== X-Received: by 2002:a17:907:2cd8:b0:776:64a8:1adf with SMTP id hg24-20020a1709072cd800b0077664a81adfmr10976596ejc.151.1662893191223; Sun, 11 Sep 2022 03:46:31 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q10-20020a1709063d4a00b0073c74bee6eesm2768975ejf.201.2022.09.11.03.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:46:30 -0700 (PDT) Message-ID: <521cb98fada10c76d12ee8a44ecda178121298f0.camel@gmail.com> Subject: Re: [PATCH v7] gnu: Add wiggle. From: Liliana Marie Prikler To: jgart , 57688-done@debbugs.gnu.org Date: Sun, 11 Sep 2022 12:46:29 +0200 In-Reply-To: <20220910154341.8830-1-jgart@dismail.de> References: <20220910154341.8830-1-jgart@dismail.de> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57688-done 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.0 (-) Am Samstag, dem 10.09.2022 um 10:43 -0500 schrieb jgart: > * gnu/packages/patchutils.scm (wiggle): New variable. Applied with some wiggling. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 11 07:24:04 2022 Received: (at 57688-done) by debbugs.gnu.org; 11 Sep 2022 11:24:05 +0000 Received: from localhost ([127.0.0.1]:40929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXL4G-0003J6-MR for submit@debbugs.gnu.org; Sun, 11 Sep 2022 07:24:04 -0400 Received: from mx1.dismail.de ([78.46.223.134]:2472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXL4D-0003IS-4Q for 57688-done@debbugs.gnu.org; Sun, 11 Sep 2022 07:24:02 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 4693ac46; Sun, 11 Sep 2022 13:23:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=date :message-id:from:to:cc:subject:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s= 20190914; bh=vJY7DM2WBFmmnPH252p7EvlU8R+wGTOXiCfS3UVSPOQ=; b=BT9 lfnxyBrJUZPjAi5Cjk89ML7DNInNz7OHbFM7T8X4OpcIR60SrcG75tylcam8zDix wsIdsML/8yaCxjsNB2sgY0UULPVVF4WCe8jMImvuLZsEuasdo9aCD9nxAsLWIBJZ E/8rBwdQGXZPr8LGQZfpZ+4a2XElYCyU4it6G7yycBM8DXIQ6vwwClsl3HpyrVPV X3P7d8xv5DFlWqNobTSd/ms7gEk1u6mKf/hTLIKAb4KbO/A2CnjeTAUTvdGfPaJl +/aBqZTHYMbIITetFXXmjnKFv8NoWdpbqY8q+qIo5pgciutEsICYccouc+c876VC tmldR6iWDCGnNmtDI+g== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id c6eff1c0; Sun, 11 Sep 2022 13:23:53 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 0e7f2453; Sun, 11 Sep 2022 13:23:53 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 9535ea9d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 11 Sep 2022 13:23:52 +0200 (CEST) Date: Sun, 11 Sep 2022 06:23:53 -0500 Message-ID: <20220911062353.GB19667@dismail.de> From: jgart To: Liliana Marie Prikler Subject: Re: [PATCH v7] gnu: Add wiggle. In-Reply-To: <521cb98fada10c76d12ee8a44ecda178121298f0.camel@gmail.com> References: <20220910154341.8830-1-jgart@dismail.de> <521cb98fada10c76d12ee8a44ecda178121298f0.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57688-done Cc: 57688-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 (-) On Sun, 11 Sep 2022 12:46:29 +0200 Liliana Marie Prikler wrote: > Am Samstag, dem 10.09.2022 um 10:43 -0500 schrieb jgart: > > * gnu/packages/patchutils.scm (wiggle): New variable. > Applied with some wiggling. > > Cheers Thanks Liliana! ~~ jgart From unknown Thu Aug 14 22:14:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 10 Oct 2022 11:24:12 +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