From patchwork Fri Sep 9 04:14:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 42355 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 49CB927BBEA; Fri, 9 Sep 2022 05:17:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A93F127BBE9 for ; Fri, 9 Sep 2022 05:17:24 +0100 (BST) Received: from localhost ([::1]:46520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWVSF-0004VH-Rk for patchwork@mira.cbaines.net; Fri, 09 Sep 2022 00:17:23 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart X-getmail-retrieved-from-mailbox: Patches * 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")