From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UMxqNwrVK2fMXAEAqHPOHw:P1 (envelope-from ) for ; Wed, 06 Nov 2024 20:43:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id UMxqNwrVK2fMXAEAqHPOHw (envelope-from ) for ; Wed, 06 Nov 2024 21:43:55 +0100 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=qvYR2p2r; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=a5pRqv6m; 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=1730925834; a=rsa-sha256; cv=none; b=XnHUV3pN44IKBQWxFVfw//a7zKGbCEziBreI/Ub1fn14DVRkhz5ZJbORrv5YrAXNmlX/5l uiEaNrXlsdpNlN7outNl7NBd3x1/LVD/6U0xqXR0J05ofBA03w9OdMwu37FLqR3GoRSDaL /MC9NPQpvKtrfPr+BzaUVo5boAMm5Z9kYZ5peZBkkEybd+A0UpFBlG3K6TC4oy9dc+L1CM bMdywb1hSPfR1K6I+hli87WMnWuS2aezJWlgVu91a7S7T7H8TmxAy+9NxvMpW8IAxa7sup 6EYkmbARZuso4hLTNHiB5OdGuazThfi7m/dgpjz1cVePyKKVHPcceklqQT748A== 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=qvYR2p2r; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=a5pRqv6m; 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=1730925834; 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=aoo7MJx8xEepzoIb/wzkVjyHcJPdAeC6u30wd8m/zsk=; b=NoSccOnDlsd3504WamnAWRtKHeywIpulVJ3UPeiqJcTpTJZ7wRq5Y+/iFtfiegbHb3QwdO 6V+UbY56sOpU7V60m/yrEgC2hFwAm9JpX0JADlknFR2IIneYrPYfPWYPAwr3iPqxJDqXoq /6ABSSNsfTPrJaai3DQ7o5DZeGWYRvMoxuBZntRMXWzI2f2676hZFSyfvN6Dyt0kiWzLrJ 5ITgcMs26o1N2j7v7HLX4u7iNKBMSVnFnNF082iB8aXwy+JZsDQnFqhDtDC+FAVUKmIZX4 AGo/npqGRoLmNxf/ecXv6RUu0+5xCDaPvtIGPTffT8tU8uhov3dN8GvMNloTJA== 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 ABDE683B46 for ; Wed, 06 Nov 2024 21:43:54 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8msS-0000r0-JV; Wed, 06 Nov 2024 15:43:44 -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 1t8mru-0008T9-EA for guix-patches@gnu.org; Wed, 06 Nov 2024 15:43: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 1t8mrt-00014n-NH for guix-patches@gnu.org; Wed, 06 Nov 2024 15:43:09 -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=aoo7MJx8xEepzoIb/wzkVjyHcJPdAeC6u30wd8m/zsk=; b=qvYR2p2rTscNpvFdUhq5O5m2Y+chZpkzI6hOQhygmaU6vs0NFxBPs5MAKCJkDj4EdouSMzCt434dv6IxQa1fDvxOqzRwvDktPqo3C7Z4Y4w5oFcEekG5jPXS/FOF/ZwgtE/7JJECUer8fY6bEyc1BiCZ85kVnG3gMGkf9gzVnMGDAfi1cDFiQghYvk1pgkntCPLbSuVV9IRsCnwhdDmgyBmyypOnNVHWZNguxxrbCw25BJ8wxSojWC+p+Uus73WmcWC8idRRBI2f3DEKBX8JTgwRqsG2Kgb5fNDTSnquXuFL+p31n8AKqC7K03Bow6kRJpZ7KSDqExIC583oAtuwGw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8mrt-0003O3-IV; Wed, 06 Nov 2024 15:43:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73956] [PATCHv2 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: Wed, 06 Nov 2024 20:43: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.173092575112836 (code B ref 73956); Wed, 06 Nov 2024 20:43:09 +0000 Received: (at 73956) by debbugs.gnu.org; 6 Nov 2024 20:42:31 +0000 Received: from localhost ([127.0.0.1]:45738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8mrG-0003Kt-KQ for submit@debbugs.gnu.org; Wed, 06 Nov 2024 15:42:31 -0500 Received: from confino.investici.org ([93.190.126.19]:54245) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8mrA-0003KY-DP for 73956@debbugs.gnu.org; Wed, 06 Nov 2024 15:42:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1730925736; bh=aoo7MJx8xEepzoIb/wzkVjyHcJPdAeC6u30wd8m/zsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a5pRqv6mhTgnLtH/odyw+gHbvmZXD/kf8WYjmilVpiKz3b0qsYEz/2FNyCn9fbYiT usTzaWX11b95FuJRR3D+FPWPJpfU8hknpR/+khIRCqdWTdX7dlWEKhJ4UKx8GRrfzw ay9gomLa3EFvmwmHDbnDcSb/yy5QyMj+ECdbNCMU= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4XkHFN5YNZz10vY; Wed, 6 Nov 2024 20:42:16 +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 4XkHFN28tkz10vQ; Wed, 6 Nov 2024 20:42:15 +0000 (UTC) Date: Wed, 6 Nov 2024 21:41:30 +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 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.89 X-Spam-Score: -2.89 X-Migadu-Queue-Id: ABDE683B46 X-Migadu-Scanner: mx10.migadu.com X-TUID: tV8YbDuaYpZ+ 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 e2e72298b5..82143ebbed 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