* [bug#67420] [PATCH gnome-team] gnu: json-glib: Update to 1.6.6.
@ 2023-11-23 23:08 Vivien Kraus via Guix-patches via
2023-11-23 23:08 ` [bug#67420] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
2023-11-24 5:14 ` [bug#67420] [PATCH gnome-team] " Liliana Marie Prikler
0 siblings, 2 replies; 6+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-23 23:08 UTC (permalink / raw)
To: 67420; +Cc: rg, liliana.prikler, maxim.cournoyer
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#67420] [PATCH gnome-team v2] gnu: json-glib: Update to 1.6.6.
2023-11-23 23:08 [bug#67420] [PATCH gnome-team] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
@ 2023-11-23 23:08 ` Vivien Kraus via Guix-patches via
2023-12-03 23:59 ` Maxim Cournoyer
2023-11-24 5:14 ` [bug#67420] [PATCH gnome-team] " Liliana Marie Prikler
1 sibling, 1 reply; 6+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-23 23:08 UTC (permalink / raw)
To: 67420, Liliana Marie Prikler; +Cc: rg, maxim.cournoyer
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#67420] [PATCH gnome-team] gnu: json-glib: Update to 1.6.6.
2023-11-23 23:08 [bug#67420] [PATCH gnome-team] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
2023-11-23 23:08 ` [bug#67420] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
@ 2023-11-24 5:14 ` Liliana Marie Prikler
1 sibling, 0 replies; 6+ messages in thread
From: Liliana Marie Prikler @ 2023-11-24 5:14 UTC (permalink / raw)
To: Vivien Kraus, 67420; +Cc: rg, maxim.cournoyer
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#67420] [PATCH gnome-team v2] gnu: json-glib: Update to 1.6.6.
2023-11-23 23:08 ` [bug#67420] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
@ 2023-12-03 23:59 ` Maxim Cournoyer
2023-12-04 18:14 ` Vivien Kraus via Guix-patches via
0 siblings, 1 reply; 6+ messages in thread
From: Maxim Cournoyer @ 2023-12-03 23:59 UTC (permalink / raw)
To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 67420
Hello,
Vivien Kraus <vivien@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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#67420] [PATCH gnome-team v2] gnu: json-glib: Update to 1.6.6.
2023-12-03 23:59 ` Maxim Cournoyer
@ 2023-12-04 18:14 ` Vivien Kraus via Guix-patches via
2023-12-04 23:06 ` Maxim Cournoyer
0 siblings, 1 reply; 6+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-12-04 18:14 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 67420
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#67420] [PATCH gnome-team v2] gnu: json-glib: Update to 1.6.6.
2023-12-04 18:14 ` Vivien Kraus via Guix-patches via
@ 2023-12-04 23:06 ` Maxim Cournoyer
0 siblings, 0 replies; 6+ messages in thread
From: Maxim Cournoyer @ 2023-12-04 23:06 UTC (permalink / raw)
To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 67420
Hi,
Vivien Kraus <vivien@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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-04 23:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-23 23:08 [bug#67420] [PATCH gnome-team] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
2023-11-23 23:08 ` [bug#67420] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
2023-12-03 23:59 ` Maxim Cournoyer
2023-12-04 18:14 ` Vivien Kraus via Guix-patches via
2023-12-04 23:06 ` Maxim Cournoyer
2023-11-24 5:14 ` [bug#67420] [PATCH gnome-team] " Liliana Marie Prikler
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.