[bug#29444] [PATCH] gnu: image: Rename pngcrunch to pngcrush and update it.

[bug#29444] [PATCH] gnu: image: Rename pngcrunch to pngcrush and update it.

[nee]

[-- Attachment #1: Type: text/plain, Size: 56 bytes --]

Hello the package pngcrush was wrongly named pngcrunsh.

[-- Attachment #2: 0001-gnu-image-Rename-pngcrunch-to-pngcrush-and-update-it.patch --]
[-- Type: text/x-patch, Size: 2657 bytes --]

From 0aa4d700c488cc25bc45f4402f2afe0823197546 Mon Sep 17 00:00:00 2001
From: nee <nee.git@cock.li>
Date: Sat, 25 Nov 2017 20:51:11 +0100
Subject: [PATCH] gnu: image: Rename pngcrunch to pngcrush and update it.

* gnu/packages/image.scm(pngcrush): Renamed from pngcrunch.
[version]: update to 1.8.13.
[arguments]: Use the nolib Makefile.
[origin]: Use the no-lib tar.
[home-page]: update to the new website.
* gnu/packages/image.scm(pngcrunsh): Make it a deprecated package.
---
 gnu/packages/image.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index cb8e387f6..fd6db73a8 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -207,25 +207,24 @@ in-memory raw vectors.")
     ;; Any of these GPL versions.
     (license (list license:gpl2 license:gpl3))))
 
-(define-public pngcrunch
+(define-public pngcrush
   (package
-   (name "pngcrunch")
-   (version "1.8.11")
+   (name "pngcrush")
+   (version "1.8.13")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://sourceforge/pmt/pngcrush/"
-                                version "/pngcrush-" version ".tar.xz"))
+                                version "/pngcrush-" version "-nolib.tar.xz"))
             (sha256 (base32
-                     "1c7m316i91jp3h1dj1ppppdv6zilm2njk1wrpqy2zj0fcll06lwd"))))
+                     "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"))))
    (build-system gnu-build-system)
    (arguments
-    '(#:make-flags '("-f" "Makefile-nolib")
-      #:tests? #f ; no check target
+    '(#:tests? #f ; no check target
       #:phases
       (modify-phases %standard-phases
         (replace 'configure
           (lambda* (#:key inputs outputs #:allow-other-keys)
-            (substitute* "Makefile-nolib"
+            (substitute* "Makefile"
               (("^(PNG(INC|LIB) = )/usr/local/" line vardef)
                (string-append vardef (assoc-ref inputs "libpng") "/"))
               (("^(Z(INC|LIB) = )/usr/local/" line vardef)
@@ -236,12 +235,15 @@ in-memory raw vectors.")
    (inputs
     `(("libpng" ,libpng)
       ("zlib" , zlib)))
-   (home-page "https://pmt.sourceforge.net/pngcrush")
+   (home-page "https://pmt.sourceforge.io/pngcrush")
    (synopsis "Utility to compress PNG files")
    (description "pngcrusqh is an optimizer for PNG (Portable Network Graphics)
 files.  It can compress them as much as 40% losslessly.")
    (license license:zlib)))
 
+;;; typo package of pngcrush
+(deprecated-package "pngcrunch" pngcrush)
+
 (define-public libjpeg
   (package
    (name "libjpeg")
-- 
2.14.1

bug#29444: [PATCH] gnu: image: Rename pngcrunch to pngcrush and update it.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 702 bytes --]

nee <nee@cock.li> skribis:

> Hello the package pngcrush was wrongly named pngcrunsh.
>
> From 0aa4d700c488cc25bc45f4402f2afe0823197546 Mon Sep 17 00:00:00 2001
> From: nee <nee.git@cock.li>
> Date: Sat, 25 Nov 2017 20:51:11 +0100
> Subject: [PATCH] gnu: image: Rename pngcrunch to pngcrush and update it.
>
> * gnu/packages/image.scm(pngcrush): Renamed from pngcrunch.
> [version]: update to 1.8.13.
> [arguments]: Use the nolib Makefile.
> [origin]: Use the no-lib tar.
> [home-page]: update to the new website.
> * gnu/packages/image.scm(pngcrunsh): Make it a deprecated package.

Funny.  :-)

Applied with the change below to make deprecation effective.

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 530 bytes --]

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index fd6db73a8..a183817db 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -241,8 +241,9 @@ in-memory raw vectors.")
 files.  It can compress them as much as 40% losslessly.")
    (license license:zlib)))
 
-;;; typo package of pngcrush
-(deprecated-package "pngcrunch" pngcrush)
+(define-public pngcrunch
+  ;; This package used to be wrongfully name "pngcrunch".
+  (deprecated-package "pngcrunch" pngcrush))
 
 (define-public libjpeg
   (package