From patchwork Wed Nov 6 20:41:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: paul X-Patchwork-Id: 32978 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 8208C27BBEA; Wed, 6 Nov 2024 20:42:42 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 007B727BBE2 for ; Wed, 6 Nov 2024 20:42:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8mqz-0007c2-8T; Wed, 06 Nov 2024 15:42:13 -0500 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 1t8mqw-0007aB-VJ for guix-patches@gnu.org; Wed, 06 Nov 2024 15:42:11 -0500 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 1t8mqw-0000Rd-N5 for guix-patches@gnu.org; Wed, 06 Nov 2024 15:42:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gUwEmEeQN6DoqcK64Jg7y2VOKy8e0FRSTIiW0ho5naE=; b=tVmBOHyT0hy5joAjfQsBn3AthtflsPNbX4Y+zZVtt9NsdhWqxu724rSdOxSny2PBunNu9yCbm8lNCXHFJbP4WY08KCM7hlU32pkLImucP0p85R3P4z02WsE+D0PyhYvIvycL6UY6a99FJacZA7BnDlRXl7G9VlqWq+0ecKYq1VD9z3mRR6b+8mQycuBCAI4LPysOMOeVFFEJ7vysEfgHihb7QsfB+h9ifebYe+SIHUt3tHE0HfH1lHythtSxVRYc47b6wJWWR9BJAuAMJLOlL7BvBDXM1tkgFpD648/iCMZMI+9ulgezjYq/wExILfF2hZ6+gAQk51BDr4Qp9HR/KQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8mqw-0003He-Iw; Wed, 06 Nov 2024 15:42:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73956] [PATCHv2 rust-team 06/27] gnu: Add rust-gio-sys-0.20. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Wed, 06 Nov 2024 20:42:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73956 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73956@debbugs.gnu.org Cc: Giacomo Leidi , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 73956-submit@debbugs.gnu.org id=B73956.173092572812581 (code B ref 73956); Wed, 06 Nov 2024 20:42:10 +0000 Received: (at 73956) by debbugs.gnu.org; 6 Nov 2024 20:42:08 +0000 Received: from localhost ([127.0.0.1]:45681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8mqt-0003GW-DN for submit@debbugs.gnu.org; Wed, 06 Nov 2024 15:42:08 -0500 Received: from confino.investici.org ([93.190.126.19]:29213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8mqo-0003Eo-Kp for 73956@debbugs.gnu.org; Wed, 06 Nov 2024 15:42:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1730925715; bh=gUwEmEeQN6DoqcK64Jg7y2VOKy8e0FRSTIiW0ho5naE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RlNclf/VcLCt94hIvPKBzXgeIceSt7nW+EHr5Ix4OuT2OBdPhsn7bWofd6eYWzFU4 ltLfIwN2O83Mw5y5A9NparZ900uKol2Uwb5Bss/fVZKyM2MStLY5VDyvXpGrDq+STu nDkTK4IJPfGsTpSHNz2+VULfWkt1ubZv4vwHPg/A= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4XkHDz0FhZz10vS; Wed, 6 Nov 2024 20:41:55 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4XkHDy4y9zz10vQ; Wed, 6 Nov 2024 20:41:54 +0000 (UTC) Date: Wed, 6 Nov 2024 21:41:10 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <0084c1ccd6c3a7ff853bfc25cc3f2f7e1131f898.1730925691.git.goodoldpaul@autistici.org> References: <0084c1ccd6c3a7ff853bfc25cc3f2f7e1131f898.1730925691.git.goodoldpaul@autistici.org> 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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul 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/crates-gtk.scm (rust-gio-sys-0.20): New variable; (rust-gio-sys-0.19): inherit from rust-gio-sys-0.20. Change-Id: Iededb3836d87b3098be7e9893d19f892aad611c0 --- gnu/packages/crates-gtk.scm | 45 ++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index f08b2f5105..9ef2ba62a7 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1325,26 +1325,26 @@ (define-public rust-gio-0.8 ("rust-serial-test" ,rust-serial-test-0.1) ("rust-serial-test-derive" ,rust-serial-test-derive-0.1)))))) -(define-public rust-gio-sys-0.19 +(define-public rust-gio-sys-0.20 (package (name "rust-gio-sys") - (version "0.19.8") + (version "0.20.4") (source (origin (method url-fetch) (uri (crate-uri "gio-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vylsskpipfwl7mvffp1s0227d0k5amyhd32dfnp3mhl8yx47mrc")))) + (base32 "0ya7i4m3jirrhryy6h8x5kgp3fxn6m4111009ws5aiz0ilvgqzjg")))) (build-system cargo-build-system) (arguments `(;; XXX: Tests are sensitive to the version of glib, even though ;; the library supports a wide range. Skip for now. #:tests? #f - #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19) - ("rust-gobject-sys" ,rust-gobject-sys-0.19) + #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.20) + ("rust-gobject-sys" ,rust-gobject-sys-0.20) ("rust-libc" ,rust-libc-0.2) - ("rust-system-deps" ,rust-system-deps-6) + ("rust-system-deps" ,rust-system-deps-7) ("rust-windows-sys" ,rust-windows-sys-0.52)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) ("rust-tempfile" ,rust-tempfile-3)) @@ -1364,6 +1364,39 @@ (define-public rust-gio-sys-0.19 (description "This package provides FFI bindings to libgio-2.0.") (license license:expat))) +(define-public rust-gio-sys-0.19 + (package + (inherit rust-gio-sys-0.20) + (name "rust-gio-sys") + (version "0.19.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vylsskpipfwl7mvffp1s0227d0k5amyhd32dfnp3mhl8yx47mrc")))) + (arguments + `(;; XXX: Tests are sensitive to the version of glib, even though + ;; the library supports a wide range. Skip for now. + #:tests? #f + #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19) + ("rust-gobject-sys" ,rust-gobject-sys-0.19) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-windows-sys" ,rust-windows-sys-0.52)) + #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases (modify-phases %standard-phases + (add-before 'check 'extend-include-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gio-headers (search-input-directory + inputs "include/gio-unix-2.0"))) + ;; Tests rely on these headers. + (setenv "C_INCLUDE_PATH" + (string-append gio-headers ":" + (getenv "C_INCLUDE_PATH"))))))))))) + (define-public rust-gio-sys-0.18 (package (inherit rust-gio-sys-0.19)