From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id UE3KLgIjYWUoZwAAauVa8A:P1 (envelope-from ) for ; Fri, 24 Nov 2023 23:26:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UE3KLgIjYWUoZwAAauVa8A (envelope-from ) for ; Fri, 24 Nov 2023 23:26:10 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5CA3956CDD for ; Fri, 24 Nov 2023 23:26:10 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="g9A/USBm"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1700864770; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/OJ7v1JXMv6A+GfPCrAgUrXDly2FBkywIo1FBIMJ4sA=; b=nO5nJzf09OWUxQwr2KyrklvWChw5FFyspwJe2qgyfg7BALpkgOat2uqUQdr4JZCS2jphT+ BTvjvHoTPGwZeXlrjwYo6wizl60Z2yhqRAnun8rJq6gwV5iBSV+XuEg9hCcS0LuXC3CJZ9 pPL+aPO7vuxk7unzUVJQpAjWTByhdAsoogeuLf0e3gqieSpge5llPyy/2zx4iQVX/1sUgU 5m/ppRWH639M229IA/wChXV+ljne/fLVqUKDH9OtMLgEPaMNj+wtUQ4zNcSTvT/qn4v+pg IxRFBRo7SYl5gjGedi2AAOgpegZkbTF2auKFX4l8xA0KKjvWQnJ2vrazTCasrQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="g9A/USBm"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1700864770; a=rsa-sha256; cv=none; b=NGFOKGEoOS+1Jyvaqseivv4cOgU2A/uu58W3c3C1Qkq6NM7MZSxK+e8F3HRhob/extxgtS BInwwgFeRbPRD6QMnkfDrZv1WyoZNfrmWhAOXxTy7KOoUzPbcGXPedAIRj0bFEdtK9dkaT 30Iku/WsZx791CVV817dlgEjw7ZA88loWToKo2S0WOPqmggZPK5t34s5XPQhrTq2JM/unY 2H3rj2Vbp2KGNViJZgegdkdNPIeK+0EVCOlZ6Y76PKDP92CtmDCa4qLSyd81kL6xjhWTB9 Jq9m6ah2XJHUk62e9UGyOkMiphAW942AErjvr1sHwcV53Bt8B4/S4WKHE3ifgg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6ecZ-0003hj-7i; Fri, 24 Nov 2023 17:25: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 1r6ecY-0003hT-4y for guix-patches@gnu.org; Fri, 24 Nov 2023 17:25:58 -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 1r6ecX-00079x-TI for guix-patches@gnu.org; Fri, 24 Nov 2023 17:25:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6ecc-0008Dm-IF for guix-patches@gnu.org; Fri, 24 Nov 2023 17:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67420] [PATCH gnome-team v2] gnu: json-glib: Update to 1.6.6. References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Nov 2023 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67420@debbugs.gnu.org,Liliana Marie Prikler Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 67420-submit@debbugs.gnu.org id=B67420.170086476131591 (code B ref 67420); Fri, 24 Nov 2023 22:26:02 +0000 Received: (at 67420) by debbugs.gnu.org; 24 Nov 2023 22:26:01 +0000 Received: from localhost ([127.0.0.1]:37428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6eca-0008DT-VA for submit@debbugs.gnu.org; Fri, 24 Nov 2023 17:26:01 -0500 Received: from planete-kraus.eu ([89.234.140.182]:33566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6ecX-0008Cp-5L for 67420@debbugs.gnu.org; Fri, 24 Nov 2023 17:25:57 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e20772f8; Fri, 24 Nov 2023 22:25: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=dA0L8Ecvjzogm3ksomyqF6dYqJs=; b=g9A/USBm/4SFnaQI3GpIVV77X8Dy cyJw3ziL4WHfJxuuDcYxfcPpAFTexsTqeToyLcpzYKZ1DXPF9WBHJHutk7a9wI1Y diwzwTN4nJM9y8o19rDIBgaBC4Um7qK39rRjL0tIEpOFchNLShWxwLuD0SJd3Mkf mpd1BBNHI7TK0fLVSHl9qMyNv01qWIxSW3eED/LtVqevOiwephIbOO0ePxHZpE3V QXvUuZ8ympTD5+URwAHwKdoi4ftHms6EdjFGNEBj93L0ZNktc3vMyCEHXVSdl42Q F4fEVYAOipJ/VuKeRUK2Qmf1ElRPFj4M0CXLcyHlqyZcE4XmHRI2ep6i9w== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ec996dad (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 24 Nov 2023 22:25:50 +0000 (UTC) Message-ID: <4a8421cd144ee7b910e5e70571fb3839a6bdd8a2.1700864554.git.vivien@planete-kraus.eu> 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 From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.12 X-Spam-Score: -5.12 X-Migadu-Queue-Id: 5CA3956CDD X-Migadu-Scanner: mx13.migadu.com X-TUID: 1lBut8f7tVHm * 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 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