From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2GQ8DspIG2MmGQAAbAwnHQ (envelope-from ) for ; Fri, 09 Sep 2022 16:08:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yI9eDcpIG2NiMQEAG6o9tA (envelope-from ) for ; Fri, 09 Sep 2022 16:08:10 +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 038D52A63E for ; Fri, 9 Sep 2022 16:08:10 +0200 (CEST) Received: from localhost ([::1]:53308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWefv-00049w-Pl for larch@yhetil.org; Fri, 09 Sep 2022 10:08:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWefr-00049b-0M for guix-patches@gnu.org; Fri, 09 Sep 2022 10:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWefp-0000Qf-OI for guix-patches@gnu.org; Fri, 09 Sep 2022 10:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWefp-0001VZ-JA for guix-patches@gnu.org; Fri, 09 Sep 2022 10:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57688] [PATCH v5] gnu: Add wiggle. References: <20220908231459.20365-1-jgart@dismail.de> In-Reply-To: <20220908231459.20365-1-jgart@dismail.de> Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Sep 2022 14:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57688 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57688@debbugs.gnu.org Cc: Maxime Devos , jgart Received: via spool by 57688-submit@debbugs.gnu.org id=B57688.16627324235715 (code B ref 57688); Fri, 09 Sep 2022 14:08:01 +0000 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) 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-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=1662732490; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=PL1V+u9KXYHH/1eGJEZecp82iUpW34dWFBIrf3Ah8Qg=; b=bfJyoNksW9qPRS2lhHvedfbxmylB+A9eq6bDdNGbkGRByRSLFKPjbGAGNNVCmAxOLsSm2p YN0GhuT6g682NTxSt+TKLl/GBmPf8c2cnWdeEQrxTB61zVsf9GSSaVlsR/17qgsv8F1h54 g3F/RM97W8HofKL7iwNLsy8RzNgjm+CLtI3Cd5mON4ANKWsx1oQFuL3WURbMsOwo2CTfHR bnwJaz6pZ9O6t+lQ086VkHAwN+89RKqRmBlQBl1NTE3NgLWcSS8XXPZd82YpcC99mLBqug LgPWBQqNod3R8EtnkqaWwcSN0eP5zMPAors88u5xlDhfn0Gp0tQCdy+dhehh2g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662732490; a=rsa-sha256; cv=none; b=Mhe4zK7QWhFFPKlPlczQtep6cadtlp0eSyUbRJX5WkyNt5LIw4w19IwAcHesaewMw1ffEX 42ovmbd+oGkwIwc3kE5MrY+4XaU3aWO1vJQuA2RUX88OfF992PXBclrM06UiyyQcwTuXrm UQMlogDt1AXLmOcWGEtFZh8Yr3mfMGFRqX/RXzWHQUoZ+QzsmzJRQCRtYWRwl8JbmqB8sz fzRBRzstPYPsbTNcSi87QhUhHrtrPKYJDq+dJsr+OVbMKcyeagyOn6RZtxzT96I2GI9NmO L6v5yHnwvQ5eY01oV66B7xh/2wGrZ91DDapkC2QiZPsjvp4Qhg4GJe6DlTL/4g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=LAybILcp; 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: -1.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=LAybILcp; 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: 038D52A63E X-Spam-Score: -1.90 X-Migadu-Scanner: scn1.migadu.com X-TUID: Mez+ihLZxY26 * 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