From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 6FrOOVo2GGejWwEA62LTzQ:P1 (envelope-from ) for ; Tue, 22 Oct 2024 23:33:47 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6FrOOVo2GGejWwEA62LTzQ (envelope-from ) for ; Wed, 23 Oct 2024 01:33:47 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=goNIa6K7; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=p1CdKbmb; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729640026; a=rsa-sha256; cv=none; b=RMQhGAl3Dm3vjDUlMZK7n7FIS0KZYgO+zkl4LXxTa8Pt0uABYlCXzqqJrqUWmSB9h2UhVC x2aOmIyz66UCmthK76q1K4O4G2y8faVJV8WRqrYgxYeMAKnxKE8q2Wnq5HRQqluHCByH34 mstrk1dOsTGFNpeY2qBSi3w+3bYEe16mY/2ST8Nfa1pf6ZmUJZT0zzrFTc4kMRuQ+lRgzL VTnynqmaT5y5bpq8ke3g6wElIufCpEIMDLNEN6ntC6Nb+jf7ytUyrcWXfxM0N7TkoyfXO1 UIf4L0/yZeS64sBpzcorhGGkbq89FIu/crBxR+gpqpMZLqOVkKpMHaejRKYvZQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=goNIa6K7; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=p1CdKbmb; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729640026; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=obuWvLGIKw/+iJia2i1Lk1wB4B5rYM9ufgI1V1tDsWk=; b=jTvNj7ciOWHBnjBZJkOtXa+2QgaBsKX9DIJJbFQEXBMMmsGSJT8KRrFJRYeqZ+3rW7Ukec uw6NfIvDZvq4RW/d3P2SaDJY4m8/xHbpHvBTi+9tgXckraFIIO5L3BEy/vvsghQJJawb6w bz88vi5/oa2iPlJwYPRNoLguwrbgtDVxfPf6lIrJnjVmCgh3s5Vdgmja9HDdJ6MAZHHw9s OupIKqKqrhd6eBDUTjTeEAEBbhmoDW+YzWvmSVJKslQhs027I/yfAzsrEdeRO+fx9w/xlO i5UKY88FI6y/cAEVehtTR++4hyPK9fRiymJYNfcxRivS/PKVY3JNYbQb/KzX6g== 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 B9E542787 for ; Wed, 23 Oct 2024 01:33:46 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3OMl-000616-Cl; Tue, 22 Oct 2024 19:32:43 -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 1t3OMj-0005yc-V4 for guix-patches@gnu.org; Tue, 22 Oct 2024 19:32:42 -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 1t3OMj-0001Jm-Kx for guix-patches@gnu.org; Tue, 22 Oct 2024 19:32:41 -0400 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=obuWvLGIKw/+iJia2i1Lk1wB4B5rYM9ufgI1V1tDsWk=; b=goNIa6K7hL85No0Zl1wa5+la/pEC0MTHTXjPZ0g3GxS4dLZ3d97ERNebDJ4KLFO5CyC9McjpYYe3pt+xqbZyRXP5FaQouc/u4d5Vul6NZm0CdI4yjQ2lH+9jjTMM8+aUwxS2uxZ4DrIjSgPom61QdKl4zx8b5LS12pTQKChQcc9aXyJptXZY1mJD+45Kidcji+M57Te14TFEFOo9vv4z2Fxcm9Yz48pqRk6BFlLzuKk7nRAreMTewoSUJODKBWVtzpUxu/IZBwX+3TlonxYiQrNrZr2wXXVUW1Uj1aYTmQmqffcaMBoXKAu4vq1ULz0pCVp+vkp3l0orwajZxSVC5g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3ONC-0006ie-00; Tue, 22 Oct 2024 19:33:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73956] [PATCH rust-team 26/27] gnu: Add rust-gtk4-0.8 and rust-gtk4-macros-0.8. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Tue, 22 Oct 2024 23:33:09 +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.172963997125658 (code B ref 73956); Tue, 22 Oct 2024 23:33:09 +0000 Received: (at 73956) by debbugs.gnu.org; 22 Oct 2024 23:32:51 +0000 Received: from localhost ([127.0.0.1]:57879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3OMs-0006fg-Rb for submit@debbugs.gnu.org; Tue, 22 Oct 2024 19:32:51 -0400 Received: from confino.investici.org ([93.190.126.19]:45085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3OMf-0006bn-4V for 73956@debbugs.gnu.org; Tue, 22 Oct 2024 19:32:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1729639924; bh=obuWvLGIKw/+iJia2i1Lk1wB4B5rYM9ufgI1V1tDsWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p1CdKbmblmRfXn2AC4Q9fNLBkiPKy6+hl9IMJkX9MESxwJh76fpnIfSsBlhcj+TIC dApvCvBCjyOtVc/sT/3TOLb60Xxt9fFx1WB3Jin1y3M6XSTKnM7uF4aA8wWqnEvS5Y OLW9rKfD8TD0A3TY9tAZxJTQYxMUhUBBiNyBsZY0= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4XY7kD1jbfz117J; Tue, 22 Oct 2024 23:32:04 +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 4XY7kD0yGVz115q; Tue, 22 Oct 2024 23:32:04 +0000 (UTC) Date: Wed, 23 Oct 2024 01:31:11 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Giacomo Leidi via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 1.01 X-Spam-Score: 1.01 X-Migadu-Queue-Id: B9E542787 X-Migadu-Scanner: mx12.migadu.com X-TUID: ut3Uin/E8Ocv rust-gtk4 and rust-gtk4-macros are mutually dependent, this is why this commit addresses both of them instead of having two separate commits, as is usually done in Guix. * gnu/packages/crates-gtk.scm (rust-gtk4-0.8): New variable; (rust-gtk4-macros-0.8): new variable; (rust-gtk4-0.7): inherit from rust-gtk4-0.8; (rust-gtk4-macros-0.7): inherit from rust-gtk4-macros-0.8. Change-Id: I9e327d6ae32cb6142dac87f8cb6a2249ab9407ac --- gnu/packages/crates-gtk.scm | 83 +++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 3ff52856e1..d73dbda005 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -3246,8 +3246,45 @@ (define-public rust-gtk3-macros-0.14 library.") (license license:expat))) +(define-public rust-gtk4-0.8 + (package + (name "rust-gtk4") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "gtk4" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1avinslgnsz3wywf4dfaza8w9c29krd10hxmi8si3bq8kcqi2kmh")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Failed to initialize GTK + #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19) + ("rust-field-offset" ,rust-field-offset-0.3) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.19) + ("rust-gdk4" ,rust-gdk4-0.8) + ("rust-gio" ,rust-gio-0.19) + ("rust-glib" ,rust-glib-0.19) + ("rust-graphene-rs" ,rust-graphene-rs-0.19) + ("rust-gsk4" ,rust-gsk4-0.8) + ("rust-gtk4-macros" ,rust-gtk4-macros-0.8) + ("rust-gtk4-sys" ,rust-gtk4-sys-0.8) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.19)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs (list pkg-config)) + (inputs (list cairo glib gtk)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings of the GTK 4 library") + (description "Rust bindings of the GTK 4 library.") + (license license:expat))) + (define-public rust-gtk4-0.7 (package + (inherit rust-gtk4-0.8) (name "rust-gtk4") (version "0.7.3") (source @@ -3257,7 +3294,6 @@ (define-public rust-gtk4-0.7 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0hh8nzglmz94v1m1h6vy8z12m6fr7ia467ry0md5fa4p7sm53sss")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display` #:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18) @@ -3274,16 +3310,44 @@ (define-public rust-gtk4-0.7 ("rust-libc" ,rust-libc-0.2) ("rust-pango" ,rust-pango-0.18)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + +(define-public rust-gtk4-macros-0.8 + (package + (name "rust-gtk4-macros") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "gtk4-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0214a8y68kknxcnihsfxwsqvll7ss2rbiplr51cyk34dz1z5lrgc")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Failed to initialize GTK + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-3) + ("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quick-xml" ,rust-quick-xml-0.31) + ("rust-quote" ,rust-quote-1) + ("rust-gtk4" ,rust-gtk4-0.8) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gtk4" ,rust-gtk4-0.7) + ("rust-trybuild2" ,rust-trybuild2-1)))) (native-inputs (list pkg-config)) - (inputs (list cairo glib gtk)) + (inputs (list gdk-pixbuf gtk)) (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings of the GTK 4 library") - (description "Rust bindings of the GTK 4 library.") + (synopsis "Macros helpers for GTK 4 bindings") + (description "Macros helpers for GTK 4 bindings.") (license license:expat))) (define-public rust-gtk4-macros-0.7 (package + (inherit rust-gtk4-macros-0.8) (name "rust-gtk4-macros") (version "0.7.2") (source @@ -3293,7 +3357,6 @@ (define-public rust-gtk4-macros-0.7 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0bw3cchiycf7dw1bw4p8946gv38azxy05a5w0ndgcmxnz6fc8znm")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Failed to initialize GTK #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) @@ -3307,13 +3370,7 @@ (define-public rust-gtk4-macros-0.7 #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3) ("rust-futures-util" ,rust-futures-util-0.3) ("rust-gtk4" ,rust-gtk4-0.7) - ("rust-trybuild2" ,rust-trybuild2-1)))) - (native-inputs (list pkg-config)) - (inputs (list gdk-pixbuf gtk)) - (home-page "https://gtk-rs.org/") - (synopsis "Macros helpers for GTK 4 bindings") - (description "Macros helpers for GTK 4 bindings.") - (license license:expat))) + ("rust-trybuild2" ,rust-trybuild2-1)))))) (define-public rust-gtk4-sys-0.8 (package -- 2.46.0