GNU bug report logs -
#67420
[PATCH gnome-team] gnu: json-glib: Update to 1.6.6.
Previous Next
Reported by: Vivien Kraus <vivien <at> planete-kraus.eu>
Date: Thu, 23 Nov 2023 23:14:02 UTC
Severity: normal
Tags: patch
Merged with 67166,
67169,
67222,
67408,
67410,
67411,
67423,
67424,
67437,
67473
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67420 in the body.
You can then email your comments to 67420 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#67420; Package
guix-patches.
(Thu, 23 Nov 2023 23:14:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Vivien Kraus <vivien <at> planete-kraus.eu>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Thu, 23 Nov 2023 23:14:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true. Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen, libxml2 and python.
Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
gnu/packages/gnome.scm | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 194a443484..477b6e07fe 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4679,7 +4679,7 @@ (define-public dconf
(define-public json-glib-minimal
(package
(name "json-glib-minimal")
- (version "1.6.2")
+ (version "1.6.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4687,14 +4687,16 @@ (define-public json-glib-minimal
"/json-glib-" version ".tar.xz"))
(sha256
(base32
- "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+ "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas
+ (list #:glib-or-gtk? #t
+ #:configure-flags #~'("-Dgtk_doc=disabled")))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal
- ("pkg-config" ,pkg-config)))
+ (list
+ gettext-minimal
+ `(,glib "bin") ;for glib-mkenums and glib-genmarshal
+ pkg-config))
(inputs
(list bash-minimal))
(propagated-inputs
@@ -4713,8 +4715,7 @@ (define-public json-glib
(arguments
(substitute-keyword-arguments (package-arguments json-glib-minimal)
((#:configure-flags _)
- #~(list "-Ddocs=true"
- "-Dman=true"
+ #~(list "-Dman=true"
#$@(if (%current-target-system)
;; If enabled, gtkdoc-scangobj will try to execute a
;; cross-compiled binary.
@@ -4722,7 +4723,8 @@ (define-public json-glib
;; Trying to build introspection data when cross-compiling
;; causes errors during linking.
"-Dintrospection=disabled")
- #~())))
+ #~("-Dgtk_doc=enabled"
+ "-Dintrospection=enabled"))))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
;; When cross-compiling, there are no docs to move.
@@ -4735,16 +4737,19 @@ (define-public json-glib
(lambda _
(mkdir-p (string-append #$output:doc "/share"))
(rename-file
- (string-append #$output "/share/gtk-doc")
+ (string-append #$output "/share/doc")
(string-append #$output:doc
- "/share/gtk-doc"))))))))))
+ "/share/doc"))))))))))
(native-inputs
(modify-inputs (package-native-inputs json-glib-minimal)
(prepend docbook-xml-4.3
docbook-xsl
+ gi-docgen
gobject-introspection
gtk-doc
- libxslt)))))
+ libxml2
+ libxslt
+ python)))))
(define-public libxklavier
(package
base-commit: 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#67420; Package
guix-patches.
(Fri, 24 Nov 2023 05:15:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 67420 <at> debbugs.gnu.org (full text, mbox):
Am Freitag, dem 24.11.2023 um 00:08 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
> [arguments]: Convert to list of G-Expressions.
> [#:configure-flags]: Add -Dgtk_doc=disabled.
> [native-inputs]: Drop labels.
> (json-glib) [#:configure-flags]: Remove -Ddocs=true. Unless cross-
> compiling,
> add -Dgtk_doc=enabled and -Dintrospection=enabled.
> [#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
> [native-inputs]: Add gi-docgen, libxml2 and python.
>
> Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
> ---
If gi-docgen is used, you can probably remove gtk-doc.
Cheers
Information forwarded
to
guix-patches <at> gnu.org:
bug#67420; Package
guix-patches.
(Fri, 24 Nov 2023 22:26:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 67420 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true. Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen, libxml2 and python. Remove gtk-doc.
Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
gnu/packages/gnome.scm | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 194a443484..93bd623697 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4679,7 +4679,7 @@ (define-public dconf
(define-public json-glib-minimal
(package
(name "json-glib-minimal")
- (version "1.6.2")
+ (version "1.6.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4687,14 +4687,16 @@ (define-public json-glib-minimal
"/json-glib-" version ".tar.xz"))
(sha256
(base32
- "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))))
+ "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas
+ (list #:glib-or-gtk? #t
+ #:configure-flags #~'("-Dgtk_doc=disabled")))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal
- ("pkg-config" ,pkg-config)))
+ (list
+ gettext-minimal
+ `(,glib "bin") ;for glib-mkenums and glib-genmarshal
+ pkg-config))
(inputs
(list bash-minimal))
(propagated-inputs
@@ -4713,8 +4715,7 @@ (define-public json-glib
(arguments
(substitute-keyword-arguments (package-arguments json-glib-minimal)
((#:configure-flags _)
- #~(list "-Ddocs=true"
- "-Dman=true"
+ #~(list "-Dman=true"
#$@(if (%current-target-system)
;; If enabled, gtkdoc-scangobj will try to execute a
;; cross-compiled binary.
@@ -4722,7 +4723,8 @@ (define-public json-glib
;; Trying to build introspection data when cross-compiling
;; causes errors during linking.
"-Dintrospection=disabled")
- #~())))
+ #~("-Dgtk_doc=enabled"
+ "-Dintrospection=enabled"))))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
;; When cross-compiling, there are no docs to move.
@@ -4735,16 +4737,18 @@ (define-public json-glib
(lambda _
(mkdir-p (string-append #$output:doc "/share"))
(rename-file
- (string-append #$output "/share/gtk-doc")
+ (string-append #$output "/share/doc")
(string-append #$output:doc
- "/share/gtk-doc"))))))))))
+ "/share/doc"))))))))))
(native-inputs
(modify-inputs (package-native-inputs json-glib-minimal)
(prepend docbook-xml-4.3
docbook-xsl
+ gi-docgen
gobject-introspection
- gtk-doc
- libxslt)))))
+ libxml2
+ libxslt
+ python)))))
(define-public libxklavier
(package
base-commit: 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#67420; Package
guix-patches.
(Mon, 04 Dec 2023 00:00:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 67420 <at> debbugs.gnu.org (full text, mbox):
Hello,
Vivien Kraus <vivien <at> planete-kraus.eu> writes:
> * gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
> [arguments]: Convert to list of G-Expressions.
> [#:configure-flags]: Add -Dgtk_doc=disabled.
> [native-inputs]: Drop labels.
> (json-glib) [#:configure-flags]: Remove -Ddocs=true. Unless cross-compiling,
> add -Dgtk_doc=enabled and -Dintrospection=enabled.
> [#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
> [native-inputs]: Add gi-docgen, libxml2 and python. Remove gtk-doc.
Please stick to one package per change, unless they'd cause the tree to
be broken (non atomic).
--
Thanks,
Maxim
Information forwarded
to
guix-patches <at> gnu.org:
bug#67420; Package
guix-patches.
(Mon, 04 Dec 2023 18:15:01 GMT)
Full text and
rfc822 format available.
Message #19 received at 67420 <at> debbugs.gnu.org (full text, mbox):
Le dimanche 03 décembre 2023 à 18:59 -0500, Maxim Cournoyer a écrit :
> > * gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
> > [arguments]: Convert to list of G-Expressions.
> > [#:configure-flags]: Add -Dgtk_doc=disabled.
> > [native-inputs]: Drop labels.
> > (json-glib) [#:configure-flags]: Remove -Ddocs=true. Unless cross-
> > compiling,
> > add -Dgtk_doc=enabled and -Dintrospection=enabled.
> > [#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
> > [native-inputs]: Add gi-docgen, libxml2 and python. Remove gtk-
> > doc.
>
> Please stick to one package per change, unless they'd cause the tree
> to
> be broken (non atomic).
Hello,
Unfortunately, this is not possible, as the “docs” option changed from
one release to the next.
Best regards,
Vivien
Information forwarded
to
guix-patches <at> gnu.org:
bug#67420; Package
guix-patches.
(Mon, 04 Dec 2023 23:08:02 GMT)
Full text and
rfc822 format available.
Message #22 received at 67420 <at> debbugs.gnu.org (full text, mbox):
Hi,
Vivien Kraus <vivien <at> planete-kraus.eu> writes:
> Le dimanche 03 décembre 2023 à 18:59 -0500, Maxim Cournoyer a écrit :
>> > * gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
>> > [arguments]: Convert to list of G-Expressions.
>> > [#:configure-flags]: Add -Dgtk_doc=disabled.
>> > [native-inputs]: Drop labels.
>> > (json-glib) [#:configure-flags]: Remove -Ddocs=true. Unless cross-
>> > compiling,
>> > add -Dgtk_doc=enabled and -Dintrospection=enabled.
>> > [#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
>> > [native-inputs]: Add gi-docgen, libxml2 and python. Remove gtk-
>> > doc.
>>
>> Please stick to one package per change, unless they'd cause the tree
>> to
>> be broken (non atomic).
>
> Hello,
>
> Unfortunately, this is not possible, as the “docs” option changed from
> one release to the next.
OK! Good to know, thanks for the explanation.
--
Thanks,
Maxim
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Mon, 29 Jan 2024 12:24:06 GMT)
Full text and
rfc822 format available.
This bug report was last modified 1 year and 101 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.