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 sLS5MVy+GmNJkwAAbAwnHQ (envelope-from ) for ; Fri, 09 Sep 2022 06:17:32 +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 +NzaMVy+GmM2hAAA9RJhRA (envelope-from ) for ; Fri, 09 Sep 2022 06:17:32 +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 81610E27B for ; Fri, 9 Sep 2022 06:17:31 +0200 (CEST) Received: from localhost ([::1]:46520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWVSM-0004VH-8r for larch@yhetil.org; Fri, 09 Sep 2022 00:17:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWVRu-0004V2-Ko for guix-patches@gnu.org; Fri, 09 Sep 2022 00:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWVRt-00035V-RJ for guix-patches@gnu.org; Fri, 09 Sep 2022 00:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWVRt-0000PR-MX for guix-patches@gnu.org; Fri, 09 Sep 2022 00:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57688] [PATCH v4] 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 04:17: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.16626970001541 (code B ref 57688); Fri, 09 Sep 2022 04:17:01 +0000 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) 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-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=1662697052; 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=x1LfPUHR/fzwD8LstGH8UsY0ZRAAKTt/V2kJ/KGZup8=; b=d5Utu2bcAOPJEpsceTa5n4VDlgzgJmGWGeP78+qa+wDZL84p8i7I1qJXyo8Hs4bP4PK5t/ A9RcEHqSdkUqQeQeY3SFG9oRYeAqjt79M2QFvgguySX1+lLZRtiG9knIP7WiKCt7P9C44G YObS3gQHFJo3aI21mbLHn2eBmshLjuPiVaCaJcXFrt8Hj0qKHY/QE4INpjJvWtjrvlIOlE y/maLgwtJ7hNv6JXxj/RwT2baHxmyzGyjTLH/bIqsErl109auWwpnr8ussgpITRycNmz3U aJCKL6K/H13Uo1DEsV6d2sBNazSO9eN6GYS+6Bl/e/948CWfHzcd+WpJsI4/DA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662697052; a=rsa-sha256; cv=none; b=FlrkYuCMf5jfesDcZxps8nyIxUc12AXKE3EdL499vkou6sU5a0BtS2RBtG3LrPiRrBwMIG 9KFk0L/Xlye1MuYk4A4gp69hy9L4/kmZaOnS/ANtE4fwN9rXDRCcdLSI91iPn8tda3uVV3 8klxFLOPui8aIIY4l7d03BQV+7ffQgX/X8FHd4EW3HLlnF4XK89KAuya19Lp8++5MHdEN7 stz1FZLj2krA09HIwSAfzwcadQwRG1LEI7sH8DBIwC6JTSzrZQdEXRIBH0x2RaAXarKaMC Gl/+06gn7e4UQqTVIp6A7k2zzRYK/bbuGnWyhipKqja0V3Aj5LiuuIhrTFtuTg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=erdpYlcO; 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.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=erdpYlcO; 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: 81610E27B X-Spam-Score: -3.40 X-Migadu-Scanner: scn1.migadu.com X-TUID: ZMbdSt3Cd0Ys * 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