From patchwork Wed Oct 27 04:51:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34087 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 2F08527BBE1; Wed, 27 Oct 2021 05:54:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9AF7327BBE3 for ; Wed, 27 Oct 2021 05:54:34 +0100 (BST) Received: from localhost ([::1]:38028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxN-0002Ys-LY for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:54:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfaww-0001vX-Or for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfaww-0003ol-Gk for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfaww-00059X-Fz for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 10/13] gnu: libcloudproviders-minimal: Introduce minimal variant. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041519632 (code B ref 51428); Wed, 27 Oct 2021 04:54:06 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:35 +0000 Received: from localhost ([127.0.0.1]:48138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawR-00056T-C0 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:35 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:34577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw5-00053M-Fm for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:14 -0400 Received: by mail-qk1-f179.google.com with SMTP id br18so1365322qkb.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DH4Nhj3QwgTJdgtKACB6SHk4GCnuUACTM7ehMsWHF3w=; b=RQPCMzm7s3Zs0aDAPzqGiZOx6WOtaEaH0rVmdXHhhlJCLyU8aAY/dOPGd67iZY/Akd RJm1DeX/u5gvVWoayG7Fu17zgQR/DNPzehsev55xMDzPHuHv6z6O18ENeqE/HW1+k+w0 xfR7n8TYEpM5LE/PdaRH37SqFsDaNvm+QJTc/YZI8JenLm2Lb4liKjC1FRXJA562VCdp aRTyiyxa7kbV145383AbtBTdIs+WkGAl89FQcHMB/eROUkrD3bBCckooQqGkDwEVDxMV LsRAqpNfisSUIuGZyGziSJA7P4YF1TeoRUBKD68HBsk7BaXp9pT4SKtjnXA9g6YlApGG eDaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DH4Nhj3QwgTJdgtKACB6SHk4GCnuUACTM7ehMsWHF3w=; b=xgowquDFHaAgjxjsRQdWI7mueKnfF2NctguPJjpSpMc3R/WxswPTzoGV0Hlue689u9 O5EV/AiZZJChi9cmNPFsUMguxgin81TA7Mh2bYc0gWxebE0FKHxbAcoGTxXTrOwFLl1w fYlMNp8WS64iizJ6PuHwzafW03UFTdMh+KmSYJyEw4HdGo0BWHSDfXdRFA9mPsQ92u/d ZtBh/RZ4ehVLSxb7QJJpFtLK6b8HVrDLYWWxeE4gck9Shuyx+q2wIeCdv77q6/DZQjku HRjffG/6J06n9czNfdbWUlnK8Ysv0a0KDboYFnl/p1DoXd50WoBy0j84UrmsiLUgSBok 0Xuw== X-Gm-Message-State: AOAM531KwE2p0lQZXa/XlgMNb1Rmdo6r8GyuFWI2ELKEjFVgu3cTeq9D 6VvxiVemuVgDii46UfMHKc3Ft+hjwbQ= X-Google-Smtp-Source: ABdhPJzJcUwvrACUZsu+EuIhP8epq5X94wdf3wlMRiOFgcSASq8Zl+xnjS7f6FAAjPEh/3N0ODy3TA== X-Received: by 2002:a05:620a:2490:: with SMTP id i16mr22912408qkn.112.1635310387818; Tue, 26 Oct 2021 21:53:07 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:07 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:41 -0400 Message-Id: <20211027045151.9889-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (libcloudproviders-minimal): New minimal variant that doesn't require Inkscape to be built (through gtk-doc). [source]: Adjust URI. [outputs]: Remove field. [configure-flags]: Disable introspection, docs and vala bindings. [phases]{move-doc}: Move phase to ... (libcloudproviders)[phases]: ... here. Rewrite in terms of libcloudproviders-minimal. The "doc" output is moved here. [configure-flags]: Clear inherited flags and enable doc. * gnu/packages/gtk.scm (gtk+)[inputs]{libcloudproviders}: Use the minimal variant to prevent a cycle with Inkscape. --- gnu/packages/gnome.scm | 60 +++++++++++++++++++++++++----------------- gnu/packages/gtk.scm | 2 +- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4b1adc2997..1c4f6a4c94 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan @@ -338,41 +338,28 @@ (define-public brasero features to enable users to create their discs easily and quickly.") (license license:gpl2+))) -(define-public libcloudproviders +;;; Minimal variant, used to break a cycle with Inkscape. +(define-public libcloudproviders-minimal (package - (name "libcloudproviders") + (name "libcloudproviders-minimal") (version "0.3.1") (source (origin (method url-fetch) (uri - (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (string-append "mirror://gnome/sources/libcloudproviders/" + (version-major+minor version) + "/libcloudproviders-" version ".tar.xz")) (sha256 (base32 "0aars24myf6n8b8hm1n12hsgcm54097kpbpm4ba31zp1l4y22qs7")))) (build-system meson-build-system) - (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags - (list - "-Denable-gtk-doc=true") - #:phases - (modify-phases %standard-phases - (add-after 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t)))))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags (list "-Dintrospection=false" + "-Denable-gtk-doc=false" + "-Dvapigen=false"))) (native-inputs `(("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -386,6 +373,31 @@ (define-public libcloudproviders (home-page "https://csorianognome.wordpress.com/2015/07/07/cloud-providers/") (license license:lgpl3+))) +(define-public libcloudproviders + (package/inherit libcloudproviders-minimal + (name "libcloudproviders") + (version "0.3.1") + (outputs (cons "doc" (package-outputs libcloudproviders-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments libcloudproviders-minimal) + ((#:configure-flags _) + '("-Denable-gtk-doc=true")) ;false by default + ((#:phases phases '%standard-phases) + `(modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc"))))))))) + (native-inputs + (append + `(("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc/stable)) + (package-native-inputs libcloudproviders-minimal))))) + (define-public libgrss (package (name "libgrss") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a515bca5ac..e92c6b1398 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1005,7 +1005,7 @@ (define-public gtk+ gdk-pixbuf+svg gdk-pixbuf)) ("glib" ,glib) - ("libcloudproviders" ,libcloudproviders) + ("libcloudproviders" ,libcloudproviders-minimal) ("libepoxy" ,libepoxy) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite)