From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 4DhtM8uwHGP+hAAAbAwnHQ (envelope-from ) for ; Sat, 10 Sep 2022 17:44:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YNB5MsuwHGNzbAEAG6o9tA (envelope-from ) for ; Sat, 10 Sep 2022 17:44:11 +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 6375823072 for ; Sat, 10 Sep 2022 17:44:11 +0200 (CEST) Received: from localhost ([::1]:51966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oX2eQ-0001Q0-BC for larch@yhetil.org; Sat, 10 Sep 2022 11:44:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oX2eJ-0001Pa-1V for guix-patches@gnu.org; Sat, 10 Sep 2022 11:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oX2eI-0000Jg-K4 for guix-patches@gnu.org; Sat, 10 Sep 2022 11:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oX2eI-0003J3-7x for guix-patches@gnu.org; Sat, 10 Sep 2022 11:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57688] [PATCH v7] 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 15:44: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.166282463612690 (code B ref 57688); Sat, 10 Sep 2022 15:44:02 +0000 Received: (at 57688) by debbugs.gnu.org; 10 Sep 2022 15:43:56 +0000 Received: from localhost ([127.0.0.1]:40233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX2eC-0003Ic-Fs for submit@debbugs.gnu.org; Sat, 10 Sep 2022 11:43:56 -0400 Received: from mx1.dismail.de ([78.46.223.134]:46879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX2e7-0003IJ-Ph for 57688@debbugs.gnu.org; Sat, 10 Sep 2022 11:43:55 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 6936e48a for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 17:43:43 +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=DCwDjXuOGZxi2ZBVxcCBf bt1+KMLZwb5vNQ7CrOtDrw=; b=tPwIoMkUIQ0hKLpHqLyHplDb2uzo0MdHdS33X RrOfNXPfGBkaEQlEHY2dlL5VSGqj6IRlVouKANdbgLiDYPJECI5nSwmSvrrm4Bkm zmGITXKG2Nb3m1hV8mN/J7tG3fb2nIg38Ed7VVAPV2fLX7DbpkG8ZZACBBephDRI vG7XzcE0l1cxJCpssEpobzYmzewGKzE+381Oe5VdA/Q3n2m+bBcjkPEzedBknz/G 5DgqTZrOZHcm5vmGSinjfHNc1bZfx6FCtrHs7CIhUPtk026JvWf8AZ7L4aZ14ZXc lV0sGNvEdCznPQXldEJkBpBVTWj16gjnpPM2U5NPn4XSFw8+w== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id e04c7980 for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 17:43:42 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 8f3c04bd for <57688@debbugs.gnu.org>; Sat, 10 Sep 2022 17:43:42 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 2871aeb1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Sep 2022 17:43:41 +0200 (CEST) Date: Sat, 10 Sep 2022 10:43:41 -0500 Message-Id: <20220910154341.8830-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=1662824651; 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=+BZO+BOTrw3hezEzSdEt1lwF2YohEQrlYWh4jH6r6zM=; b=Fu52V0vsI5PNlEdMoFt2kQOk1VZYrOB+jzf9X4NcnSGPh0ZJ8+zYe/WI4OoIJCQ9y2JmM/ 9tasy1/RCAp/VNhpGQN4DNhl4o+eOCJZGXk1lY+fIAIMr9yZTnDV22NK7MrfBxRB15SLvO /IGLkrJSZHZMWydKY4XukUHW3GnNBEhgnPsNrhR2cyJEsQUIenrcHcb9AAbNpA/g/BXsJ5 s8OqTZku2VPxZ+KEIXp/ZTVXr1wPQgK9+KYlrNVcPp69QkQdD9+cYcUxBfPJpURxn4ESF2 rFNJtEQbNTcRp8pMuXqHYCs3Khpbix+kiwRtWsCElOv1nWLn1v5+ZQ6cLVmxqA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662824651; a=rsa-sha256; cv=none; b=ifFFEUAcOIXuSV4FTMTQwlQjfBUgnmbLiqD3pKNc2SSdgHviE8caKTVmdFWiMnPe+TC6xc Q4EEUVw/npTXrsCDZk8kQY6udkdR/oQ3KaekUT1mRAqFhPtxz0OQK+j9KXyfiZH9P/24fL Fs9MYN/YFAB0aV/AGu7zSSY+Ct82lhl2PK9Ejw4AMz830O702x2A+AQ8aCXOi5HaINcX8C fPjiVmo/GhapYeoi2GEfau+o56Wf8fJvoKGjgPmfENxPE2L3asD3cYYioMVaMU07AQCNwc qfqELzU8OMKVjU2nDHfQ/RrCaeDJEbd+2AoH/JfhG3qFoJYnRzbakx9s0RFezQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=tPwIoMkU; 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=tPwIoMkU; 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: 6375823072 X-Spam-Score: -3.39 X-Migadu-Scanner: scn1.migadu.com X-TUID: 9jaSJoY6lD+b * gnu/packages/patchutils.scm (wiggle): New variable. --- gnu/packages/patchutils.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fdbcb8e1e1..dac3ff3957 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,44 @@ (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