bug#47107: libtiff/fixed uses wrong version number in 'doc' output

bug#47107: libtiff/fixed uses wrong version number in 'doc' output

[Leo Famulari]

The grafted replacement of libtiff, libtiff/fixed, updates the package
from version 4.1.0 to 4.2.0.

However, the it does not adjust the #:configure-flags of the inherited
package, which rely on the version number. 

The result is directories named 'share/doc/libtiff-4.1.0' in the "doc"
output of libtiff-4.2.0.

bug#47107: libtiff/fixed uses wrong version number in 'doc' output

[Leo Famulari]

Fixed in 35b3ab8e5748d9911ae7a0189065d0c25392895b

bug#47107: libtiff/fixed uses wrong version number in 'doc' output

[Ludovic Courtès]

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

Hi Leo,

Leo Famulari <leo@famulari.name> skribis:

> The grafted replacement of libtiff, libtiff/fixed, updates the package
> from version 4.1.0 to 4.2.0.
>
> However, the it does not adjust the #:configure-flags of the inherited
> package, which rely on the version number. 
>
> The result is directories named 'share/doc/libtiff-4.1.0' in the "doc"
> output of libtiff-4.2.0.

Instead of duplicating the ‘name’ and ‘arguments’ fields as done in
35b3ab8e5748d9911ae7a0189065d0c25392895b, one possibility is to change
the initial ‘libtiff’ like so:


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

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4f249b7622..44d2cac0fe 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -599,7 +599,8 @@ extracting icontainer icon files.")
     `(#:configure-flags (list (string-append "--with-docdir="
                                              (assoc-ref %outputs "doc")
                                              "/share/doc/"
-                                             ,name "-" ,version)
+                                             ,name "-"
+                                             ,(package-version this-package))
                               "--disable-static")))
    (inputs `(("zlib" ,zlib)
              ("libjpeg" ,libjpeg-turbo)))

[-- Attachment #3: Type: text/plain, Size: 265 bytes --]


WDTY?

Would it make sense to adopt this style also for
<https://issues.guix.gnu.org/47108> and
<https://issues.guix.gnu.org/47110>?

(Changing to this style should not trigger any rebuild because it
expands to the exact same thing.)

Thanks,
Ludo’.

bug#47107: libtiff/fixed uses wrong version number in 'doc' output

[Leo Famulari]

On Sat, Mar 13, 2021 at 11:44:27AM +0100, Ludovic Courtès wrote:
> Instead of duplicating the ‘name’ and ‘arguments’ fields as done in
> 35b3ab8e5748d9911ae7a0189065d0c25392895b, one possibility is to change
> the initial ‘libtiff’ like so:
> 

> diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
> index 4f249b7622..44d2cac0fe 100644
> --- a/gnu/packages/image.scm
> +++ b/gnu/packages/image.scm
> @@ -599,7 +599,8 @@ extracting icontainer icon files.")
>      `(#:configure-flags (list (string-append "--with-docdir="
>                                               (assoc-ref %outputs "doc")
>                                               "/share/doc/"
> -                                             ,name "-" ,version)
> +                                             ,name "-"
> +                                             ,(package-version this-package))
>                                "--disable-static")))

That is great, thanks. I will make the adjustments.

bug#47107: libtiff/fixed uses wrong version number in 'doc' output

[Leo Famulari]

On Sat, Mar 13, 2021 at 11:44:27AM +0100, Ludovic Courtès wrote:
> Instead of duplicating the ‘name’ and ‘arguments’ fields as done in
> 35b3ab8e5748d9911ae7a0189065d0c25392895b, one possibility is to change
> the initial ‘libtiff’ like so:
> 

> diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
> index 4f249b7622..44d2cac0fe 100644
> --- a/gnu/packages/image.scm
> +++ b/gnu/packages/image.scm
> @@ -599,7 +599,8 @@ extracting icontainer icon files.")
>      `(#:configure-flags (list (string-append "--with-docdir="
>                                               (assoc-ref %outputs "doc")
>                                               "/share/doc/"
> -                                             ,name "-" ,version)
> +                                             ,name "-"
> +                                             ,(package-version this-package))
>                                "--disable-static")))
>     (inputs `(("zlib" ,zlib)
>               ("libjpeg" ,libjpeg-turbo)))

> 
> WDTY?
> 
> Would it make sense to adopt this style also for
> <https://issues.guix.gnu.org/47108> and
> <https://issues.guix.gnu.org/47110>?

Done as b082ea9406f19f0d0c296227510256b87fe11e3c

Thanks for the suggestion!