From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aCLfNtHlG2OeAAAAbAwnHQ (envelope-from ) for ; Sat, 10 Sep 2022 03:18:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id qCnjNtHlG2PuXgAA9RJhRA (envelope-from ) for ; Sat, 10 Sep 2022 03:18:09 +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 E4BD41715E for ; Sat, 10 Sep 2022 03:18:08 +0200 (CEST) Received: from localhost ([::1]:44096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWp8K-0005tl-4u for larch@yhetil.org; Fri, 09 Sep 2022 21:18:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWp8E-0005tK-Iy for guix-patches@gnu.org; Fri, 09 Sep 2022 21:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47292) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWp8E-0006Rf-9i for guix-patches@gnu.org; Fri, 09 Sep 2022 21:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWp8E-0002pp-2M for guix-patches@gnu.org; Fri, 09 Sep 2022 21:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57688] [PATCH v6] 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: Sat, 10 Sep 2022 01:18:02 +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.166277266710877 (code B ref 57688); Sat, 10 Sep 2022 01:18:02 +0000 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 01:17:47 +0000 Received: from localhost ([127.0.0.1]:35991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWp7z-0002pN-EH for submit@debbugs.gnu.org; Fri, 09 Sep 2022 21:17:47 -0400 Received: from mx1.dismail.de ([78.46.223.134]:35899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWp7w-0002p9-Tc for 57688@debbugs.gnu.org; Fri, 09 Sep 2022 21:17:45 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 77abc6cf for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 03:17:39 +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=9Am6R1SQOMFbmaPszfiNF OBb9W24je473etgISrfnoc=; b=C4QSUBfzYdTTfFvJ1I9Bq15d3CmDjaxZxk+pP Ix4BfSwAbtSAmSSkqgoaEnu3f9vidX8p0VUL4TT1X5qo9TOM3tXK2PtaYxXMWMMK U42d6BHjqzQRfJNjuo7Prscni3NzioU/lERNZTldPXXKvEN47PaWpQiXWj71Ro0G FW8LcjSrTKK7pdeqa5x/RPnYSxxeDldssfELuDs0CapqtqM93HZN/IjVIg7cFcKV +Uodym5Pu6FUp9hWP+Ofjulmkuuw/fftJsXUROjrunOgs+7db0I6m9Ay5//s74sN KUfjV/7mv6q5fEdK/96VWCoE/x80j9Ct7newPkhanAB7R7CzA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 2f31541b for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 03:17:39 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 997cd334 for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 03:17:38 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 0e1e2644 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Sep 2022 03:17:33 +0200 (CEST) Date: Fri, 9 Sep 2022 20:17:29 -0500 Message-Id: <20220910011729.17233-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=1662772688; 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=ZtFZsN4w0U85m5v8yMLdD3HaDzxuB+SFOrvnTk72L80=; b=VUcZpBIzSn1G+ceKJM3/A6/yGz1sdQxGHHZ4yLK5tin9PA/2805GbmVM/tTBHX3OVmquAu p5eRzukTjk914JS3y147BlCTvSHWYFS9RrNHwaHId9PTVSSPdV9aZjEGwpOyfj92wOx9Kc 3xKLjex75SgNDrCK9iM3mBnKOYAqX/4MijiyF0u0xDPePnlLCt+uYveYELG/SX/k9kW4ds UTmX+jw+wOdLc3tc/MLa5fGqhc+cbFXt1D9K3epOBeGW8tyg+jQZgFNcduJbPvgObvOfMA HKeSkI7WB1NaPc1LvBXpTdxvU81HWKlLEwsF2qIVc5XfwjbcNNFEP0dQ8Bu6GQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662772688; a=rsa-sha256; cv=none; b=eIPOmyXQwVb5dyGbJpqUPCctwcHamTmK0aNjobMf5qRUlvxmjW/qrnwfD6mqxKHYENJYkq 56e5LYwp2tSN3YjxeCd7N9VKMd6M6v8/FbOycT4Byl+UHfOQg7fAZMXrzRqIYI7jpFkMYR 7gIIRuxJzL/sMkBAgIzMDcliH9Lejcl++WEsk6qBtLJmTI2sMi204Sl5UgHV1S6FlOoTdR PfZeqI0kFixMol9icEv/waxKEz6pCnacMPIzthh6lPm9DpqhdA7o2hD4aPmlkzbGRqCyDo Kj9drUvLck3Yhk5ZMB+PxaOBVctbslG+kxCa80z9cnKh2jqTdRM9fILXSEGVLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=C4QSUBfz; 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.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=C4QSUBfz; 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: E4BD41715E X-Spam-Score: -1.89 X-Migadu-Scanner: scn1.migadu.com X-TUID: h8jDGUtwaz+i * gnu/packages/patchutils.scm (wiggle): New variable. --- gnu/packages/patchutils.scm | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..83fe6ac762 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,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 + (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 "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key 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