From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 CCJIH/jCdGXfgAAA9RJhRA:P1 (envelope-from ) for ; Sat, 09 Dec 2023 20:41:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CCJIH/jCdGXfgAAA9RJhRA (envelope-from ) for ; Sat, 09 Dec 2023 20:41:44 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b="J 0l5c+z"; 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=1702150904; 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=RJmozOpiVAZBegyQy2b+dTb3Xsjx06v3jBJ6LiPTUfA=; b=KY2CwTKtxCMQaF6CUDi1q6FTcZ5XRoWhZ2wuOx7/VPJMIbJN+xpD15EMCW5cWRzEbHb9W8 l5H2J3qEMk/ZI0ZUGEqQZDERK4taiCi04F77v0ckmlNJw02ZoHQnUk2sDLE9iH757ZOwzg /IvUZkulcn0fMzX2urHdIARIFQKyPrIfXmKDEfD8h+ltCJvb+qqGPsBX3Hmx+P6eBT66ej 7CTRmL4LeUZURY0xabIqYKSt/MslbgWwXyr1e5ajnc5DKDCAqhUpOeVXplt7wetYEZw2vE Kz6NHYT9m9AHMCfrgb97mUoFvePuZZyHfSL9UFNeAjQFdd7xsDCkkCCLhVaRDQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b="J 0l5c+z"; 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=1702150904; a=rsa-sha256; cv=none; b=t26vy6X3g2W9Y5lA0KerPPfF/MWsqeoCMH9Y5DrNOwjb1X/oJPYzhv+TXxubP6dZ0PWjoq mHe94QMAhPZB+wg84VGFkNl5WIWqHl59mnbjn971GxrputxyOW9Jqtnw68veq/H7Dtml7/ w+8fG7lgxXWZVVAyNxzqdQtNLmhGOvKbN8vcfSoAFA5kEIfXVsyCRJhCwypX6gkvLlZZvg oxxVDciZKJqoyrEpU5PzrF3ztqV5ASr0Ds1CNxpju7u82lTswd0RHhyv6MQxZLzmJ55Wmv Uo0TJGlOdk8WXJxEYQCbszFkyVI4YCcWVOvsMjzJhIsUKhDAb9AKiSXWUA/KzA== 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 3263B40BF4 for ; Sat, 9 Dec 2023 20:41:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rC3CA-0002zB-OR; Sat, 09 Dec 2023 14:41:02 -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 1rC3C2-0002ui-EN for guix-patches@gnu.org; Sat, 09 Dec 2023 14:40:57 -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 1rC3By-0002Hz-6g for guix-patches@gnu.org; Sat, 09 Dec 2023 14:40:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rC3CB-0004Dy-T6 for guix-patches@gnu.org; Sat, 09 Dec 2023 14:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v6 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, 09 Dec 2023 19:41:03 +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: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 67473@debbugs.gnu.org Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170215081116093 (code B ref 67473); Sat, 09 Dec 2023 19:41:03 +0000 Received: (at 67473) by debbugs.gnu.org; 9 Dec 2023 19:40:11 +0000 Received: from localhost ([127.0.0.1]:48969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3BJ-0004BT-UC for submit@debbugs.gnu.org; Sat, 09 Dec 2023 14:40:10 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3BG-00049W-Uh for 67473@debbugs.gnu.org; Sat, 09 Dec 2023 14:40:07 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ed38d0e8; Sat, 9 Dec 2023 19:39:51 +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=GGYbPTSMwaTha5sS1dX4fedAYlU=; b=J 0l5c+za1RGSYZ+IEoTVBdP9YqvIKuLFfmawqpsmPaeHFlt3hhCW2Inq7moaxQBGy qn9xzlXO9dBdzutaqKXykgkDTHYJF64Dil1AWynvkV2sR2YDbxDYSnfzQSjGmxN0 0vfYgddyanyY6XEL+rjZrYjhxu2EzPL8PfRJjh1fja78xJMRuDDacubz85C+1rob 1Rqt5KlcsWD3xEG0lqvYqei0zZ1B1lyPnOOWmdzTMbwmL2K1T5H8VYfWuerBft+r oR3VwoDkebXUKiYZW62l9imiXfNEHL+CV43C7PEDdcQQftHh0bWvvYdLzOg8nQCB JVvE4axyPCxrZ2+bSRH9A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7f0e467f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Dec 2023 19:39:51 +0000 (UTC) Message-ID: <8913b050a95b2b20e50764bbba23177928681b4b.1702150667.git.vivien@planete-kraus.eu> 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 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: 0.59 X-Spam-Score: 0.59 X-Migadu-Queue-Id: 3263B40BF4 X-TUID: fmw2whw7RqWl * 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. Remove docbook-xml-4.3, docbook-xsl, gtk-doc, libxslt. Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888 --- gnu/packages/gnome.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d9aedff159..4a4a452d48 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4697,7 +4697,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/" @@ -4705,14 +4705,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 ;to wrap binaries, compile schemas + #:configure-flags #~(list "-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 @@ -4731,8 +4733,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. @@ -4740,7 +4741,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. @@ -4753,16 +4755,13 @@ (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 - gobject-introspection - gtk-doc - libxslt))))) + (prepend gi-docgen + gobject-introspection))))) (define-public libxklavier (package -- 2.41.0