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: 56784 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 C399127BBE2; Thu, 23 Nov 2023 23:14:15 +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 CC99927BBE9 for ; Thu, 23 Nov 2023 23:14:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6ItX-0005rn-4L; Thu, 23 Nov 2023 18:14:03 -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 1r6ItU-0005rP-St for guix-patches@gnu.org; Thu, 23 Nov 2023 18:14:00 -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 1r6ItS-0002FM-QF for guix-patches@gnu.org; Thu, 23 Nov 2023 18:14:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6ItW-0003kQ-Gt for guix-patches@gnu.org; Thu, 23 Nov 2023 18:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67420] [PATCH gnome-team] gnu: json-glib: Update to 1.6.6. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Nov 2023 23:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67420@debbugs.gnu.org Cc: rg@raghavgururajan.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170078119014320 (code B ref -1); Thu, 23 Nov 2023 23:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Nov 2023 23:13:10 +0000 Received: from localhost ([127.0.0.1]:35324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6Isg-0003is-5M for submit@debbugs.gnu.org; Thu, 23 Nov 2023 18:13:10 -0500 Received: from lists.gnu.org ([2001:470:142::17]:47356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6Isd-0003iV-MQ for submit@debbugs.gnu.org; Thu, 23 Nov 2023 18:13:08 -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 1r6IsT-0005hw-CB for guix-patches@gnu.org; Thu, 23 Nov 2023 18:12:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1r6IsQ-0001av-8c for guix-patches@gnu.org; Thu, 23 Nov 2023 18:12:56 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d17188f7; Thu, 23 Nov 2023 23:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:cc:mime-version; s=albinoniA; bh=hmUIzfCFfPkxcoF8RE24fB7eTl8=; b=Ysbr1jl9U82AMLB4ZlELFK4hoEIX SIvDiRIyLvhbejYOt9vpfh/xIPVXx6vnw3afUGLfA3JgN4kGlfRm1czRIiw01Nie /p/KA0wMbI+V6cOWw3eELtmkSLC66YIJDZq/EUjlXYQkMbWfljnNleoZNjfY1+9j ivjsapHaF7RLdxf4hrv4c2qg5dEHXEAVfWsN2Oce2Vhp0w5ai7F/19/r5NKIAP0b ZhXlz7oVlko+m842iU5Kx220xEffO9tnpSMIoUb3ZxUs7v3IToB4vc2SL2bNGXV6 iEQRmf9w4ie35qJx8Act6nJ5w1UIflS5Cc2XLq2P9xRtx1eh2iI4ZXswyQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6af6643b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 23 Nov 2023 23:12:51 +0000 (UTC) Message-ID: Date: Fri, 24 Nov 2023 00:08:44 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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. Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888 --- gnu/packages/gnome.scm | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) base-commit: 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93 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