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+ From patchwork Thu Mar 30 21:48:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48830 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 2427F17278; Thu, 30 Mar 2023 22:49:48 +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 0C533171ED for ; Thu, 30 Mar 2023 22:49:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08m-00084L-78; 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 1pi08k-00083d-Pw for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:02 -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-0003IU-F7 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-0000l3-8l 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 2/6] gnu: atkmm: Update to 2.36.2. 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.16802129082800 (code B ref 62553); Thu, 30 Mar 2023 21:49:02 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:28 +0000 Received: from localhost ([127.0.0.1]:59635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08C-0000j5-4K for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:28 -0400 Received: from jpoiret.xyz ([206.189.101.64]:32852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08A-0000ig-3B for 62553@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:26 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 51D66185320; Thu, 30 Mar 2023 21:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212905; 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=8b4c/vGFsG+b/nFBcmKf4GYIFu+1UhCngoPjkBXbp3c=; b=wqbua6TYYauj5Y1HLsivsmTeTn48zG+kyr3mWNhQrYDrF2YuKIn93S2AjC8OjZhLXUjl1j Gc+CPzv6ahqEPQpA1pLfdeXmtejkRniszpSA3uHtq4/p+Ko/aA31S9F6ak2bNxIcUynShD gbpcPA5hSczIS1PMOyA4Fv/XkCHFKF0pOcz12oib6bBkrVelgL9sC4ZumWTE/PtJNvGuXR UkR8WMtYAnU5qUsT6dSL9offaQbZdyPa9TPI82AlhJ48SuLnbGJ8+uT2TJjf9RdxpTYJXn OQd1A18OqnF/WCODIGkUR/ezjwGFsd9LW9VzNV3jpVtGT0/8kEf8qEij/gZmKA== Date: Thu, 30 Mar 2023 23:48:14 +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/gtk.scm (atkmm): Update it. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a19c9c372b..48e78146aa 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1760,7 +1760,7 @@ (define-public pangomm-2.46 (define-public atkmm (package (name "atkmm") - (version "2.36.0") + (version "2.36.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1768,7 +1768,7 @@ (define-public atkmm name "-" version ".tar.xz")) (sha256 (base32 - "0wwr0663jrqx2klsasffd9wpk3kqnwisj1y3ahdkjdk5hzrsjgy9")))) + "0yg0v8f0xms2cfj1r9q6yrl4757wrivpb4q56rbmx626yycxsqkg")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments From patchwork Thu Mar 30 21:48:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48828 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 7573F17280; Thu, 30 Mar 2023 22:49:19 +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 CCBB8171ED for ; Thu, 30 Mar 2023 22:49:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08o-00085W-3M; Thu, 30 Mar 2023 17:49:06 -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-00083u-J6 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 1pi08l-0003Ig-B3 for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pi08l-0000lI-7S for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62553] [PATCH core-updates 3/6] gnu: atk: Deprecate in favor of 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:03 +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.16802129172859 (code B ref 62553); Thu, 30 Mar 2023 21:49:03 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:37 +0000 Received: from localhost ([127.0.0.1]:59645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08L-0000k3-4E for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:37 -0400 Received: from jpoiret.xyz ([206.189.101.64]:32926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08B-0000ip-4i 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 2AC7E185326; Thu, 30 Mar 2023 21:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212906; 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=xTxREodDbNZopnHvJ25iGPKyodr/2vly0Y/A/a3Tz8I=; b=J1Gmo69zBomhT8eM06vKvIeLarnpL3GaPx/KyiwWM2NWQpifM0xfYGEXN18bVKUX1TAETA rCu4sKBdGQ5qkdG1gCoBY5ewMK/YxOvyjOhwUxClD5BoTFy63z29KydtsSfrKdwpBPp9C+ zfwekwVsoKVXznSA61l6uUTrw1hSqc2kUzygULWooTMfD13TayLhVIsuGvNEUzflQXQ6mi yJJF17SAj5Sa5SkWPOzTqkRVdxRTyCiWvIve7Uv9IbEabOn8H7BXBALo+hCJhG/a7PB1DH AlfmGteDzOl3ffgBYq0a62zKA/Xdjvsbu4hV4gmiogyXhi8qZz80spP5u3zf/g== Date: Thu, 30 Mar 2023 23:48:15 +0200 Message-Id: <2036141189dd221b780af10a59888e27e0fe6dc7.1680212316.git.dev@jpoiret.xyz> 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/gtk.scm (atk): Deprecate. --- gnu/packages/gtk.scm | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 48e78146aa..93dad032cd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -158,41 +158,6 @@ (define-public appmenu-gtk-module (home-page "https://gitlab.com/vala-panel-project/vala-panel-appmenu") (license (list license:lgpl3)))) -(define-public atk - (package - (name "atk") - (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 - "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv")))) - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - ,@(if (%current-target-system) - `(#:configure-flags - ;; introspection requires running binaries for the host system - ;; on the build system. - '("-Dintrospection=false")) - '()))) - (propagated-inputs (list glib)) ; required by atk.pc - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler, etc. - ("pkg-config" ,pkg-config))) - (synopsis "GNOME accessibility toolkit") - (description - "ATK provides the set of accessibility interfaces that are implemented -by other toolkits and applications. Using the ATK interfaces, accessibility -tools have full access to view and control running applications.") - (license license:lgpl2.1+) - (home-page "https://wiki.gnome.org/Accessibility"))) - (define-public cairo (package (name "cairo") @@ -915,6 +880,9 @@ (define-public at-spi2-core-with-documentation (define-public at-spi2-atk (deprecated-package "at-spi2-atk" at-spi2-core)) +(define-public atk + (deprecated-package "atk" at-spi2-core)) + (define-public gtk+-2 (package (name "gtk+") From patchwork Thu Mar 30 21:48:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48832 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 6182917278; Thu, 30 Mar 2023 22:49:58 +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 E43AB171ED for ; Thu, 30 Mar 2023 22:49:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08m-00084p-RX; 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 1pi08m-000845-1r for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -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 1pi08l-0003Im-QC for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pi08l-0000lP-MU for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62553] [PATCH core-updates 4/6] gnu: gpgme: Propagate libassuan. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 21:49:03 +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.16802129182867 (code B ref 62553); Thu, 30 Mar 2023 21:49:03 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:38 +0000 Received: from localhost ([127.0.0.1]:59647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08L-0000k9-Mx for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:37 -0400 Received: from jpoiret.xyz ([206.189.101.64]:32990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08C-0000iz-2v for 62553@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:28 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 553DE18530D; Thu, 30 Mar 2023 21:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212907; 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=Eu7ymwHb0bTHfD3ny1f7y9QjeCcwisVtr2YIWR8zxY0=; b=anEtweAnkHCc0932QKJwvTQCa8ueNjcmdpLYUt8DGGrWcyBo+PHedk0NgAdw9lYMltWsZ+ zoQ5g814yKAaEwSyo4cGQAltXCR8I3OyAOw3lNhcr6DZpDxvtUAf0+ZFcMVCTn9NvBmdtV EXaUHrnMDdPkCieiLcdaJVlFYKHIWrZLeUzmcbzEsd4uoY+qMeuIlITBTSjxXd3kSMFCge dx89g8Iyz3+3wOg/X37rdDYxvAUsIWV11eNaZaifRI5WU5UwI3L5IOT9oA2YBL/vkjgxV/ u0MvwWbiISkxh+uK2zpMRBn09GKtdPyflvLKMZODMdG5oi9TJPkag7eirKJlvQ== Date: Thu, 30 Mar 2023 23:48:16 +0200 Message-Id: <4c67fee4b6635440e3a43f8bf1cd6ea2a472b2e4.1680212316.git.dev@jpoiret.xyz> 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/gnupg.scm (gpgme): Propagate libassuan. --- gnu/packages/gnupg.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 9b00338178..42013f1b94 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -398,10 +398,8 @@ (define-public gpgme (native-inputs (list gnupg)) (propagated-inputs - ;; Needs to be propagated because gpgme.h includes gpg-error.h. - (list libgpg-error)) - (inputs - (list libassuan)) + ;; As required by the pkg-config's Requires.private. + (list libgpg-error libassuan)) (home-page "https://www.gnupg.org/related_software/gpgme/") (synopsis "Library providing simplified access to GnuPG functionality") (description From patchwork Thu Mar 30 21:48:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48827 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 08A9217280; Thu, 30 Mar 2023 22:49:11 +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 31FDB171ED for ; Thu, 30 Mar 2023 22:49:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08o-00085T-2Z; Thu, 30 Mar 2023 17:49:06 -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 1pi08m-00084Y-Gf for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -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 1pi08m-0003Is-8d for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pi08m-0000lX-4V for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62553] [PATCH core-updates 5/6] gnu: Remove gpgme-1.18 and qgpgme-1.18. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 21:49:04 +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.16802129182875 (code B ref 62553); Thu, 30 Mar 2023 21:49:04 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:38 +0000 Received: from localhost ([127.0.0.1]:59649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08M-0000kD-0I for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:38 -0400 Received: from jpoiret.xyz ([206.189.101.64]:33060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08C-0000jD-TB for 62553@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:29 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3DEFD185320; Thu, 30 Mar 2023 21:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212908; 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=n/uco8lz+ho5foARGGdVf3ccSNizj4mq9pOBzpVrCcc=; b=D7jYqnoeZ4VJmS40R4Qu4pQxgiNjTkAGlNubxdf9D8TKFZ3yenPr25Vu3PtbQ3Ts9m8vm8 WLsP9US9qcgAgHaAOGvxcvE/R2P44KPM0u1bY8bTRZ8vpWLqVL+sBmfnjbOYLRM8t82YEp nRzROsuILCPHkcwgraP+in/qPWCkVu0nsQzxN7RQaJRGNZjYwStikX+8zsUo1jaWh+fKEs zbDF3C1twiEe32rC+Rs8LbEwt1+ZlGIp4+KrBwE/YsjtvDLQDXHEaVtszQSeg2lOvVX5zC or45D1vVSP/1BkoOdk1bKt+XGgNtC6OIfM2MzCJq9cy8yIBYLBV4Nqe11mjYYw== Date: Thu, 30 Mar 2023 23:48:17 +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/gnupg.scm (gpgme-1.18, qgpgme-1.18): Remove. * gnu/packages/kde-pim.sm (kleopatra, kmail): Refer to gpgme and qgpgme instead. --- gnu/packages/gnupg.scm | 23 ----------------------- gnu/packages/kde-pim.scm | 8 ++++---- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 42013f1b94..49d29ed9bd 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -416,19 +416,6 @@ (define-public gpgme (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/gpgme"))))) -;; TODO: Merge with gpgme in the next rebuild cycle. -(define-public gpgme-1.18 - (package - (inherit gpgme) - (version "1.18.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/gpgme/gpgme-" - version ".tar.bz2")) - (sha256 - (base32 - "17hfigfnq6xz45b5xrp299f68b5mwx0aysd51sx5v4nf8yp4w79n")))))) - (define-public qgpgme (package (inherit gpgme) @@ -457,16 +444,6 @@ (define-public qgpgme gpgpme starting with version 1.7.") (license license:gpl2+))) ;; Note: this differs from gpgme -;; TODO: Merge with qgpgme in the next rebuild cycle. -(define-public qgpgme-1.18 - (package - (inherit qgpgme) - (version (package-version gpgme-1.18)) - (source (package-source gpgme-1.18)) - (inputs - (modify-inputs (package-inputs qgpgme) - (replace "gpgme" gpgme-1.18))))) - (define-public guile-gcrypt (package (name "guile-gcrypt") diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 19066fd289..6f3cbf2999 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1139,7 +1139,7 @@ (define-public kleopatra kdoctools)) (inputs (list boost - gpgme-1.18 + gpgme kcmutils kcodecs kconfig @@ -1159,7 +1159,7 @@ (define-public kleopatra libassuan libkleo breeze-icons ;; default icon set - qgpgme-1.18 + qgpgme qtbase-5)) (arguments `(#:phases @@ -1196,7 +1196,7 @@ (define-public kmail akonadi-mime akonadi-search boost - gpgme-1.18 + gpgme grantlee grantleetheme kbookmarks @@ -1243,7 +1243,7 @@ (define-public kmail libkleo libksieve breeze-icons ; default icon set, required for tests - qgpgme-1.18 + qgpgme qtbase-5 qtdeclarative-5 qtkeychain From patchwork Thu Mar 30 21:48:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48829 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 BD53417278; Thu, 30 Mar 2023 22:49:31 +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 1A1DE171ED for ; Thu, 30 Mar 2023 22:49:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08p-00085r-BN; Thu, 30 Mar 2023 17:49:07 -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 1pi08m-00084r-Vw for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:05 -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 1pi08m-0003J0-Of for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pi08m-0000le-KF for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62553] [PATCH core-updates 6/6] gnu: zsh: Patch failing test that uses egrep. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 21:49:04 +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.16802129182881 (code B ref 62553); Thu, 30 Mar 2023 21:49:04 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:38 +0000 Received: from localhost ([127.0.0.1]:59651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08M-0000kK-CG for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:38 -0400 Received: from jpoiret.xyz ([206.189.101.64]:32990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08D-0000iz-Ev for 62553@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:30 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 0BABB18530D; Thu, 30 Mar 2023 21:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212909; 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=mM5HwWlMeIbxDtgyoTwQTwBSj5tBPsq+CS04HqGn5n4=; b=J/SyiZlLTZf1CrYIrU4NmOBGohxd1ERT9C09ez0N6BPhXciu0HCfLt9F7651PehFzoCoHC iywdU1MKqMawohRvb/SQDCtxOZfpAITBWNI9W/5HRwYAPrhZGlvqYorWDfm5J+CTmL/xfF BW+ovEt6zrpLXJyo8yfOi0W4FMUAn3N0LW8Vt6oU8TmJ/Vv7FPRR4k50EIIUnE6wC0wBMg GDe8e3kVwg2IFhzGYCOfKDZ0ltOZq759SKsaH+1l7BmRziJ/Z9NWDFUOOd2taKkJ0Xr60I QWCvhhMpwwxgcUHznH1nwFxjEdbnbaWaGHL73ho/7BscQHIANKPNOtBi9+lMIQ== Date: Thu, 30 Mar 2023 23:48:18 +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/patches/zsh-egrep-failing-test.patch: New file. * gnu/packages/shells.scm (zsh): Patch it. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 3 ++- gnu/packages/patches/zsh-egrep-failing-test.patch | 11 +++++++++++ gnu/packages/shells.scm | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/zsh-egrep-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 58437b7a0e..21f0993a3f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2040,7 +2040,8 @@ dist_patch_DATA = \ %D%/packages/patches/xterm-370-explicit-xcursor.patch \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ - %D%/packages/patches/zig-use-system-paths.patch + %D%/packages/patches/zig-use-system-paths.patch \ + %D%/packages/patches/zsh-egrep-failing-test.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/patches/zsh-egrep-failing-test.patch b/gnu/packages/patches/zsh-egrep-failing-test.patch new file mode 100644 index 0000000000..10828ca6bb --- /dev/null +++ b/gnu/packages/patches/zsh-egrep-failing-test.patch @@ -0,0 +1,11 @@ +--- a/Test/E01options.ztst 2023-03-30 21:34:12.372309112 +0200 ++++ b/Test/E01options.ztst 2023-03-30 21:34:33.212335339 +0200 +@@ -649,7 +649,7 @@ + >noktarg1 + >0 1 + +- showopt() { setopt | egrep 'localoptions|ksharrays'; } ++ showopt() { setopt | grep -E 'localoptions|ksharrays'; } + f1() { setopt localoptions ksharrays; showopt } + f2() { setopt ksharrays; showopt } + setopt kshoptionprint diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5ca8d842c2..26cbbe67dd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -467,7 +467,8 @@ (define-public zsh ".tar.xz"))) (sha256 (base32 - "06crvpqbpm8sq5c215f4b985z7npwnqnj0i0g53hnq6fp8h3b5xn")))) + "06crvpqbpm8sq5c215f4b985z7npwnqnj0i0g53hnq6fp8h3b5xn")) + (patches (search-patches "zsh-egrep-failing-test.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags `("--with-tcsetpgrp"