From patchwork Wed Oct 27 04:51:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34090 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 4501F27BBE1; Wed, 27 Oct 2021 05:54:56 +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 3CD8C27BBE5 for ; Wed, 27 Oct 2021 05:54:54 +0100 (BST) Received: from localhost ([::1]:38860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxh-00037D-9v for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:54:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfaww-0001vW-Be for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfaww-0003og-3b 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-00059Q-3A 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 11/13] gnu: gusb-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.163531041519624 (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]:48136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawR-00056Q-0M for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:35 -0400 Received: from mail-qk1-f182.google.com ([209.85.222.182]:40878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw6-00053O-Bq for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:14 -0400 Received: by mail-qk1-f182.google.com with SMTP id x123so1334060qke.7 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:14 -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=DlOkfqpT78Lx8CUoeOSaF9nkNuNVVl3iV24Tx7MA/9Q=; b=plYRIuCCvvZ0xY6gjUPDDBAzU5gW9bcDNgiPU0G0r0mX9aakgkkUgSEZwrkt6GEmxm GX/nN+cQKt7nH/bHHcE6ULtzlFWeg7n+q9CA2rKRpbSm+HbpcPogxrqFFHx0RT4J34ed QzChKwgeVKMcBbvL7XmjUMPyZxKRXGMXIqk+ZkgRNqG6b9tuM+pMbLFjyYvOmVJelsQL NPdprJnZe/xywyyrMyLfMeqwtHDTo0oXn+ZVT1gQ1X8a0twnPqHBJBQCHaEy3veMEAwX Y7JL0eyZls5b2ROIQHYuRyR+Wr2nJgw0AJrzxgK/2t40ihqZLBe+7gsHJBZRtxMrhMEG tEQA== 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=DlOkfqpT78Lx8CUoeOSaF9nkNuNVVl3iV24Tx7MA/9Q=; b=r8bv8JLb59wZNVTdEfdMD+a98o+5PjJs6iUZ2z/z40cEzXF/tjYPtl/gLBJqHgy3zj nmd9R75zxgWYGAMr87faAXtwOVF1SwHcGtXpnKZlO94YmjHPjDsArcwXbnC7fYVXYmpB F1q7Fcxsa0A9EOt+swQtZ+yBl3WZ8TR15uRPd2uNnTMZruv0/T074dwkaYH4v/o1W0R/ QSQJnJkW0+XlcEyQgWN7B4vRNN18kyy94b2iDvxr+ofNrJJ2HLd7/zn6huiTJv3M1Pio fvZACPPJynfEcVJ1WeziV3GCoPDtmFINSqUdoxzuxgSvTpOFkVg3lAgduCnWC86xDDrh TXYQ== X-Gm-Message-State: AOAM532S6WvhK9EemZMfZddBvJsHZ47wZjVcCx7a7dVDaZVb1IoEp9wc su24MGnv/GJizbY2rtkKancYk225wT4= X-Google-Smtp-Source: ABdhPJz1cRpqdv8jyYFFgz7IJkAmDQNDHUI8y9h38S1GDiY9alL1xVZd3U3Y1+L/gSDzs6nT5Kx9ww== X-Received: by 2002:a05:620a:2486:: with SMTP id i6mr22769999qkn.380.1635310388697; Tue, 26 Oct 2021 21:53:08 -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:08 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:42 -0400 Message-Id: <20211027045151.9889-11-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 This is needed to prevent a dependency cycle between Inkscape and GTK+. * gnu/packages/gnome.scm (gusb-minimal): New variable. [configure-flags]: Disable docs. [native-inputs]: Remove gtk-doc. (gusb): Rewrite in terms of gusb-minimal. [configure-flags]: Enable docs. [native-inputs]: Add gtk-doc. --- gnu/packages/gnome.scm | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1c4f6a4c94..b79cf48199 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6587,38 +6587,38 @@ (define-public gvfs DAV, and others.") (license license:lgpl2.0+))) -(define-public gusb +(define-public gusb-minimal (package - (name "gusb") + (name "gusb-minimal") (version "0.3.5") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hughsie/libgusb") - (commit version))) + (url "https://github.com/hughsie/libgusb") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "0ifhdqhpyxwsg0z9s1anj7cf5pya5qsqyp5ksh9n7mqwa4lrjkl8")))) (build-system meson-build-system) + (arguments + `(#:tests? #f ;libusb fails to initialize. Wonder what that is. + #:configure-flags + (cons "-Ddocs=false" + (if ,(%current-target-system) + ;; Introspection data cannot currently be cross-compiled. + '("-Dintrospection=false" + ;; Requires introspection data. + "-Dvapi=false") + '())))) (native-inputs `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("gtk-doc" ,gtk-doc/stable))) + ("vala" ,vala))) (propagated-inputs ;; Both of these are required by gusb.pc. `(("glib" ,glib) ("libusb" ,libusb))) - (arguments - `(#:tests? #f ;libusb fails to initialize. Wonder what that is. - #:configure-flags - ,(if (%current-target-system) - ;; Introspection data cannot currently be cross-compiled. - ''("-Dintrospection=false" - ;; Requires introspection data. - "-Dvapi=false") - ''()))) (home-page "https://github.com/hughsie/libgusb") (synopsis "GLib binding for libusb1") (description @@ -6628,6 +6628,18 @@ (define-public gusb USB transfers with your high-level application or system daemon.") (license license:lgpl2.1+))) +(define-public gusb + (package/inherit gusb-minimal + (name "gusb") + (arguments + (substitute-keyword-arguments (package-arguments gusb-minimal) + ((#:configure-flags flags) + `(cons "-Ddocs=true" + (delete "-Ddocs=false" ,flags))))) + (native-inputs + (cons `("gtk-doc" ,gtk-doc/stable) + (package-native-inputs gusb-minimal))))) + (define-public simple-scan (package (name "simple-scan")