From patchwork Thu Mar 30 21:48:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48831 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 9937B17280; Thu, 30 Mar 2023 22:49:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 3E37D171ED for ; Thu, 30 Mar 2023 22:49:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08m-00084V-GI; Thu, 30 Mar 2023 17:49:04 -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 1pi08l-00083l-57 for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pi08k-0003IZ-TB for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pi08k-0000lB-Oz for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62553] [PATCH core-updates 1/6] gnu: Replace all uses of atk by at-spi2-core. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62553@debbugs.gnu.org Received: via spool by 62553-submit@debbugs.gnu.org id=B62553.16802129102824 (code B ref 62553); Thu, 30 Mar 2023 21:49:02 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:30 +0000 Received: from localhost ([127.0.0.1]:59639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08C-0000j7-Hf for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:30 -0400 Received: from jpoiret.xyz ([206.189.101.64]:32780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi089-0000ia-Os for 62553@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:27 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id D924718530D; Thu, 30 Mar 2023 21:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAZAaCHd89caoCKSS9PflSaZwuF/gh/2eTff9qw9lkk=; b=hQ6coh6RktPk3+ksCGLwjk2iiFissllpDBooEM6/B2W+svuIHM+tLGWud5UA2I2r/x8BZi azG+HzVi6zVauMQ0sDATKNz0ZLo9hXlYcgMylPvHG2p7zV6G6Vf0v59hUYztk3Baf/ar+M ZgF207E21aUywUntlZMvW7ITCfHau/P2ObA/WWwTvvDZTh6FCy8WtfD9LUvzoaIQgx9nge 3hoN5j3hho0imHDqnzHdnq3EmESWXFtwneUettVsf0I2gVS+GwJXKi4s0f0yRWNyGIO6cn GvTUzQxtxLBsm4+Ffg1pBcND+weADBNOFAyBhLIQwq9cCHZOXTU9ivCCa1E19A== Date: Thu, 30 Mar 2023 23:48:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/animation.scm (gnash) * gnu/packages/chromium.scm (ungoogled-chromium) * gnu/packages/crates-gtk.scm (rust-atk-sys-0.14, rust-atk-sys-0.10, rust-atk-0.14, rust-gtk-0.14) * gnu/packages/gimp.scm (gimp) * gnu/packages/gnome.scm (evince, glade3, clutter, totem, rhythmbox, mutter, ghex): * gnu/packages/graphviz.scm (xdot) * gnu/packages/gtk.scm (gtk+-2, gtk+, guile-gnome, atkmm) * gnu/packages/mate.scm (mate-applets, atril, mate-control-center, mate-calc, mate-utils, eom, pluma) * gnu/packages/messaging.scm (dino) * gnu/packages/qt.scm (qtwebengine-5) * gnu/packages/rust-apps.scm (alfis) * gnu/packages/vim.scm (vim-full) * gnu/packages/vnc.scm (remmina) * gnu/packages/web.scm (castor): Replace atk by at-spi2-core. --- gnu/packages/animation.scm | 2 +- gnu/packages/chromium.scm | 1 - gnu/packages/crates-gtk.scm | 8 ++++---- gnu/packages/gimp.scm | 2 +- gnu/packages/gnome.scm | 14 +++++++------- gnu/packages/graphviz.scm | 2 +- gnu/packages/gtk.scm | 9 ++++----- gnu/packages/mate.scm | 14 +++++++------- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 2 +- gnu/packages/rust-apps.scm | 2 +- gnu/packages/vim.scm | 2 +- gnu/packages/vnc.scm | 2 +- gnu/packages/web.scm | 2 +- 14 files changed, 31 insertions(+), 33 deletions(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 33fc3fcce9..4c03b78717 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -260,7 +260,7 @@ (define-public gnash ("python" ,python-wrapper))) (inputs `(("agg" ,agg) - ("atk" ,atk) + ("at-spi2-core" ,at-spi2-core) ("boost" ,boost) ("curl" ,curl) ("ffmpeg" ,ffmpeg-2.8) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 47153e3531..22e22cdbf8 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -898,7 +898,6 @@ (define-public ungoogled-chromium wayland)) (inputs (list alsa-lib - atk at-spi2-core cups curl diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 403c1f2aef..1c99c87bb6 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -60,7 +60,7 @@ (define-public rust-atk-sys-0.14 ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs (list pkg-config)) (inputs - (list atk glib)) + (list at-spi2-core glib)) (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libatk-1") (description "FFI bindings to libatk-1") @@ -90,7 +90,7 @@ (define-public rust-atk-sys-0.10 ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs (list pkg-config)) (inputs - (list atk glib)))) + (list at-spi2-core glib)))) (define-public rust-atk-sys-0.9 (package @@ -138,7 +138,7 @@ (define-public rust-atk-0.14 #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (inputs - (list atk glib)) + (list at-spi2-core glib)) (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the ATK library") (description "Rust bindings for the ATK library") @@ -1469,7 +1469,7 @@ (define-public rust-gtk-0.14 (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (native-inputs (list pkg-config)) (inputs - (list atk cairo glib gtk+ pango)) + (list at-spi2-core cairo glib gtk+ pango)) (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GTK+ 3 library") (description "This package provides Rust bindings for the GTK+ 3 library.") diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index af5adb8bfd..73102e30cf 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -333,7 +333,7 @@ (define-public gimp ;; ./configure requests not to annoy upstream with packaging bugs. "--with-bug-report-url=https://bugs.gnu.org/guix"))) (inputs - (list atk + (list at-spi2-core babl gegl gexiv2 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e2ee396819..e81882b181 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2704,7 +2704,7 @@ (define-public evince libgnome-keyring adwaita-icon-theme gdk-pixbuf - atk + at-spi2-core pango gtk+ glib @@ -3299,7 +3299,7 @@ (define-public glade3 '()) (list gtk+ libxml2))) (native-inputs - (list atk ;for tests + (list at-spi2-core ;for tests docbook-xml-4.2 docbook-xsl gettext-minimal @@ -6357,7 +6357,7 @@ (define-public clutter libxslt pkg-config)) (propagated-inputs - (list atk + (list at-spi2-core cairo cogl glib @@ -6744,7 +6744,7 @@ (define-public totem (inputs (list gtk+ gdk-pixbuf - atk + at-spi2-core cairo dbus-glib xorgproto @@ -6866,7 +6866,7 @@ (define-public rhythmbox ;;clutter-gtk ;;clutter-gst (list adwaita-icon-theme - atk + at-spi2-core bash-minimal brasero json-glib @@ -8021,7 +8021,7 @@ (define-public mutter (list gsettings-desktop-schemas-next ;required by libmutter.pc gtk+ ;required by libmutter.pc ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: - atk + at-spi2-core cairo eudev gdk-pixbuf @@ -11646,7 +11646,7 @@ (define-public ghex pkg-config yelp-tools)) (inputs - (list atk + (list at-spi2-core gtk)) (synopsis "GNOME hexadecimal editor") (description "The GHex program can view and edit files in two ways: diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index aa3cee6e5b..d98041d73a 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -346,7 +346,7 @@ (define-public xdot `("PATH" ":" prefix (,(dirname (search-input-file inputs "bin/dot")))))))))) (inputs - (list atk + (list at-spi2-core (librsvg-for-system) harfbuzz graphviz diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 65854e0ba0..a19c9c372b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -934,7 +934,7 @@ (define-public gtk+-2 (build-system gnu-build-system) (outputs '("out" "bin" "doc" "debug")) (propagated-inputs - (list atk + (list at-spi2-core cairo glib (librsvg-for-system) @@ -1030,8 +1030,7 @@ (define-public gtk+ (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (propagated-inputs - (list atk - at-spi2-core + (list at-spi2-core cairo fribidi fontconfig @@ -1587,7 +1586,7 @@ (define-public guile-gnome (build-system gnu-build-system) (native-inputs (list pkg-config - atk + at-spi2-core ;;("corba" ,corba) ; not packaged yet gconf gobject-introspection @@ -1797,7 +1796,7 @@ (define-public atkmm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list glibmm atk)) + (list glibmm at-spi2-core)) (synopsis "C++ bindings for ATK") (description "ATKmm is the C++ binding for the ATK library.") (home-page "https://wiki.gnome.org/Accessibility") diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 2f38946fe1..4874aaf7f9 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -521,7 +521,7 @@ (define-public mate-applets docbook-xml gobject-introspection)) (inputs - (list atk + (list at-spi2-core dbus dbus-glib glib @@ -732,7 +732,7 @@ (define-public atril ("xmllint" ,libxml2) ("zlib" ,zlib))) (inputs - `(("atk" ,atk) + `(("at-spi2-core" ,at-spi2-core) ("cairo" ,cairo) ("caja" ,caja) ("dconf" ,dconf) @@ -921,7 +921,7 @@ (define-public mate-control-center xmodmap gobject-introspection)) (inputs - `(("atk" ,atk) + `(("at-spi2-core" ,at-spi2-core) ("cairo" ,cairo) ("caja" ,caja) ("dconf" ,dconf) @@ -1061,7 +1061,7 @@ (define-public mate-calc (native-inputs (list gettext-minimal intltool pkg-config yelp-tools)) (inputs - (list atk + (list at-spi2-core glib gtk+ libxml2 @@ -1228,7 +1228,7 @@ (define-public mate-utils xorgproto yelp-tools)) (inputs - (list atk + (list at-spi2-core cairo glib gtk+ @@ -1277,7 +1277,7 @@ (define-public eom pkg-config yelp-tools)) (inputs - (list atk + (list at-spi2-core cairo dconf dbus @@ -1382,7 +1382,7 @@ (define-public pluma ("pkg-config" ,pkg-config) ("yelp-tools" ,yelp-tools))) (inputs - (list atk + (list at-spi2-core cairo enchant-1.6 glib diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index bbd1743cac..1cef8d4811 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1373,7 +1373,7 @@ (define-public dino vala)) (inputs (list adwaita-icon-theme - atk + at-spi2-core bash-minimal cairo librsvg diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0208312bd5..407ae1dd5d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2640,7 +2640,7 @@ (define-public qtwebengine-5 ruby)) (inputs (list alsa-lib - atk + at-spi2-core cups-minimal curl dbus diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index b8cb06af64..5ec82009af 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -177,7 +177,7 @@ (define-public alfis (native-inputs (list pkg-config)) (inputs - (list atk + (list at-spi2-core gtk glib pango diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 6baf10915a..d555194d0b 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -243,7 +243,7 @@ (define-public vim-full (prepend pkg-config xorg-server-for-tests))) (inputs `(("acl" ,acl) - ("atk" ,atk) + ("at-spi2-core" ,at-spi2-core) ("attr" ,attr) ("cairo" ,cairo) ("fontconfig" ,fontconfig) diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index fc272ae621..37c9ae0619 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -123,7 +123,7 @@ (define-public remmina pkg-config)) (inputs (list libappindicator - atk + at-spi2-core avahi cairo cups diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b1d6e8768b..24f5021889 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6628,7 +6628,7 @@ (define-public castor (native-inputs (list pkg-config)) (inputs - (list atk + (list at-spi2-core cairo gdk-pixbuf gtk+