From patchwork Wed Oct 27 04:51:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34080 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 EFFDE27BBE1; Wed, 27 Oct 2021 05:54:26 +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 C807127BBE5 for ; Wed, 27 Oct 2021 05:54:24 +0100 (BST) Received: from localhost ([::1]:37246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxD-0001zW-ME for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:54:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfaww-0001vS-0b for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawv-0003oa-Nw for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawv-00059I-Ms for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 09/13] gnu: colord-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:05 +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.163531039719551 (code B ref 51428); Wed, 27 Oct 2021 04:54:05 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:17 +0000 Received: from localhost ([127.0.0.1]:48127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw8-00055F-B1 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:16 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:45908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw4-00053F-Oj for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:13 -0400 Received: by mail-qk1-f172.google.com with SMTP id bp7so1303289qkb.12 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:12 -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=zQ9XdS4bmHXvdiVpxDLtVT8bB5JCRDFAxF9IzsOb7uo=; b=hH1leeicbkxuMre5sGxxkOL7n1IhHM6hWwS8Bm4zbJFSiSwCuwvt+vSRezmtQ2aDvZ SP40WF6XDHYUFTFk7SSS3VauazOhMX7hc47Qf7sgDgkJQXqLk/9k/axNbX7fSCiwciyX x5Lyg6ds+pSEpn+f+KM1ytTSfCJ7jvNR9gdEepDBC/rv4ufpKkv58ZpW4D/ZW1InJ3Lk KmCI/L7Mj6X8Xvq8vZv/o/8KNK2/JHe2HDzMn4qptXJHxE7aF2AXh+mBrSWRCoJ0l5bJ xL8COGYEf+hKWH+yYTPHM4WKDpIvS3hc0oj9pDNyTZKmKj1OmRGxY9lDdtw0UxarhyyL xQpg== 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=zQ9XdS4bmHXvdiVpxDLtVT8bB5JCRDFAxF9IzsOb7uo=; b=A/bZ6qXj4Ve90yxwb9mQcesf0FuF2HBUCpbpSgLL2X/hN/U+PjwBOT5abFHZovXtty VYQBffk/FJ9WyKhR9nFiX79pGl1uq3WQ+HMNJH7Zq9lvlse4fXQ39vGt0urHpeSWFhK6 GnTV6W9gTIDHVhyyczGc7zR0eja0op5sLxsEMSMAdHRbVxnA8vjSb2KUQXDxY8gQnhWn wZyY+6EnG0pRjKTW/k503e7OS58ZDdXuY6y5GWHLUoln04AD6U9u1aX8WOuEzTXxCq+w EwUj/WGlCSANvxgBv8syBEu0vTJk+BsgMeXfCnvtFI+Cdguda2s0rYUKofcJda0UVfmr ur7Q== X-Gm-Message-State: AOAM533p9Hln+Pnv57EKX7qolRfpJrkl4DY3YugsiePWwnDZyaTD07Bh W4mPqRmBzmk4R9FL2juZbQYCc/On4mc= X-Google-Smtp-Source: ABdhPJx4qF1KhntMsl9nEf2T3U7C4C3Wht6Rq/h3/ldBJ1TfWlts7OkKMjM2kRKmFbIqiA/NKYKzAw== X-Received: by 2002:a05:620a:458d:: with SMTP id bp13mr22550852qkb.196.1635310387164; 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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:06 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:40 -0400 Message-Id: <20211027045151.9889-9-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 (colord-minimal): New minimal variant that doesn't require Inkscape to be built (through gtk-doc). Remove trailing #t. [configure-flags]: Disable docs and manpage generation. Sort order. (colord): Rewrite in terms of colord-minimal. [configure-flags]: Enable manpages and bash completion. [phases]{fix-bash-completion-dir}: New phase. [native-inputs]: Add bash_completion, docbook-xsl-ns and libxml2. * gnu/packages/gtk.scm (gtk+)[inputs]{colord}: Use the colord-minimal variant to prevent a cycle with Inkscape. --- gnu/packages/gnome.scm | 65 +++++++++++++++++++++++++++++------------- gnu/packages/gtk.scm | 2 +- 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fc486a4d1e..4b1adc2997 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5203,9 +5203,9 @@ (define-public gnome-terminal keyboard shortcuts.") (license license:gpl3+))) -(define-public colord +(define-public colord-minimal (package - (name "colord") + (name "colord-minimal") (version "1.4.5") (source (origin @@ -5216,33 +5216,27 @@ (define-public colord (base32 "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p")))) (build-system meson-build-system) (arguments - '(;; FIXME: One test fails: + '( ;; FIXME: One test fails: ;; /colord/icc-store (in lib/colord/colord-self-test-private): ;; Incorrect content type for /tmp/colord-vkve/already-exists.icc, got ;; application/x-zerosize #:tests? #f #:glib-or-gtk? #t - #:configure-flags (list "-Dlocalstatedir=/var" - ;; No dep on systemd. - "-Dsystemd=false" - ;; Wants to install to global completion dir; - ;; punt. + #:configure-flags (list "-Dargyllcms_sensor=false" ;requires spotread "-Dbash_completion=false" "-Ddaemon_user=colord" + "-Ddocs=false" + "-Dlocalstatedir=/var" + "-Dman=false" "-Dsane=true" - "-Dvapi=true" - ;; Requires spotread. - "-Dargyllcms_sensor=false" - ;; TODO: Requires docbook2x. - "-Dman=false") + "-Dsystemd=false") ;no systemd #:phases (modify-phases %standard-phases (add-before 'configure 'patch-build-system (lambda* (#:key outputs #:allow-other-keys) (substitute* "rules/meson.build" (("udev.get_pkgconfig_variable\\('udevdir'\\)") - (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))) - #t)) + (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))))) (add-before 'configure 'set-sqlite3-file-name (lambda* (#:key inputs #:allow-other-keys) ;; "colormgr dump" works by invoking the "sqlite3" command. @@ -5250,13 +5244,10 @@ (define-public colord (let ((sqlite (assoc-ref inputs "sqlite"))) (substitute* "client/cd-util.c" (("\"sqlite3\"") - (string-append "\"" sqlite "/bin/sqlite3\""))) - #t)))))) + (string-append "\"" sqlite "/bin/sqlite3\""))))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs @@ -5266,7 +5257,8 @@ (define-public colord ("udev" ,eudev))) (inputs `(("dbus-glib" ,dbus-glib) - ("gusb" ,gusb) + ("gobject-introspection" ,gobject-introspection) + ("gusb" ,gusb-minimal) ("libgudev" ,libgudev) ("libusb" ,libusb) ("polkit" ,polkit) @@ -5280,6 +5272,39 @@ (define-public colord output devices.") (license license:gpl2+))) +(define-public colord + (package/inherit colord-minimal + (name "colord") + (arguments + (substitute-keyword-arguments + (package-arguments colord-minimal) + ((#:configure-flags flags) + `(begin + (use-modules (srfi srfi-1)) + (append '("-Dbash_completion=true" + "-Ddocs=true" + "-Dman=true") + (fold delete ,flags '("-Dbash_completion=false" + "-Ddocs=false" + "-Dman=false"))))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-bash-completion-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "data/meson.build" + (("bash_completion.get_pkgconfig_variable\ +\\('completionsdir'\\)") + (string-append "'" (assoc-ref outputs "out") + "/etc/bash_completion.d'"))))))))) + (native-inputs + (append + `(("bash-completion" ,bash-completion) + ("docbook-xsl-ns" ,docbook-xsl-ns) + ("gtk-doc" ,gtk-doc/stable) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("libxslt" ,libxslt)) + (package-native-inputs colord-minimal))))) + (define-public geoclue (package (name "geoclue") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1dd2c6c184..a515bca5ac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1023,7 +1023,7 @@ (define-public gtk+ ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (inputs - `(("colord" ,colord) + `(("colord" ,colord-minimal) ;to prevent a cycle with inkscape ("cups" ,cups) ("graphene" ,graphene) ("harfbuzz" ,harfbuzz)