From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id V3HnMX3beGFgbgAAgWs5BA (envelope-from ) for ; Wed, 27 Oct 2021 06:54:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iAYDLX3beGE/EAAAB5/wlQ (envelope-from ) for ; Wed, 27 Oct 2021 04:54:21 +0000 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 664982BD27 for ; Wed, 27 Oct 2021 06:54:21 +0200 (CEST) Received: from localhost ([::1]:37192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxA-0001ue-Hn for larch@yhetil.org; Wed, 27 Oct 2021 00:54:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawt-0001sW-OF for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawt-0003ny-FY for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawt-00058a-9d for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 03/13] gnu: at-spi2-core: Reverse inheritance relationship with minimal variant. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:03 +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.163531039319488 (code B ref 51428); Wed, 27 Oct 2021 04:54:03 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:13 +0000 Received: from localhost ([127.0.0.1]:48111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw5-000547-4s for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:13 -0400 Received: from mail-qv1-f49.google.com ([209.85.219.49]:43812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw0-00052x-Kj for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:09 -0400 Received: by mail-qv1-f49.google.com with SMTP id v10so1004715qvb.10 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:08 -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=IKN3eewjuw/TDAzq5d93MmHGVqu7Jki/Uo9SleCq+gg=; b=VP7fgOwfIQqJAJhhnIaUC+Ia8TPg3A0peYEpMSJdFJa+xTBtoZE88Se2vldFPAlJmD 7mTLGLzBQEeHJECvZ8yFSl+JxnKLtoc2s/wGBsYm8h4CICdJLuAARQIgSc1UOhq+riRU 0KMlcWHZ4W47Gp0c6c7jI7piP7ifjKxi//2UPryJEY2SzM+0iPCFPV1K1YSvPqrU9jeG KQOvUD/JqXxhmZfAIVmk1d0nyMoAumBMTkGYsWemQkadzOCaA+nhLSswYQ1yc/ekv+o4 0VlcO4NdZrcP2XRYS11tdig1rps/QNspGXB/0njpo43MfUnjts+ri2abUoXfbdI9vzeC MEYw== 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=IKN3eewjuw/TDAzq5d93MmHGVqu7Jki/Uo9SleCq+gg=; b=Y+1rXlX7vWVqcLbb50Y/dJtpgF2cOJMcXzcNMpYgLJbdajpi4N8CRmu/klWW4IK6y2 uyH5HiTbHc2dQyRfJqJaX6TD03hFO90aE/Qv/cfDhjhuXdz1L3GtlvMN4TWvUlJjH2/f zvWfZOTdv3zHVGYttjWlkAy+MDtjp4dMj1cEVOME0JE90C7CMEfmc351SNxorPayD8uH Nk6kU75RJhEAZP+M+SH48IJcH+U77jjZ9SjzFTkomzll+8h/xXNNXoJpLYoGWtu4nUVF d8Qb6iffFTZnV8hauQqpsuUaYVkR0aAj26Bo+nIKyK/eMA965T75dIxuBbkPxowQvYJk xc6A== X-Gm-Message-State: AOAM5312b0fTONs0Kuc0jVy5222xsOE0JeNCOPTU/G7pph4cfgjzpZhl mBmrb/vNXemyqQ9u6jiPHK/ivN6834Y= X-Google-Smtp-Source: ABdhPJxizFuyWHcplucgGrfDEBxBKn9A0Z7cPRchOlMfYmFHri1kjEpN/E00WFTDPbBYbbQlibQTMQ== X-Received: by 2002:a05:6214:b61:: with SMTP id ey1mr26634429qvb.15.1635310382781; Tue, 26 Oct 2021 21:53:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:02 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:34 -0400 Message-Id: <20211027045151.9889-3-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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635310461; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=IKN3eewjuw/TDAzq5d93MmHGVqu7Jki/Uo9SleCq+gg=; b=ryVBpgSMxzZHXI7wSPjllj9e15sfmr/Ur7qK7vxcMlS9Ns9/6clsYrwez1sBecyVYalSU8 BWWgphvtMrpHatizaKppxq2Vj8gcQ7p8mKWqKo2LKMe8CGl3NC45HBfNSTHZ9dxxMgssTR O7icjXbPUhuLJgR6RzVmtSVIotBHddx2aQZU53whXc4qnbFH/e4l6f0sbNkwqvNGj7aTKc KC/gQSoEZZHHWgEi4TXOTl29+cIKhwlCWrbFJGmHYcbjD1G9PJ4qLPaNmqRnrcfoSxradD s1i4X+FLoe8xhgo/tB3foyG7GoGJAINo2I3AOfS7kgi8mWCf4i479cgPV+DoaQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635310461; a=rsa-sha256; cv=none; b=q2YRLqddQSCJqupA+yoQqik4J6Ixb5bd+ArcbVdCCHWozfufO//4lOUXSF1WFlthL1jwE9 ipVlHku61JKvXsqXetf3++rMEnD2X64pbdqXKba3OkJ+zQPO8mIuA+5hlz9MsUX1HAh6ov nhVfc8qQmoMHbegapKrtwkhjc3yN3yhqH396LjH4FpWBt0pULp7w2PQziuaWxlOYVLywuA Nmw/RHskO/CgyZgbjScz6TKWOAdgNtJJF9kVxd1D+3jq9EycdJKRtigEvCO8fvymYooD9N 6qD/J8KGK9iy7JZzVQY2buGPPPd7qKs5zeHogOimIfsFy+HxX9rvMcnsCY9t3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=VP7fgOwf; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=VP7fgOwf; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 664982BD27 X-Spam-Score: 4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: jnHFGBcgnI5N Since the minimal variant is here to stay, this should make things easier to maintain. * gnu/packages/gtk.scm (at-spi2-core-minimal): Rewrite after removing inheritance, making it the base minimal package, with no documentation-related inputs or build phases. (at-spi2-core): Rewrite definition, inherit from the above minimal variant, adding the documentation-related inputs and build phases. --- gnu/packages/gtk.scm | 195 +++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 110 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5dfdaae7e4..c38fd3e907 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,122 +740,97 @@ (define-public gdk-pixbuf+svg loaders)))))))) (synopsis "Image loading library, with SVG support"))) -(define-public at-spi2-core - (package - (name "at-spi2-core") - (version "2.40.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0a9l6cfxynjn6jcp29d72i75xbkrzs1l5kmqcwmfal801b9sg5j1")))) - (build-system meson-build-system) - (outputs '("out" "doc")) - (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags - ;; Generating documentation requires running binaries for the host - ;; on the build machine. - (list ,(if (%current-target-system) - "-Ddocs=false" - "-Ddocs=true")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-documentation-path - (lambda* (#:key outputs #:allow-other-keys) - ;; Ensure that the cross-references point to the "doc" output. - (substitute* "doc/libatspi/meson.build" - (("docpath =.*") - (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n"))) - #t)) - (add-before 'install 'prepare-doc-directory - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) - #t)) - ;; TODO(core-updates): Unconditionally use (or native-inputs inputs) - (add-after 'unpack 'patch-docbook-sgml - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) - (let* ((xmldoc - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) - "docbook-xml") - "/xml/dtd/docbook"))) - (substitute* "doc/libatspi/libatspi-docs.sgml" - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - #t))) - ,@(if (%current-target-system) - '() - '((add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (copy-recursively - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)))) - (add-after 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service - (string-append %output "/share")) - ;; Don't fail on missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) - (delete 'check)))) - (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) - (propagated-inputs - ;; atspi-2.pc refers to all these. - `(("dbus" ,dbus) - ("glib" ,glib) - ("libx11" ,libx11) - ("libxi" ,libxi) - ("libxtst" ,libxtst))) - (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) - (synopsis "Assistive Technology Service Provider Interface, core components") - (description - "The Assistive Technology Service Provider Interface, core components, +;;; A minimal variant used to prevent a cycle with Inkscape. +(define-public at-spi2-core-minimal + (hidden-package + (package + (name "at-spi2-core") + (version "2.40.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0a9l6cfxynjn6jcp29d72i75xbkrzs1l5kmqcwmfal801b9sg5j1")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'install 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service + (string-append %output "/share")) + ;; Don't fail on missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") ; + (invoke "dbus-launch" "ninja" "test"))) + (delete 'check)))) + (inputs + `(("bash-minimal" ,bash-minimal))) + (propagated-inputs + ;; atspi-2.pc refers to all these. + `(("dbus" ,dbus) + ("glib" ,glib) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxtst" ,libxtst))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (synopsis "Assistive Technology Service Provider Interface, core components") + (description + "The Assistive Technology Service Provider Interface, core components, is part of the GNOME accessibility project.") - (license license:lgpl2.1+) - (home-page "https://wiki.gnome.org/Accessibility/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility/")))) -;;; A minimal variant used to prevent a cycle with Inkscape. -(define at-spi2-core-minimal - (package - (inherit at-spi2-core) - (name "at-spi2-core-minimal") - (outputs (delete "doc" (package-outputs at-spi2-core))) +(define-public at-spi2-core + (package/inherit at-spi2-core-minimal + (outputs (cons "doc" (package-outputs at-spi2-core-minimal))) (arguments - (substitute-keyword-arguments (package-arguments at-spi2-core) - ((#:configure-flags configure-flags) - `(delete "-Ddocs=true" ,configure-flags)) + (substitute-keyword-arguments (package-arguments at-spi2-core-minimal) + ((#:configure-flags flags ''()) + `(cons ,(if (%current-target-system) + "-Ddocs=false" + "-Ddocs=true") + ,flags)) ((#:phases phases) `(modify-phases ,phases - (delete 'set-documentation-path) - (delete 'prepare-doc-directory) - (delete 'move-documentation))))) + (add-after 'unpack 'set-documentation-path + (lambda* (#:key outputs #:allow-other-keys) + ;; Ensure that the cross-references point to the "doc" output. + (substitute* "doc/libatspi/meson.build" + (("docpath =.*") + (string-append "docpath = '" (assoc-ref outputs "doc") + "/share/gtk-doc/html'\n"))))) + (add-before 'install 'prepare-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")))) + ,@(if (%current-target-system) + '() + '((add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc"))))))))))) (native-inputs - (alist-delete "gtk-doc" (package-native-inputs at-spi2-core))))) + (append `(("docbook-xml" ,docbook-xml-4.3) + ("gtk-doc" ,gtk-doc/stable) + ("libxml2" ,libxml2)) ;for XML_CATALOG_FILES + (package-native-inputs at-spi2-core-minimal))) + (properties (alist-delete 'hidden? + (package-properties at-spi2-core-minimal))))) (define-public at-spi2-atk (package -- 2.33.1