Subject: bug#57688: closed (Re: [PATCH v7] gnu: Add wiggle.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 11 Sep 2022 10:47:02 +0000

Your bug report

#57688: [PATCH] gnu: Add wiggle.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
57688: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57688
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [PATCH v7] gnu: Add wiggle.
From: Liliana Marie Prikler <[email-masked]>
To: jgart <[email-masked]>, [email-masked]
Date: Sun, 11 Sep 2022 12:46:29 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Am Samstag, dem 10.09.2022 um 10:43 -0500 schrieb jgart:
> * gnu/packages/patchutils.scm (wiggle): New variable.
Applied with some wiggling.

Cheers

Subject: [PATCH] gnu: Add wiggle.
From: jgart <[email-masked]>
To: [email-masked]
Cc: jgart <[email-masked]>
Date: Thu, 8 Sep 2022 18:15:00 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/patchutils.scm (wiggle): New variable.

Here's wiggle 

~ jgart

---
 gnu/packages/patchutils.scm | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..4c2eb4f6cb 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2019 Christopher Baines <[email-masked]>
 ;;; Copyright © 2021 Xinglu Chen <[email-masked]>
+;;; Copyright © 2022 jgart <[email-masked]>
 ;;;
 ;;; 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 file even if the file
+doesn't match the target file perfectly.")
+      (license gpl2+)))
+
 (define-public pwclient
   (package
     (name "pwclient")
-- 
2.37.3