From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UN7OESaTPl9XKwAA0tVLHw (envelope-from ) for ; Thu, 20 Aug 2020 15:13:42 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id GJGoDSaTPl8hcwAA1q6Kng (envelope-from ) for ; Thu, 20 Aug 2020 15:13:42 +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 EB3F69403A0 for ; Thu, 20 Aug 2020 15:13:41 +0000 (UTC) Received: from localhost ([::1]:52458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8mG4-0001b7-Qu for larch@yhetil.org; Thu, 20 Aug 2020 11:13:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8mEZ-0007M4-GH for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8mEZ-00071i-39 for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8mEY-0006DC-Uh for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 25/29] gnu: at-spi2-core: Update package definition. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Aug 2020 15:12:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Cc: Raghav Gururajan , Danny Milosavljevic Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.159793629223673 (code B ref 42958); Thu, 20 Aug 2020 15:12:06 +0000 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:32 +0000 Received: from localhost ([127.0.0.1]:43504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDz-00069e-GP for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:32 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDW-00064m-EK for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 4FD593368233; Thu, 20 Aug 2020 17:11:01 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 20 Aug 2020 17:10:46 +0200 Message-Id: <20200820151050.9529-25-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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-Spam-Score: 3.99 X-TUID: E/rXyFbSqtuQ From: Raghav Gururajan * gnu/packages/gtk.scm (at-spi2-core): Update to 2.36.0. [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. [arguments]<#:phases>['patch-docbook-sgml]: New phase. [native-inputs]: Add docbook-xml and python-wrapper. [propagated-inputs]: Add libx11. [home-page]: Modify. [license]: Update to lgpl2.1+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 144 ++++++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 65 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7e32b7623b..5198754b2c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -594,72 +594,86 @@ scaled, composited, modified, saved, or rendered.") (define-public at-spi2-core (package - (name "at-spi2-core") - (version "2.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn")))) - (build-system meson-build-system) - (outputs '("out" "doc")) - (arguments - '(#:configure-flags - (list "-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)) - (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"))) + (name "at-spi2-core") + (version "2.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8")))) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas. + #:configure-flags + (list + "-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)) + (add-after 'unpack 'patch-docbook-sgml + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook"))) + (substitute* "doc/libatspi/libatspi-docs.sgml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) + (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)))) - (propagated-inputs - ;; atspi-2.pc refers to all these. - `(("dbus" ,dbus) - ("glib" ,glib) - ("libxi" ,libxi) - ("libxtst" ,libxtst))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (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.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) + (propagated-inputs + `(("dbus" ,dbus) + ("glib" ,glib) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxtst" ,libxtst))) + (synopsis "Assistive Technology Service Provider Interface, core components") + (description "The Assistive Technology Service Provider Interface, +core components, is part of the GNOME accessibility project.") + (home-page "https://wiki.gnome.org/Accessibility/") + (license license:lgpl2.1+))) ;;; A minimal variant used to prevent a cycle with Inkscape. (define at-spi2-core-minimal