From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +KXJJNR3GmMjCAAAbAwnHQ (envelope-from ) for ; Fri, 09 Sep 2022 01:16:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id kOXjI9R3GmPEDAAAG6o9tA (envelope-from ) for ; Fri, 09 Sep 2022 01:16:36 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 57E402E2FF for ; Fri, 9 Sep 2022 01:16:33 +0200 (CEST) Received: from localhost ([::1]:47148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWQl5-0006eA-Rm for larch@yhetil.org; Thu, 08 Sep 2022 19:16:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWQkd-0006e0-3N for guix-patches@gnu.org; Thu, 08 Sep 2022 19:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWQkc-0002C4-Rk for guix-patches@gnu.org; Thu, 08 Sep 2022 19:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWQkc-0001Mj-FC for guix-patches@gnu.org; Thu, 08 Sep 2022 19:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57688] [PATCH] gnu: Add wiggle. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Sep 2022 23:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57688 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57688@debbugs.gnu.org Cc: jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16626789565229 (code B ref -1); Thu, 08 Sep 2022 23:16:02 +0000 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) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches From: jgart via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662678994; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=NGJm3qnDft49sfFGbZV7dzDxOW7wVmwuIiurC9gF+fQ=; b=iqUrkVv9wALelN8ZpCQiUPtw6qfswk4QVVy7PpaZe1zUbKgnIXkmBZV7NabDzbNnrBDHmn 30V8WCDz90Rg4Dy7OvhrK1rlBhiSsxobSJtNnimIwneJkhKQave9TFFGm5Xaa7LduIXGwM bwF1M+11bJAF08q3432sSQm0Ct8BDHVa2XDnWP2bYFX7wIe9qEjr2wGdezEqXuTiSQNe0S 42N9KjOcs5SJLZVBNy8B4ZmwSXZgvjUNEIREEFTdzJaf/X26Y/UZhOwKLHEqqTA9iuIEaw 3x9989uaOw0+WN7jCvvh3opdZ0koJTZKESORWIxg2Y1CFjfgC9XpvBN50jCt0Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662678994; a=rsa-sha256; cv=none; b=R9jURgVzF7nqyAF5BYdXJPsRmaxG1MpZlK4fIFiDuvU9tWAgglBq8ueWIA1OMFCgB9gdkQ ZO/uyGgOgQDVEoq6OvWolG/Xww+1ziTVXBcfLVzKzN+aTOa1Yy8UByKcw9yHIPOpZwRPhp JxQOBR7aazglwYa7p6bfFQNYla95GUO1pxkDMFS9+0+pa4PEouu86+rikJt52CiCqbK40g VxMmBTBpnmWhn0vnXDNCmvBaGXWpAvMANP2DSAJDxtLOjh4HQaLB2Ahrk4dX9nqvSuhpbB /gd+DKXxejIXoOMWHGFrJAtQHa6o2KmPMI2FLZzdPdow/jZPJdLgEIFXnJqVlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=nde298fL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.59 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=nde298fL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 57E402E2FF X-Spam-Score: -3.59 X-Migadu-Scanner: scn1.migadu.com X-TUID: 4JpZHuyjPIi1 * 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