From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: 67420@debbugs.gnu.org,Liliana Marie Prikler <liliana.prikler@gmail.com>
Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com
Subject: [bug#67420] [PATCH gnome-team v2] gnu: json-glib: Update to 1.6.6.
Date: Fri, 24 Nov 2023 00:08:44 +0100 [thread overview]
Message-ID: <4a8421cd144ee7b910e5e70571fb3839a6bdd8a2.1700864554.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <e3e576d58a620b958e922e44097c024c0ceeea17.1700781117.git.vivien@planete-kraus.eu>
* 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
next prev parent reply other threads:[~2023-11-24 22:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2023-12-03 23:59 ` [bug#67420] [PATCH gnome-team v2] " 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4a8421cd144ee7b910e5e70571fb3839a6bdd8a2.1700864554.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=67420@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).