From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 UADPFxZ6GmOwrAAAbAwnHQ (envelope-from ) for ; Fri, 09 Sep 2022 01:26:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iE/jFxZ6GmMIHwAA9RJhRA (envelope-from ) for ; Fri, 09 Sep 2022 01:26:14 +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 207F12E793 for ; Fri, 9 Sep 2022 01:26:14 +0200 (CEST) Received: from localhost ([::1]:36912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWQuS-0007cW-UA for larch@yhetil.org; Thu, 08 Sep 2022 19:26:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWQuI-0007c1-E2 for guix-patches@gnu.org; Thu, 08 Sep 2022 19:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWQuI-0003QJ-5x for guix-patches@gnu.org; Thu, 08 Sep 2022 19:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWQuH-0001bp-Sb for guix-patches@gnu.org; Thu, 08 Sep 2022 19:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57688] [PATCH v2] 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: Thu, 08 Sep 2022 23:26: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: jgart Received: via spool by 57688-submit@debbugs.gnu.org id=B57688.16626795116119 (code B ref 57688); Thu, 08 Sep 2022 23:26:01 +0000 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) 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-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=1662679574; 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=IE8eIbHHSJy1QKpE/HmGYfNBQ+gqzsupczUu2aOUC9A=; b=MBS3nCRBb80BgF3u/GluM4bk18ss9tyVXfCsOueE7UcevYvFplYqj7QPHKmZ9F0He/5M+W /YkmqFAbdfMaHjmzgG21nhyr9kRmBJcTgqHu6LpbcX7Bs4nDio8P9rzHe1GU7CW5Ug3wJ6 wz0qcarcp+NDULvJlKvg2KaPdoQgAxrYn+ywJ6aWu31A7eMfrQXsK45l/++YokpxVjWclN 1E3Q1PDnnzFw9AmMqiJFygfHfgV4jcntq+etbFA86igch12uMsShdF684saHybLwCzS+Cg L2YvfHZAAycUObLby823+WLSxAKxjuMiEtpsbk37/bLHlVh7b+esxLYcNg9wbg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662679574; a=rsa-sha256; cv=none; b=GY9HoOgNOFoeU8EjX3YaF05SARVEYHtiiwF7kksj0NNdcCDdsjc/8coEyWuQDDtNI+za1w CiMXHulC4GBpE/Qwtl/nbt6VqaicL6JqHPvzWC1xRuL/bNOeljsy8rCvjHXUZ7uW9x586D 1dPKpU+vdrLZUvd+KEW0K5CmCEk8p8gqBKt3TBff3Vo4ByuUnIVEy0U/yJZZoBr3bj2sQV NEFuLg/BePXOwYNw4Qnf7nAj5YRyuWustYCwiVNtuNbpMUuTbEEMQRQKcQfY6UulvfafA3 CaULRIUYEJ6jYce7GuKXMuDSdX4U/00DBdugPaYV0JA1OT+Noq8+IH63bvCUyQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b="OO9l6Lp/"; 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.39 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b="OO9l6Lp/"; 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: 207F12E793 X-Spam-Score: -3.39 X-Migadu-Scanner: scn1.migadu.com X-TUID: uzrVkWmOQuDx * 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