* bug#47107: libtiff/fixed uses wrong version number in 'doc' output
@ 2021-03-12 18:55 Leo Famulari
2021-03-12 19:11 ` Leo Famulari
2021-03-13 10:44 ` Ludovic Courtès
0 siblings, 2 replies; 5+ messages in thread
From: Leo Famulari @ 2021-03-12 18:55 UTC (permalink / raw)
To: 47107
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#47107: libtiff/fixed uses wrong version number in 'doc' output
2021-03-12 18:55 bug#47107: libtiff/fixed uses wrong version number in 'doc' output Leo Famulari
@ 2021-03-12 19:11 ` Leo Famulari
2021-03-13 10:44 ` Ludovic Courtès
1 sibling, 0 replies; 5+ messages in thread
From: Leo Famulari @ 2021-03-12 19:11 UTC (permalink / raw)
To: 47107-done
Fixed in 35b3ab8e5748d9911ae7a0189065d0c25392895b
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#47107: libtiff/fixed uses wrong version number in 'doc' output
2021-03-12 18:55 bug#47107: libtiff/fixed uses wrong version number in 'doc' output Leo Famulari
2021-03-12 19:11 ` Leo Famulari
@ 2021-03-13 10:44 ` Ludovic Courtès
2021-03-13 20:15 ` Leo Famulari
2021-03-14 20:34 ` Leo Famulari
1 sibling, 2 replies; 5+ messages in thread
From: Ludovic Courtès @ 2021-03-13 10:44 UTC (permalink / raw)
To: Leo Famulari; +Cc: 47107
[-- 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’.
^ permalink raw reply related [flat|nested] 5+ messages in thread* bug#47107: libtiff/fixed uses wrong version number in 'doc' output
2021-03-13 10:44 ` Ludovic Courtès
@ 2021-03-13 20:15 ` Leo Famulari
2021-03-14 20:34 ` Leo Famulari
1 sibling, 0 replies; 5+ messages in thread
From: Leo Famulari @ 2021-03-13 20:15 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 47107
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#47107: libtiff/fixed uses wrong version number in 'doc' output
2021-03-13 10:44 ` Ludovic Courtès
2021-03-13 20:15 ` Leo Famulari
@ 2021-03-14 20:34 ` Leo Famulari
1 sibling, 0 replies; 5+ messages in thread
From: Leo Famulari @ 2021-03-14 20:34 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 47107-done
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!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-14 20:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-12 18:55 bug#47107: libtiff/fixed uses wrong version number in 'doc' output Leo Famulari
2021-03-12 19:11 ` Leo Famulari
2021-03-13 10:44 ` Ludovic Courtès
2021-03-13 20:15 ` Leo Famulari
2021-03-14 20:34 ` Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).