Subject: Re: [bug#32976] [PATCH] * gnu/packages/gimp.scm (gimp-resynthesizer): New variable.

From: [email-masked] (Ludovic Courtès)
Date: Mon, 08 Oct 2018 23:22:05 +0200

Thorsten Wilms <[email-masked]> skribis:

> ---
>  gnu/packages/gimp.scm | 61 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 61 insertions(+)

Applied with the changes below.

Thanks!

Ludo'.

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 2e74f3128..cd0deac15 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -319,9 +319,11 @@ MyPaint.")
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/bootchk/resynthesizer/archive/v"
-			 version
-			 ".tar.gz"))
-     (sha256 (base32 "0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr"))))
+			   version ".tar.gz"))
+       (sha256
+        (base32
+         "0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr"))
+       (file-name (string-append name "-" version ".tar.gz"))))
     (build-system gnu-build-system)
     (arguments
      `( ;; Turn off tests to avoid:
@@ -334,20 +336,19 @@ MyPaint.")
 	     (setenv "CONFIG_SHELL" (which "sh"))
 	     #t))
 	 (add-after 'configure 'set-prefix
-	  ;; Attempt to install to GIMP's plugin directory will fail.
-	  ;; Use own store address.
+           ;; Install plugin under $prefix, not under GIMP's libdir.
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((target (string-append (assoc-ref outputs "out")
                                           "/lib/gimp/"
-                                         (car (string-split ,(package-version gimp) #\.))
+                                          ,(version-major
+                                            (package-version gimp))
                                           ".0")))
                (substitute* (list "src/resynthesizer/Makefile"
 				  "src/resynthesizer-gui/Makefile")
 		 (("GIMP_LIBDIR = .*")
                   (string-append "GIMP_LIBDIR = " target "\n")))
-              (mkdir-p target))
-            #t))
-	)))
+               (mkdir-p target)
+               #t))))))
     (native-inputs
      `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
@@ -364,5 +365,8 @@ MyPaint.")
     (home-page "https://github.com/bootchk/resynthesizer")
     (synopsis "GIMP plugins for texture synthesis")
     (description
-    "Resynthesizer plugins for GIMP. Encompasses tools for healing selections (content aware fill), enlarging the canvas and healing the border, increasing the resolution while adding detail and transfering the style of an image.")
+     "This package provides resynthesizer plugins for GIMP, which encompasses
+tools for healing selections (content-aware fill), enlarging the canvas and
+healing the border, increasing the resolution while adding detail, and
+transfering the style of an image.")
     (license license:gpl3+)))