From patchwork Mon Oct 23 16:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 55568 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 0B06527BBE2; Sun, 29 Oct 2023 17:44:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 63FE427BBE9 for ; Sun, 29 Oct 2023 17:44:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qx9pw-0001A9-9i; Sun, 29 Oct 2023 13:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qx9pt-00019y-QX for guix-patches@gnu.org; Sun, 29 Oct 2023 13:44:29 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx9pt-0006YE-Fa for guix-patches@gnu.org; Sun, 29 Oct 2023 13:44:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qx9qP-0001Df-R3 for guix-patches@gnu.org; Sun, 29 Oct 2023 13:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66814] [PATCH gnome-team WIP v2] gnu: at-spi2-core: Update to 2.48.4. References: <7249cc2130949445f57d8b9265e0da952d048b6a.1698583747.git.vivien@planete-kraus.eu> In-Reply-To: <7249cc2130949445f57d8b9265e0da952d048b6a.1698583747.git.vivien@planete-kraus.eu> Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Oct 2023 17:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66814@debbugs.gnu.org Cc: rg@raghavgururajan.name, Vivien Kraus , maxim.cournoyer@gmail.com Received: via spool by 66814-submit@debbugs.gnu.org id=B66814.16986014464606 (code B ref 66814); Sun, 29 Oct 2023 17:45:01 +0000 Received: (at 66814) by debbugs.gnu.org; 29 Oct 2023 17:44:06 +0000 Received: from localhost ([127.0.0.1]:43297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx9pV-0001CD-CA for submit@debbugs.gnu.org; Sun, 29 Oct 2023 13:44:05 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:60888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx9pQ-0001BV-Ah for 66814@debbugs.gnu.org; Sun, 29 Oct 2023 13:44:04 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-542d654d03cso1911136a12.1 for <66814@debbugs.gnu.org>; Sun, 29 Oct 2023 10:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698601401; x=1699206201; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:message-id:from:from:to:cc:subject :date:message-id:reply-to; bh=Ki9YPAyN6tAJc/JaaS+EhnGoDBfPJ3gv9lQkSQ6bEVg=; b=bJLOnPthF1HrPmitAAHDbsQIAURzJZNJV5CLJES5VAs+mnd9dpqEU8UWkjX2yKIK3P PiWx40pg4/BWU+jkMVY5oO6+8C+9YSIM2o9PN0bNFW4ZcSwMElvKQvTINOkQQ/M9J5nt bn6a2ZO+11gLI5SbbhkAfT8LqX+zvLG0PT2tqblt7iH3NNbECBoLHNm3vU9jXaVajc5z k4u/Ix/B5ytXm9rsfEKKly2tUu0CdkmaxqgclJXMS5848HbhkQ7ASVgxTOnV3BhftWtW gMXebNWZ0zjMO3DS4HI8NlmuwjMY7kjip25/5GWEiAcIIoLTd7AkxaHB6tOTodw/ct6z wkcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698601401; x=1699206201; h=mime-version:cc:to:subject:date:message-id:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ki9YPAyN6tAJc/JaaS+EhnGoDBfPJ3gv9lQkSQ6bEVg=; b=XvJz2LAnfsNpNX2WdCTpM85W4RdHzF/V4RrJTmNeHidLIwa1TCvY+Z4wS2erc9st9g MxPWG8dN57cW8kf2Hmzlscgt2I2sxjvu8kR8SlvvoQPrJELBhBrTJgP+2wSSE5CPd9T+ ocvMRNBHhmoYnSIu2s+3ftIvMVysB6ouOLsfzzH0lVLFY9rab+I/Ki5l16fVGC2U/QqU hxZbMlJPsGt+lYWcmTM8ZCMwUjDECOvxdCXct1e26GLgQX41xg+8a08/BYqyhkDlw4hc mIrMQ0WhfavphosYSGMLQ+Pj4yvCy4nrK/O5Jml/k7vm62W42hLrDB0XFsyowY75aHyh bINA== X-Gm-Message-State: AOJu0Yz/lZEilb3mCjVljDum+B7dzt9clYIS0J/uazR2XtouQ0lGkQ9D HXl3xhO6wOiPhdMdfJVlRuZTM1B/rzopgw== X-Google-Smtp-Source: AGHT+IGEYMOIPz5T3bXtV7F7nciBNSQ6EOMyqFXjvR7I3/WZR5Oiu+9HlP3HelGpiBW/bbXa7kVeEw== X-Received: by 2002:a05:6402:651:b0:533:520:a5a8 with SMTP id u17-20020a056402065100b005330520a5a8mr5900507edx.29.1698601401494; Sun, 29 Oct 2023 10:43:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n27-20020a5099db000000b0053116e45317sm4863730edb.44.2023.10.29.10.43.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 10:43:20 -0700 (PDT) From: Vivien Kraus X-Google-Original-From: Vivien Kraus Message-ID: <9b1b828225740531672a3ae2cbe0420013dc931f.1698601268.git.liliana.prikler@gmail.com> Date: Mon, 23 Oct 2023 18:20:53 +0200 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gtk.scm (at-spi2-core): Update to 2.48.4. (at-spi2-core-with-documentation)[#:phases]: Adjust accordingly. [native-inputs]: Remove docbook-xml-4.3 and gtk-doc/stable. Add gi-docgen, python, and python-sphinx. Change-Id: I3fc09c79f1ae5594fe9ad50e7212fbee11ce8a90 Co-authored-by: Liliana Marie Prikler --- Hi Vivien, your patch sadly caused the documentation build to fail. Below is a revised version that builds, albeit without tests. The original package is sadly written in a way that doesn't allow to easily disable tests, but more importantly, the tests actually fail with the documentation enabled. We should investigate as to why that happens. Cheers gnu/packages/gtk.scm | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) base-commit: 2677bf985c0025d04ffdcff31763978b633dbc58 prerequisite-patch-id: 3931d81d2155eb6c9bc99ea2d6d31a88377eda1c prerequisite-patch-id: 226444cea9d3b0974377ad049735cd82b44be03a prerequisite-patch-id: 1a7bf978a65eaae43a37fb40be6b4882652afb60 prerequisite-patch-id: efd150ce5309a68704db0bf22f477e93f231c0a9 prerequisite-patch-id: 3e54a72abd9d3b8ba43db1579ba3d03ad9f09235 prerequisite-patch-id: b37777e77370089c61c3e0cf1e77726fda827839 prerequisite-patch-id: 6d3d08c2f7a78de0a37aa439eee13eb4b8617e64 prerequisite-patch-id: d9f3cae36515204c9ed3b95108e510c0f65191b5 prerequisite-patch-id: 3bc4d0d28f6888944494494aeeac006b9b6c4069 prerequisite-patch-id: 0c122ec94fb2c0f9a2b416880f95e38a86119ce3 prerequisite-patch-id: 5648fb1ad60f3b49ed5e7942942b6780eb088c15 prerequisite-patch-id: 1cb3f92d09106b3f6136a18103a32e1801eeba41 prerequisite-patch-id: e69edd73b93d50e3c4ce78ac07af21b8743df518 prerequisite-patch-id: 83c27d6e791400fbf76220dc02a883d798ab72b0 prerequisite-patch-id: b2c8766578b5aeb5d9b1ba1722db93e8040e6a7a prerequisite-patch-id: d88a09d78da3fff7de925022f57b037dbdb7b114 prerequisite-patch-id: 5f72a047ed04a1a063b08904e6523212ce639bf2 prerequisite-patch-id: a6bbbc23395653f93da46ceebc2b065599978218 prerequisite-patch-id: ca443a72e9397405d895f633da92b048369ed8d2 prerequisite-patch-id: c779825b86ad4f937269a8995a1fcb162b7643b3 diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 21a12689b7..c0435304b4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -106,6 +106,7 @@ (define-module (gnu packages gtk) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages gstreamer) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) @@ -792,7 +793,7 @@ (define-public at-spi2-core (hidden-package (package (name "at-spi2-core") - (version "2.45.90") + (version "2.48.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -800,7 +801,7 @@ (define-public at-spi2-core name "-" version ".tar.xz")) (sha256 (base32 - "03dba3c6m3sfapkkbbgzvbi1qcmrrlppydxjjs1m8ds9qb9hl1g9")))) + "05d5azffbglnvqzwk8ngg61jksm3brrwhmfpymsrccz8j8lv3v19")))) (build-system meson-build-system) (arguments (list @@ -864,28 +865,17 @@ (define-public at-spi2-core-with-documentation #$flags)) ((#:phases phases) #~(modify-phases #$phases + (delete 'check) ; XXX: dbus-daemon terminated by signal 11 (add-after 'unpack 'set-documentation-path (lambda _ ;; Ensure that the cross-references point to the "doc" output. - (substitute* "doc/libatspi/meson.build" - (("docpath =.*") - (string-append "docpath = '" #$output:doc - "/share/gtk-doc/html'\n"))))) - (add-before 'install 'prepare-doc-directory - (lambda _ - (mkdir-p (string-append #$output:doc "/share")))) - #$@(if (%current-target-system) - #~() - #~((add-after 'install 'move-documentation - (lambda _ - (copy-recursively - (string-append #$output "/share/gtk-doc") - (string-append #$output:doc "/share/gtk-doc")) - (delete-file-recursively - (string-append #$output "/share/gtk-doc")))))))))) + (substitute* "doc/meson.build" + (("docs_dir =.*") + (string-append "docs_dir = '" #$output:doc + "/share/doc'\n"))))))))) (native-inputs (modify-inputs (package-native-inputs at-spi2-core) - (append docbook-xml-4.3 gtk-doc/stable))) + (append gi-docgen python python-sphinx))) (properties (alist-delete 'hidden? (package-properties at-spi2-core)))))