From patchwork Thu Nov 23 23:08:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 57219 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 977F927BBEC; Sat, 2 Dec 2023 15:52:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B809327BBE9 for ; Sat, 2 Dec 2023 15:52:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9SHf-00059K-KP; Sat, 02 Dec 2023 10:51:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r9SHb-00058H-RJ for guix-patches@gnu.org; Sat, 02 Dec 2023 10:51:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r9SHb-0002dv-DN for guix-patches@gnu.org; Sat, 02 Dec 2023 10:51:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9SHk-0005UL-O0 for guix-patches@gnu.org; Sat, 02 Dec 2023 10:52:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v3 06/14] gnu: json-glib: Update to 1.6.6. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 15:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67473@debbugs.gnu.org,Liliana Marie Prikler Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170153229220996 (code B ref 67473); Sat, 02 Dec 2023 15:52:04 +0000 Received: (at 67473) by debbugs.gnu.org; 2 Dec 2023 15:51:32 +0000 Received: from localhost ([127.0.0.1]:58478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9SHD-0005SZ-JK for submit@debbugs.gnu.org; Sat, 02 Dec 2023 10:51:31 -0500 Received: from planete-kraus.eu ([89.234.140.182]:57280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9SGz-0005Px-4V for 67473@debbugs.gnu.org; Sat, 02 Dec 2023 10:51:17 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 65e26043; Sat, 2 Dec 2023 15:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=NCXTlo/IlH3gmdG4hfovxQHZB48=; b=L 9F+dBqfAg24wlqHcD2Aq/dFFW8sODOBiPboE1YFA2d3H+j0z41V0XK2D8mRUJgzW zZAoKOnpvX8oYN6TgOids8Vu0mzA9d03pSN+DvvxB1DXCYd7NKeFYptqk1TCvkyq 8KUx/8dFHTWcVJ4gjRaNdNRHvQAX7c41sLih73aBRb0Y46V4FQNmLHaisvj4N3y0 9FSo943olsI1yKQRCu0ONLjz1K9dxPi0jVhmgY0yqSdZ5+zGwpFj7ISpj+v7rd9V FlEzrvEoQ931XzYgdN9Tp7PRWbickcwnpCgAvSwxsTDHTgd4lu/+9zcsEHhDpzCj EY6YLe9Qz/cA7EvR8iwAg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 171360ac (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 2 Dec 2023 15:51:05 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Fri, 24 Nov 2023 00:08:44 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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] : 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 79bf58b568..f8aa5adc02 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