From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4DKwKC1PGWNTMQEAbAwnHQ (envelope-from ) for ; Thu, 08 Sep 2022 04:10:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id WCrDKC1PGWOidgAA9RJhRA (envelope-from ) for ; Thu, 08 Sep 2022 04:10:53 +0200 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 C3DC23805A for ; Thu, 8 Sep 2022 04:10:52 +0200 (CEST) Received: from localhost ([::1]:35532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oW70F-0005PK-Rb for larch@yhetil.org; Wed, 07 Sep 2022 22:10:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oW6zT-0005P1-7p for bug-guix@gnu.org; Wed, 07 Sep 2022 22:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oW6zS-0005O0-D8 for bug-guix@gnu.org; Wed, 07 Sep 2022 22:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oW6zS-0000aJ-8a for bug-guix@gnu.org; Wed, 07 Sep 2022 22:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#57611: [PATCH] Addressing bug#57611 by updating rust-wayland-client and rust-wayland-scanner dependencies References: In-Reply-To: Resent-From: Ben Van Sleen Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 08 Sep 2022 02:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57611 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16626029622183 (code B ref -1); Thu, 08 Sep 2022 02:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Sep 2022 02:09:22 +0000 Received: from localhost ([127.0.0.1]:56759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW6ym-0000Z7-Nw for submit@debbugs.gnu.org; Wed, 07 Sep 2022 22:09:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:37212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW32t-0006ow-OO for submit@debbugs.gnu.org; Wed, 07 Sep 2022 17:57:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oW32t-0005vR-Ip for guix-patches@gnu.org; Wed, 07 Sep 2022 17:57:19 -0400 Received: from mail-vs1-xe2a.google.com ([2607:f8b0:4864:20::e2a]:35780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oW32q-0001pt-1t for guix-patches@gnu.org; Wed, 07 Sep 2022 17:57:19 -0400 Received: by mail-vs1-xe2a.google.com with SMTP id 67so16359905vsv.2 for ; Wed, 07 Sep 2022 14:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date; bh=RK5d2fGgNOIGT/iAa3S5RlX/QvoL4kNRPTqJ/rja3wA=; b=Y8hJj3f+x+BIXqikXNPvb9l1pNWl8ejp4KzqhgpDVM6FUFIr7/eiCxw1HZhwBgM2wf lLngsZOzLs/wQmf4cC18UXCmuUQSVaVNN/HdWL1LTJ2mET+b6Aleaj+K6PyKP+gNdZ+a utwY+FaNGm4LpUk+KSx3zcvp9NCiIdS8sYCNjKH1MPuvTtRSJuq0CVL8yonJ3Dg2nGop szXJ0NFU+A38Tz2uKzuflBP19V+6Vh6fQ5OMglzIy6ivux9xjauzhFu+4KFMoXenwYYp ub0wwvf7tWHteWf0TTtufb9gw2jZxQAQU+h57YPw90DCKGLHSkUNIcQR1V/Gu95LfGdt PhEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=RK5d2fGgNOIGT/iAa3S5RlX/QvoL4kNRPTqJ/rja3wA=; b=3Xd6eagn04B77ijKXIq79fIDxCaRDBmukFv4fp8t2MpDa1wzhNpuqnEh0e9EkoU3Ew UfDbIBCPFxgL33ZdxHlWm9UtvC2+P75wWILEx480ddQgJhNjCVhc31j3MCFeT8tZsvTj cZV+S1ZnnPqncI99KKF+4oISdF+63zSqzh7O8oDpPvYytJHwT/tfgAPGKRwF1SBD3Vl4 B6g3KgAl8njtlhsgwad1xZlX0LS10SrGIKVkJB4ZTFk8n/dC8N1chK92Gb0i8E2Twylg jXnG3LWbdVYycrd1dPgaH0nQhse38wtAo3wHNHFqSF0ei5C4A+opQHaq+xUB5QFMXU9F q/Kg== X-Gm-Message-State: ACgBeo1CXp3H+4VgiYntsTvXfJecTiwk4yKW/z58TgcMWjAblbYTeH7V DMIgVsAhZUo9vSwXPzz3aMAkQNTJZCkJCS0usBJQ+lX01vQu0w== X-Google-Smtp-Source: AA6agR5lDJz4HaJT0/Q5Y2gQjFPyaztEEpdHAQ0r/8g4W3cYNYP2VZ4g14mlkPBzJbmOxswAqiKyW4y1KEy4X1lAheQ= X-Received: by 2002:a67:fb92:0:b0:398:1376:5596 with SMTP id n18-20020a67fb92000000b0039813765596mr1640963vsr.21.1662587834182; Wed, 07 Sep 2022 14:57:14 -0700 (PDT) MIME-Version: 1.0 From: Ben Van Sleen Date: Wed, 7 Sep 2022 16:57:03 -0500 Message-ID: Content-Type: multipart/mixed; boundary="000000000000446b8705e81d656f" Received-SPF: pass client-ip=2607:f8b0:4864:20::e2a; envelope-from=benvansleen@gmail.com; helo=mail-vs1-xe2a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 07 Sep 2022 22:09:19 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662603053; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=B8Fjwv4eq8zGOkUmVZAezh7Bmf4BCOaGeEhoxGw7Hng=; b=sYGDm83Xvtj02LqxSRi2fO+d/zZBKvmJeRdMAzSwFH8TnmaB6jM8zF8xPRxjSPzApBLfin kIqGmcl7FGya0KYkUmqOhpbA2khzDsVe79+ugEEdYtCxIkzSUZOoc9Aqk5+QimJsQAi/d/ gif7HEN2f6rq7FfSu0ATlTjxCaFlss5U2+ui6TZPqPrgKkr1EfgJ8A58QeDOQDNcmfP4Zp hx6fiu4Ng/vSmEatBUh0j30WWXg3khbUUVxRR5yTKil8dOcK160oRyY+GQocLbdYc2bcLG TC3Wv+4J2PsLnxZLIVfZUxBKOOef4Ij9bXN54ZRlyiz0w3j1/rV7XrlwCJHuyw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662603053; a=rsa-sha256; cv=none; b=dpnbw27KyHHpGZBabQ+a9LrrPxaEyJG8xy+nWTlnYc1T3ExaLQ0OS5z73Fzma8OCTfTwns ETfjlbdScCqY0T6VFblSN+DiqgouFp2Y5yEAEK5M9l3fE056/l6pO6/h+y6dpZQPC8oLHm 1Xs9J0bA3E6EuTD6Rijd4Kgo/CFTjVEqezALqTeayRyETDBy6rtHePWVQYUsp1hy0GDkRn 8cDCfZtT+3VSxOrtwX6egXZ/zfBO2HLPFwhXkqP72bm3S0mZSTARAzuvHuItt2hBsUosrT 0PcSn6iCATtDAy2Ua7C9qEOsaoo+sk0bmTkukatgsLR66LTFe6ZXD1bugeGP1w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=Y8hJj3f+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 8.62 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=Y8hJj3f+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C3DC23805A X-Spam-Score: 8.62 X-Migadu-Spam: Yes X-Migadu-Scanner: scn1.migadu.com X-TUID: MDgcUh7ih06K --000000000000446b8705e81d656f Content-Type: multipart/alternative; boundary="000000000000446b8505e81d656d" --000000000000446b8505e81d656d Content-Type: text/plain; charset="UTF-8" Hi, This is my first patch to Guix (and my first time submitting a patch by mailing list), so I'd love whatever feedback y'all have to offer! Trying to address the alacritty build issue. As of now, alacritty won't build because rust-wayland-scanner can't be built. After chasing many dependencies, rust-parking-lot-core now requires rust-windows-sys-0.36. rust-windows-sys-0.28 currently exists in the repo, so I've added packages to bump the versions to 0.36. After applying these patches, Alacritty now builds. Best, Ben Van Sleen >From 682b335058c6dff1ea48165762ec8bbc0e469803 Mon Sep 17 00:00:00 2001 From: Ben Van Sleen Date: Wed, 7 Sep 2022 16:32:00 -0500 Subject: [PATCH 1/4] rust-windows-sys-0.36: Added package (updating existing package from 0.28 -> 0.36). Also added definitions for dependencies rust-windows-*-0.36 --- gnu/packages/crates-io.scm | 86 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a03f02e868..a9d8bd5669 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -74075,6 +74075,19 @@ (define-public rust-windows-x86-64-msvc-0.32 crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-x86-64-msvc-0.36 + (package + (inherit rust-windows-x86-64-msvc-0.32) + (name "rust-windows-x86-64-msvc") + (version "0.36.1") + (source (origin + (method url-fetch) + (uri (crate-uri "windows_x86_64_msvc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "103n3xijm5vr7qxr1dps202ckfnv7njjnnfqmchg8gl5ii5cl4f8")))))) + (define-public rust-windows-x86-64-gnu-0.28 (package (name "rust-windows-x86-64-gnu") @@ -74114,6 +74127,19 @@ (define-public rust-windows-x86-64-gnu-0.32 crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-x86-64-gnu-0.36 + (package + (inherit rust-windows-x86-64-gnu-0.32) + (name "rust-windows-x86-64-gnu") + (version "0.36.1") + (source (origin + (method url-fetch) + (uri (crate-uri "windows_x86_64_gnu" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qfrck3jnihymfrd01s8260d4snql8ks2p8yaabipi3nhwdigkad")))))) + (define-public rust-windows-i686-msvc-0.28 (package (name "rust-windows-i686-msvc") @@ -74153,6 +74179,19 @@ (define-public rust-windows-i686-msvc-0.32 crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-i686-msvc-0.36 + (package + (inherit rust-windows-i686-msvc-0.32) + (name "rust-windows-i686-msvc") + (version "0.36.1") + (source (origin + (method url-fetch) + (uri (crate-uri "windows_i686_msvc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "097h2a7wig04wbmpi3rz1akdy4s8gslj5szsx8g2v0dj91qr3rz2")))))) + (define-public rust-windows-i686-gnu-0.28 (package (name "rust-windows-i686-gnu") @@ -74192,6 +74231,19 @@ (define-public rust-windows-i686-gnu-0.32 crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-i686-gnu-0.36 + (package + (inherit rust-windows-i686-gnu-0.32) + (name "rust-windows-i686-gnu") + (version "0.36.1") + (source (origin + (method url-fetch) + (uri (crate-uri "windows_i686_gnu" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dm3svxfzamrv6kklyda9c3qylgwn5nwdps6p0kc9x6s077nq3hq")))))) + (define-public rust-windows-aarch64-msvc-0.28 (package (name "rust-windows-aarch64-msvc") @@ -74231,6 +74283,19 @@ (define-public rust-windows-aarch64-msvc-0.32 crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-aarch64-msvc-0.36 + (package + (inherit rust-windows-aarch64-msvc-0.32) + (name "rust-windows-aarch64-msvc") + (version "0.36.1") + (source (origin + (method url-fetch) + (uri (crate-uri "windows_aarch64_msvc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ixaxs2c37ll2smprzh0xq5p238zn8ylzb3lk1zddqmd77yw7f4v")))))) + (define-public rust-windows-implement-0.32 (package (name "rust-windows-implement") @@ -74282,6 +74347,27 @@ (define-public rust-windows-sys-0.28 if they were just another Rust module.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-sys-0.36 + (package + (inherit rust-windows-sys-0.28) + (name "rust-windows-sys") + (version "0.36.1") + (source (origin + (method url-fetch) + (uri (crate-uri "windows-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lmqangv0zg1l46xiq7rfnqwsx8f8m52mqbgg2mrx7x52rd1a17a")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.36) + ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.36) + ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.36) + ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.36) + ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.36)))))) + (define-public rust-windows-gen-0.9 (package (name "rust-windows-gen") -- 2.37.3 >From 28d3ff0d247eb1b96ad58e120a4e099cb9ba397f Mon Sep 17 00:00:00 2001 From: Ben Van Sleen Date: Wed, 7 Sep 2022 16:34:26 -0500 Subject: [PATCH 2/4] rust-parking-lot-core-0.9: Updated dependency list to include rust-windows-sys-0.36 as requested by package's cargo.toml --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a9d8bd5669..4440997287 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41735,7 +41735,8 @@ (define-public rust-parking-lot-core-0.9 ("rust-petgraph" ,rust-petgraph-0.6) ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-smallvec" ,rust-smallvec-1) - ("rust-thread-id" ,rust-thread-id-4)))) + ("rust-thread-id" ,rust-thread-id-4) + ("rust-windows-sys" ,rust-windows-sys-0.36)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "API for creating custom synchronization primitives") (description "This package provides an advanced API for creating custom -- 2.37.3 >From dbe1102c50ca7644a35205a5da739bbef350f1eb Mon Sep 17 00:00:00 2001 From: Ben Van Sleen Date: Wed, 7 Sep 2022 16:36:49 -0500 Subject: [PATCH 3/4] rust-wayland-scanner: Bumped *-0.29 from v0.28.3 to v0.28.6 and *-0.28 from v0.28.3 to v0.28.6 --- gnu/packages/crates-graphics.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index c5d9555599..35e4f4eb5b 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2903,17 +2903,20 @@ (define-public rust-wayland-protocols-0.21 (define-public rust-wayland-scanner-0.29 (package (name "rust-wayland-scanner") - (version "0.29.4") + (version "0.29.5") (source (origin (method url-fetch) (uri (crate-uri "wayland-scanner" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1q7r764z8k922xf51fj56b1xm29ffi9ap8jnf4c478gp8cqyv89r")))) + (base32 "0lxx3i2kxnmsk421qx87lqqc9kd2y1ksjxcyg0pqbar2zbc06hwg")))) (build-system cargo-build-system) - (inputs - (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8)) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-xml-rs" ,rust-xml-rs-0.8)))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Generate Rust APIs from XML Wayland protocol files") (description @@ -2927,16 +2930,15 @@ (define-public rust-wayland-scanner-0.28 (package (inherit rust-wayland-scanner-0.29) (name "rust-wayland-scanner") - (version "0.28.3") + (version "0.28.6") (source (origin (method url-fetch) (uri (crate-uri "wayland-scanner" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0g8ky63qk27in7zajycj3fyydsxlj19hanfcvr8d7z5kcxbvl43h")))) - (inputs - (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8)))) + (base32 + "1w839jsh7nrni4f2x5bkapf98w7kddxyqmpks4rf67dnvsr3x4nf")))))) (define-public rust-wayland-scanner-0.23 (package -- 2.37.3 >From 70d6222e6891743506a42b42412a6358441fe15c Mon Sep 17 00:00:00 2001 From: Ben Van Sleen Date: Wed, 7 Sep 2022 16:38:11 -0500 Subject: [PATCH 4/4] rust-wayland-client-0.28: Moved rust-wayland-scanner to cargo-dependency as specified by its cargo.toml --- gnu/packages/crates-graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 35e4f4eb5b..19b3972365 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2553,7 +2553,8 @@ (define-public rust-wayland-client-0.28 ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-libc" ,rust-libc-0.2) ("rust-nix" ,rust-nix-0.18) - ("rust-scoped-tls" ,rust-scoped-tls-1)) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.28)) #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) (inputs @@ -2563,7 +2564,6 @@ (define-public rust-wayland-client-0.28 rust-nix-0.18 rust-scoped-tls-1 rust-wayland-commons-0.28 - rust-wayland-scanner-0.28 rust-wayland-sys-0.28)))) (define-public rust-wayland-client-0.23 -- 2.37.3 --000000000000446b8505e81d656d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi= ,

This is my first patch to Guix (and my first tim= e submitting a patch by mailing list), so I'd love whatever feedback y&= #39;all have to offer!

Trying to address the alacr= itty build issue. As of now, alacritty won't build because rust-wayland= -scanner can't be built. After chasing many dependencies, rust-parking-= lot-core now requires rust-windows-sys-0.36. rust-windows-sys-0.28 currentl= y exists in the repo, so I've added packages to bump the versions to 0.= 36.

After applying these patches, Alacritty now bu= ilds.

Best,
Ben Van Sleen

From 682b335058c6dff1ea48165762ec8bb= c0e469803 Mon Sep 17 00:00:00 2001
From: Ben Van Sleen <benvansleen@gmail.com>
Date: Wed, 7 S= ep 2022 16:32:00 -0500
Subject: [PATCH 1/4] rust-windows-sys-0.36: Added= package (updating existing
=C2=A0package from 0.28 -> 0.36). Also ad= ded definitions for dependencies
=C2=A0rust-windows-*-0.36

---=C2=A0gnu/packages/crates-io.scm | 86 ++++++++++++++++++++++++++++++++++++= ++
=C2=A01 file changed, 86 insertions(+)

diff --git a/gnu/packag= es/crates-io.scm b/gnu/packages/crates-io.scm
index a03f02e868..a9d8bd56= 69 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-= io.scm
@@ -74075,6 +74075,19 @@ (define-public rust-windows-x86-64-msvc-= 0.32
=C2=A0crate.")
=C2=A0 =C2=A0 =C2=A0(license (list license:e= xpat license:asl2.0))))
=C2=A0
+(define-public rust-windows-x86-64-ms= vc-0.36
+ =C2=A0(package
+ =C2=A0 =C2=A0(inherit rust-windows-x86-64-= msvc-0.32)
+ =C2=A0 =C2=A0(name "rust-windows-x86-64-msvc")+ =C2=A0 =C2=A0(version "0.36.1")
+ =C2=A0 =C2=A0(source (ori= gin
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(method url-fetch)=
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (crate-uri "= ;windows_x86_64_msvc" version))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0(file-name (string-append name "-" version "= ;.tar.gz"))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha2= 56
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
+ =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"103n3xijm5vr7qxr1= dps202ckfnv7njjnnfqmchg8gl5ii5cl4f8"))))))
+
=C2=A0(define-publi= c rust-windows-x86-64-gnu-0.28
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 = =C2=A0(name "rust-windows-x86-64-gnu")
@@ -74114,6 +74127,19 @= @ (define-public rust-windows-x86-64-gnu-0.32
=C2=A0crate.")
=C2= =A0 =C2=A0 =C2=A0(license (list license:expat license:asl2.0))))
=C2=A0<= br>+(define-public rust-windows-x86-64-gnu-0.36
+ =C2=A0(package
+ = =C2=A0 =C2=A0(inherit rust-windows-x86-64-gnu-0.32)
+ =C2=A0 =C2=A0(name= "rust-windows-x86-64-gnu")
+ =C2=A0 =C2=A0(version "0.36= .1")
+ =C2=A0 =C2=A0(source (origin
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(method url-fetch)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0(uri (crate-uri "windows_x86_64_gnu" version= ))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(file-name (string-= append name "-" version ".tar.gz"))
+ =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 (base32
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0"1qfrck3jnihymfrd01s8260d4snql8ks2p8yaabipi3nhwdigkad&qu= ot;))))))
+
=C2=A0(define-public rust-windows-i686-msvc-0.28
=C2= =A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name "rust-windows-i686-msv= c")
@@ -74153,6 +74179,19 @@ (define-public rust-windows-i686-msvc-= 0.32
=C2=A0crate.")
=C2=A0 =C2=A0 =C2=A0(license (list license:e= xpat license:asl2.0))))
=C2=A0
+(define-public rust-windows-i686-msvc= -0.36
+ =C2=A0(package
+ =C2=A0 =C2=A0(inherit rust-windows-i686-msvc= -0.32)
+ =C2=A0 =C2=A0(name "rust-windows-i686-msvc")
+ =C2= =A0 =C2=A0(version "0.36.1")
+ =C2=A0 =C2=A0(source (origin+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(method url-fetch)
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (crate-uri "windo= ws_i686_msvc" version))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0(file-name (string-append name "-" version ".tar.gz&q= uot;))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
+ =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"097h2a7wig04wbmpi3rz1akdy4s= 8gslj5szsx8g2v0dj91qr3rz2"))))))
+
=C2=A0(define-public rust-win= dows-i686-gnu-0.28
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name &q= uot;rust-windows-i686-gnu")
@@ -74192,6 +74231,19 @@ (define-public= rust-windows-i686-gnu-0.32
=C2=A0crate.")
=C2=A0 =C2=A0 =C2=A0(= license (list license:expat license:asl2.0))))
=C2=A0
+(define-public= rust-windows-i686-gnu-0.36
+ =C2=A0(package
+ =C2=A0 =C2=A0(inherit = rust-windows-i686-gnu-0.32)
+ =C2=A0 =C2=A0(name "rust-windows-i686= -gnu")
+ =C2=A0 =C2=A0(version "0.36.1")
+ =C2=A0 =C2= =A0(source (origin
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(me= thod url-fetch)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (= crate-uri "windows_i686_gnu" version))
+ =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(file-name (string-append name "-" ver= sion ".tar.gz"))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0(sha256
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32=
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"1dm3svxf= zamrv6kklyda9c3qylgwn5nwdps6p0kc9x6s077nq3hq"))))))
+
=C2=A0(def= ine-public rust-windows-aarch64-msvc-0.28
=C2=A0 =C2=A0(package
=C2= =A0 =C2=A0 =C2=A0(name "rust-windows-aarch64-msvc")
@@ -74231,= 6 +74283,19 @@ (define-public rust-windows-aarch64-msvc-0.32
=C2=A0crate= .")
=C2=A0 =C2=A0 =C2=A0(license (list license:expat license:asl2.0= ))))
=C2=A0
+(define-public rust-windows-aarch64-msvc-0.36
+ =C2= =A0(package
+ =C2=A0 =C2=A0(inherit rust-windows-aarch64-msvc-0.32)
+= =C2=A0 =C2=A0(name "rust-windows-aarch64-msvc")
+ =C2=A0 =C2= =A0(version "0.36.1")
+ =C2=A0 =C2=A0(source (origin
+ =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(method url-fetch)
+ =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (crate-uri "windows_aar= ch64_msvc" version))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0(file-name (string-append name "-" version ".tar.gz&qu= ot;))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
+ =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
+ =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"0ixaxs2c37ll2smprzh0xq5p238z= n8ylzb3lk1zddqmd77yw7f4v"))))))
+
=C2=A0(define-public rust-wind= ows-implement-0.32
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name &q= uot;rust-windows-implement")
@@ -74282,6 +74347,27 @@ (define-publi= c rust-windows-sys-0.28
=C2=A0if they were just another Rust module.&quo= t;)
=C2=A0 =C2=A0 =C2=A0(license (list license:expat license:asl2.0))))<= br>=C2=A0
+(define-public rust-windows-sys-0.36
+ =C2=A0(package
+= =C2=A0 =C2=A0(inherit rust-windows-sys-0.28)
+ =C2=A0 =C2=A0(name "= ;rust-windows-sys")
+ =C2=A0 =C2=A0(version "0.36.1")
= + =C2=A0 =C2=A0(source (origin
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(method url-fetch)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0(uri (crate-uri "windows-sys" version))
+ =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(file-name (string-append name "-&q= uot; version ".tar.gz"))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(sha256
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = (base32
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"1= lmqangv0zg1l46xiq7rfnqwsx8f8m52mqbgg2mrx7x52rd1a17a"))))
+ =C2=A0 = =C2=A0(build-system cargo-build-system)
+ =C2=A0 =C2=A0(arguments
+ = =C2=A0 =C2=A0 `(#:skip-build? #t
+ =C2=A0 =C2=A0 =C2=A0 #:cargo-inputs (= ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.36)
= + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.36)
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.36)
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.36)
= + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.36)))= )))
+
=C2=A0(define-public rust-windows-gen-0.9
=C2=A0 =C2=A0(pack= age
=C2=A0 =C2=A0 =C2=A0(name "rust-windows-gen")
--
2.= 37.3


From 28d3ff0d= 247eb1b96ad58e120a4e099cb9ba397f Mon Sep 17 00:00:00 2001
From: Ben Van = Sleen <benvansleen@gmail.com>
Date: Wed, 7 Sep 2022 16:34:26 -0500
Subject: [PATCH 2/4] rust-= parking-lot-core-0.9: Updated dependency list to
=C2=A0include rust-wind= ows-sys-0.36 as requested by package's cargo.toml

---
=C2=A0g= nu/packages/crates-io.scm | 3 ++-
=C2=A01 file changed, 2 insertions(+),= 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/package= s/crates-io.scm
index a9d8bd5669..4440997287 100644
--- a/gnu/package= s/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41735,7 +41735,8= @@ (define-public rust-parking-lot-core-0.9
=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0("rust-petgraph" ,rust-petgraph-0.6)
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0("rust-redox-syscall" ,rust-redox-syscall-0.2)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-smallvec" ,rust-smallv= ec-1)
- =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-thread-id" ,rust-thr= ead-id-4))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-thread-id" ,r= ust-thread-id-4)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-windows-sys&qu= ot; ,rust-windows-sys-0.36))))
=C2=A0 =C2=A0 =C2=A0(home-page "https://github.com/Amanieu/p= arking_lot")
=C2=A0 =C2=A0 =C2=A0(synopsis "API for creati= ng custom synchronization primitives")
=C2=A0 =C2=A0 =C2=A0(descrip= tion "This package provides an advanced API for creating custom
-- =
2.37.3


From db= e1102c50ca7644a35205a5da739bbef350f1eb Mon Sep 17 00:00:00 2001
From: Be= n Van Sleen <benvansleen@gmail.= com>
Date: Wed, 7 Sep 2022 16:36:49 -0500
Subject: [PATCH 3/4]= rust-wayland-scanner: Bumped *-0.29 from v0.28.3 to
=C2=A0v0.28.6 and *= -0.28 from v0.28.3 to v0.28.6

---
=C2=A0gnu/packages/crates-graph= ics.scm | 18 ++++++++++--------
=C2=A01 file changed, 10 insertions(+), = 8 deletions(-)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/p= ackages/crates-graphics.scm
index c5d9555599..35e4f4eb5b 100644
--- a= /gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm=
@@ -2903,17 +2903,20 @@ (define-public rust-wayland-protocols-0.21
= =C2=A0(define-public rust-wayland-scanner-0.29
=C2=A0 =C2=A0(package
= =C2=A0 =C2=A0 =C2=A0(name "rust-wayland-scanner")
- =C2=A0 =C2= =A0(version "0.29.4")
+ =C2=A0 =C2=A0(version "0.29.5&quo= t;)
=C2=A0 =C2=A0 =C2=A0(source
=C2=A0 =C2=A0 =C2=A0 (origin
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 (method url-fetch)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = (uri (crate-uri "wayland-scanner" version))
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 (file-name (string-append name "-" version ".tar.= gz"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (sha256
- =C2=A0 =C2=A0 =C2=A0= =C2=A0(base32 "1q7r764z8k922xf51fj56b1xm29ffi9ap8jnf4c478gp8cqyv89r&q= uot;))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32 "0lxx3i2kxnmsk421qx87= lqqc9kd2y1ksjxcyg0pqbar2zbc06hwg"))))
=C2=A0 =C2=A0 =C2=A0(build-sy= stem cargo-build-system)
- =C2=A0 =C2=A0(inputs
- =C2=A0 =C2=A0 (list= rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8))
+ =C2=A0 =C2=A0(argum= ents
+ =C2=A0 =C2=A0 `(#:cargo-inputs
+ =C2=A0 =C2=A0 =C2=A0 (("= rust-proc-macro2" ,rust-proc-macro2-1)
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0("rust-quote" ,rust-quote-1)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0(= "rust-xml-rs" ,rust-xml-rs-0.8))))
=C2=A0 =C2=A0 =C2=A0(home-p= age "https://github.= com/smithay/wayland-rs")
=C2=A0 =C2=A0 =C2=A0(synopsis "Ge= nerate Rust APIs from XML Wayland protocol files")
=C2=A0 =C2=A0 = =C2=A0(description
@@ -2927,16 +2930,15 @@ (define-public rust-wayland-s= canner-0.28
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(inherit rust-w= ayland-scanner-0.29)
=C2=A0 =C2=A0 =C2=A0(name "rust-wayland-scanne= r")
- =C2=A0 =C2=A0(version "0.28.3")
+ =C2=A0 =C2=A0(= version "0.28.6")
=C2=A0 =C2=A0 =C2=A0(source
=C2=A0 =C2=A0= =C2=A0 (origin
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (method url-fetch)
=C2=A0= =C2=A0 =C2=A0 =C2=A0 (uri (crate-uri "wayland-scanner" version))=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (file-name (string-append name "-"= ; version ".tar.gz"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (sha256
-= =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32 "0g8ky63qk27in7zajycj3fyydsxlj19ha= nfcvr8d7z5kcxbvl43h"))))
- =C2=A0 =C2=A0(inputs
- =C2=A0 =C2=A0 = (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8))))
+ =C2=A0 =C2= =A0 =C2=A0 =C2=A0(base32
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 "1w839jsh7nr= ni4f2x5bkapf98w7kddxyqmpks4rf67dnvsr3x4nf"))))))
=C2=A0
=C2=A0(d= efine-public rust-wayland-scanner-0.23
=C2=A0 =C2=A0(package
--
2= .37.3



From 70d6222e6891743506a42b42412a6358441fe15c Mon Sep 17 00:= 00:00 2001
From: Ben Van Sleen <benvansleen@gmail.com>
Date: Wed, 7 Sep 2022 16:38:11 -0500Subject: [PATCH 4/4] rust-wayland-client-0.28: Moved rust-wayland-scanner= to
=C2=A0cargo-dependency as specified by its cargo.toml

---
= =C2=A0gnu/packages/crates-graphics.scm | 4 ++--
=C2=A01 file changed, 2 = insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-graph= ics.scm b/gnu/packages/crates-graphics.scm
index 35e4f4eb5b..19b3972365 = 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crat= es-graphics.scm
@@ -2553,7 +2553,8 @@ (define-public rust-wayland-client= -0.28
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-downcast-rs" ,r= ust-downcast-rs-1)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-libc&qu= ot; ,rust-libc-0.2)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-nix&qu= ot; ,rust-nix-0.18)
- =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-scoped-tls&= quot; ,rust-scoped-tls-1))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0("rust-scop= ed-tls" ,rust-scoped-tls-1)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0("rus= t-wayland-scanner" ,rust-wayland-scanner-0.28))
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 #:cargo-development-inputs
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ((&quo= t;rust-tempfile" ,rust-tempfile-3))))
=C2=A0 =C2=A0 =C2=A0(inputs@@ -2563,7 +2564,6 @@ (define-public rust-wayland-client-0.28
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 rust-nix-0.18
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 rust-scoped-tls-1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 rust-wayland-commons-0.28
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 rust-wayland-scanner-0.28
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = rust-wayland-sys-0.28))))
=C2=A0
=C2=A0(define-public rust-wayland-cl= ient-0.23
--
2.37.3


--000000000000446b8505e81d656d-- --000000000000446b8705e81d656f Content-Type: text/x-patch; charset="US-ASCII"; name="0003-rust-wayland-scanner-Bumped-0.29-from-v0.28.3-to-v0..patch" Content-Disposition: attachment; filename="0003-rust-wayland-scanner-Bumped-0.29-from-v0.28.3-to-v0..patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l7s5uka02 RnJvbSBkYmUxMTAyYzUwY2E3NjQ0YTM1MjA1YTVkYTczOWJiZWYzNTBmMWViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW4gVmFuIFNsZWVuIDxiZW52YW5zbGVlbkBnbWFpbC5jb20+ CkRhdGU6IFdlZCwgNyBTZXAgMjAyMiAxNjozNjo0OSAtMDUwMApTdWJqZWN0OiBbUEFUQ0ggMy80 XSBydXN0LXdheWxhbmQtc2Nhbm5lcjogQnVtcGVkICotMC4yOSBmcm9tIHYwLjI4LjMgdG8KIHYw LjI4LjYgYW5kICotMC4yOCBmcm9tIHYwLjI4LjMgdG8gdjAuMjguNgoKLS0tCiBnbnUvcGFja2Fn ZXMvY3JhdGVzLWdyYXBoaWNzLnNjbSB8IDE4ICsrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL2NyYXRlcy1ncmFwaGljcy5zY20gYi9nbnUvcGFja2FnZXMvY3JhdGVzLWdyYXBo aWNzLnNjbQppbmRleCBjNWQ5NTU1NTk5Li4zNWU0ZjRlYjViIDEwMDY0NAotLS0gYS9nbnUvcGFj a2FnZXMvY3JhdGVzLWdyYXBoaWNzLnNjbQorKysgYi9nbnUvcGFja2FnZXMvY3JhdGVzLWdyYXBo aWNzLnNjbQpAQCAtMjkwMywxNyArMjkwMywyMCBAQCAoZGVmaW5lLXB1YmxpYyBydXN0LXdheWxh bmQtcHJvdG9jb2xzLTAuMjEKIChkZWZpbmUtcHVibGljIHJ1c3Qtd2F5bGFuZC1zY2FubmVyLTAu MjkKICAgKHBhY2thZ2UKICAgICAobmFtZSAicnVzdC13YXlsYW5kLXNjYW5uZXIiKQotICAgICh2 ZXJzaW9uICIwLjI5LjQiKQorICAgICh2ZXJzaW9uICIwLjI5LjUiKQogICAgIChzb3VyY2UKICAg ICAgKG9yaWdpbgogICAgICAgIChtZXRob2QgdXJsLWZldGNoKQogICAgICAgICh1cmkgKGNyYXRl LXVyaSAid2F5bGFuZC1zY2FubmVyIiB2ZXJzaW9uKSkKICAgICAgICAoZmlsZS1uYW1lIChzdHJp bmctYXBwZW5kIG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkKICAgICAgICAoc2hhMjU2Ci0g ICAgICAgIChiYXNlMzIgIjFxN3I3NjR6OGs5MjJ4ZjUxZmo1NmIxeG0yOWZmaTlhcDhqbmY0YzQ3 OGdwOGNxeXY4OXIiKSkpKQorICAgICAgICAoYmFzZTMyICIwbHh4M2kya3hubXNrNDIxcXg4N2xx cWM5a2QyeTFrc2p4Y3lnMHBxYmFyMnpiYzA2aHdnIikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGNh cmdvLWJ1aWxkLXN5c3RlbSkKLSAgICAoaW5wdXRzCi0gICAgIChsaXN0IHJ1c3QtcHJvYy1tYWNy bzItMSBydXN0LXF1b3RlLTEgcnVzdC14bWwtcnMtMC44KSkKKyAgICAoYXJndW1lbnRzCisgICAg IGAoIzpjYXJnby1pbnB1dHMKKyAgICAgICAoKCJydXN0LXByb2MtbWFjcm8yIiAscnVzdC1wcm9j LW1hY3JvMi0xKQorICAgICAgICAoInJ1c3QtcXVvdGUiICxydXN0LXF1b3RlLTEpCisgICAgICAg ICgicnVzdC14bWwtcnMiICxydXN0LXhtbC1ycy0wLjgpKSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0 cHM6Ly9naXRodWIuY29tL3NtaXRoYXkvd2F5bGFuZC1ycyIpCiAgICAgKHN5bm9wc2lzICJHZW5l cmF0ZSBSdXN0IEFQSXMgZnJvbSBYTUwgV2F5bGFuZCBwcm90b2NvbCBmaWxlcyIpCiAgICAgKGRl c2NyaXB0aW9uCkBAIC0yOTI3LDE2ICsyOTMwLDE1IEBAIChkZWZpbmUtcHVibGljIHJ1c3Qtd2F5 bGFuZC1zY2FubmVyLTAuMjgKICAgKHBhY2thZ2UKICAgICAoaW5oZXJpdCBydXN0LXdheWxhbmQt c2Nhbm5lci0wLjI5KQogICAgIChuYW1lICJydXN0LXdheWxhbmQtc2Nhbm5lciIpCi0gICAgKHZl cnNpb24gIjAuMjguMyIpCisgICAgKHZlcnNpb24gIjAuMjguNiIpCiAgICAgKHNvdXJjZQogICAg ICAob3JpZ2luCiAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCiAgICAgICAgKHVyaSAoY3JhdGUt dXJpICJ3YXlsYW5kLXNjYW5uZXIiIHZlcnNpb24pKQogICAgICAgIChmaWxlLW5hbWUgKHN0cmlu Zy1hcHBlbmQgbmFtZSAiLSIgdmVyc2lvbiAiLnRhci5neiIpKQogICAgICAgIChzaGEyNTYKLSAg ICAgICAgKGJhc2UzMiAiMGc4a3k2M3FrMjdpbjd6YWp5Y2ozZnl5ZHN4bGoxOWhhbmZjdnI4ZDd6 NWtjeGJ2bDQzaCIpKSkpCi0gICAgKGlucHV0cwotICAgICAobGlzdCBydXN0LXByb2MtbWFjcm8y LTEgcnVzdC1xdW90ZS0xIHJ1c3QteG1sLXJzLTAuOCkpKSkKKyAgICAgICAgKGJhc2UzMgorICAg ICAgICAgIjF3ODM5anNoN25ybmk0ZjJ4NWJrYXBmOTh3N2tkZHh5cW1wa3M0cmY2N2RudnNyM3g0 bmYiKSkpKSkpCiAKIChkZWZpbmUtcHVibGljIHJ1c3Qtd2F5bGFuZC1zY2FubmVyLTAuMjMKICAg KHBhY2thZ2UKLS0gCjIuMzcuMwoK --000000000000446b8705e81d656f Content-Type: text/x-patch; charset="US-ASCII"; name="0001-rust-windows-sys-0.36-Added-package-updating-existin.patch" Content-Disposition: attachment; filename="0001-rust-windows-sys-0.36-Added-package-updating-existin.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l7s5uk7a0 RnJvbSA2ODJiMzM1MDU4YzZkZmYxZWE0ODE2NTc2MmVjOGJiYzBlNDY5ODAzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW4gVmFuIFNsZWVuIDxiZW52YW5zbGVlbkBnbWFpbC5jb20+ CkRhdGU6IFdlZCwgNyBTZXAgMjAyMiAxNjozMjowMCAtMDUwMApTdWJqZWN0OiBbUEFUQ0ggMS80 XSBydXN0LXdpbmRvd3Mtc3lzLTAuMzY6IEFkZGVkIHBhY2thZ2UgKHVwZGF0aW5nIGV4aXN0aW5n CiBwYWNrYWdlIGZyb20gMC4yOCAtPiAwLjM2KS4gQWxzbyBhZGRlZCBkZWZpbml0aW9ucyBmb3Ig ZGVwZW5kZW5jaWVzCiBydXN0LXdpbmRvd3MtKi0wLjM2CgotLS0KIGdudS9wYWNrYWdlcy9jcmF0 ZXMtaW8uc2NtIHwgODYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEg ZmlsZSBjaGFuZ2VkLCA4NiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2Vz L2NyYXRlcy1pby5zY20gYi9nbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbQppbmRleCBhMDNmMDJl ODY4Li5hOWQ4YmQ1NjY5IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbQor KysgYi9nbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbQpAQCAtNzQwNzUsNiArNzQwNzUsMTkgQEAg KGRlZmluZS1wdWJsaWMgcnVzdC13aW5kb3dzLXg4Ni02NC1tc3ZjLTAuMzIKIGNyYXRlLiIpCiAg ICAgKGxpY2Vuc2UgKGxpc3QgbGljZW5zZTpleHBhdCBsaWNlbnNlOmFzbDIuMCkpKSkKIAorKGRl ZmluZS1wdWJsaWMgcnVzdC13aW5kb3dzLXg4Ni02NC1tc3ZjLTAuMzYKKyAgKHBhY2thZ2UKKyAg ICAoaW5oZXJpdCBydXN0LXdpbmRvd3MteDg2LTY0LW1zdmMtMC4zMikKKyAgICAobmFtZSAicnVz dC13aW5kb3dzLXg4Ni02NC1tc3ZjIikKKyAgICAodmVyc2lvbiAiMC4zNi4xIikKKyAgICAoc291 cmNlIChvcmlnaW4KKyAgICAgICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgICAg ICAgICh1cmkgKGNyYXRlLXVyaSAid2luZG93c194ODZfNjRfbXN2YyIgdmVyc2lvbikpCisgICAg ICAgICAgICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBlbmQgbmFtZSAiLSIgdmVyc2lvbiAiLnRh ci5neiIpKQorICAgICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgICAoYmFzZTMyCisg ICAgICAgICAgICAgICAgIjEwM24zeGlqbTV2cjdxeHIxZHBzMjAyY2tmbnY3bmpqbm5mcW1jaGc4 Z2w1aWk1Y2w0ZjgiKSkpKSkpCisKIChkZWZpbmUtcHVibGljIHJ1c3Qtd2luZG93cy14ODYtNjQt Z251LTAuMjgKICAgKHBhY2thZ2UKICAgICAobmFtZSAicnVzdC13aW5kb3dzLXg4Ni02NC1nbnUi KQpAQCAtNzQxMTQsNiArNzQxMjcsMTkgQEAgKGRlZmluZS1wdWJsaWMgcnVzdC13aW5kb3dzLXg4 Ni02NC1nbnUtMC4zMgogY3JhdGUuIikKICAgICAobGljZW5zZSAobGlzdCBsaWNlbnNlOmV4cGF0 IGxpY2Vuc2U6YXNsMi4wKSkpKQogCisoZGVmaW5lLXB1YmxpYyBydXN0LXdpbmRvd3MteDg2LTY0 LWdudS0wLjM2CisgIChwYWNrYWdlCisgICAgKGluaGVyaXQgcnVzdC13aW5kb3dzLXg4Ni02NC1n bnUtMC4zMikKKyAgICAobmFtZSAicnVzdC13aW5kb3dzLXg4Ni02NC1nbnUiKQorICAgICh2ZXJz aW9uICIwLjM2LjEiKQorICAgIChzb3VyY2UgKG9yaWdpbgorICAgICAgICAgICAgICAobWV0aG9k IHVybC1mZXRjaCkKKyAgICAgICAgICAgICAgKHVyaSAoY3JhdGUtdXJpICJ3aW5kb3dzX3g4Nl82 NF9nbnUiIHZlcnNpb24pKQorICAgICAgICAgICAgICAoZmlsZS1uYW1lIChzdHJpbmctYXBwZW5k IG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkKKyAgICAgICAgICAgICAgKHNoYTI1NgorICAg ICAgICAgICAgICAgKGJhc2UzMgorICAgICAgICAgICAgICAgICIxcWZyY2szam5paHltZnJkMDFz ODI2MGQ0c25xbDhrczJwOHlhYWJpcGkzbmh3ZGlna2FkIikpKSkpKQorCiAoZGVmaW5lLXB1Ymxp YyBydXN0LXdpbmRvd3MtaTY4Ni1tc3ZjLTAuMjgKICAgKHBhY2thZ2UKICAgICAobmFtZSAicnVz dC13aW5kb3dzLWk2ODYtbXN2YyIpCkBAIC03NDE1Myw2ICs3NDE3OSwxOSBAQCAoZGVmaW5lLXB1 YmxpYyBydXN0LXdpbmRvd3MtaTY4Ni1tc3ZjLTAuMzIKIGNyYXRlLiIpCiAgICAgKGxpY2Vuc2Ug KGxpc3QgbGljZW5zZTpleHBhdCBsaWNlbnNlOmFzbDIuMCkpKSkKIAorKGRlZmluZS1wdWJsaWMg cnVzdC13aW5kb3dzLWk2ODYtbXN2Yy0wLjM2CisgIChwYWNrYWdlCisgICAgKGluaGVyaXQgcnVz dC13aW5kb3dzLWk2ODYtbXN2Yy0wLjMyKQorICAgIChuYW1lICJydXN0LXdpbmRvd3MtaTY4Ni1t c3ZjIikKKyAgICAodmVyc2lvbiAiMC4zNi4xIikKKyAgICAoc291cmNlIChvcmlnaW4KKyAgICAg ICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgICAgICAgICh1cmkgKGNyYXRlLXVy aSAid2luZG93c19pNjg2X21zdmMiIHZlcnNpb24pKQorICAgICAgICAgICAgICAoZmlsZS1uYW1l IChzdHJpbmctYXBwZW5kIG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkKKyAgICAgICAgICAg ICAgKHNoYTI1NgorICAgICAgICAgICAgICAgKGJhc2UzMgorICAgICAgICAgICAgICAgICIwOTdo MmE3d2lnMDR3Ym1waTNyejFha2R5NHM4Z3NsajVzenN4OGcydjBkajkxcXIzcnoyIikpKSkpKQor CiAoZGVmaW5lLXB1YmxpYyBydXN0LXdpbmRvd3MtaTY4Ni1nbnUtMC4yOAogICAocGFja2FnZQog ICAgIChuYW1lICJydXN0LXdpbmRvd3MtaTY4Ni1nbnUiKQpAQCAtNzQxOTIsNiArNzQyMzEsMTkg QEAgKGRlZmluZS1wdWJsaWMgcnVzdC13aW5kb3dzLWk2ODYtZ251LTAuMzIKIGNyYXRlLiIpCiAg ICAgKGxpY2Vuc2UgKGxpc3QgbGljZW5zZTpleHBhdCBsaWNlbnNlOmFzbDIuMCkpKSkKIAorKGRl ZmluZS1wdWJsaWMgcnVzdC13aW5kb3dzLWk2ODYtZ251LTAuMzYKKyAgKHBhY2thZ2UKKyAgICAo aW5oZXJpdCBydXN0LXdpbmRvd3MtaTY4Ni1nbnUtMC4zMikKKyAgICAobmFtZSAicnVzdC13aW5k b3dzLWk2ODYtZ251IikKKyAgICAodmVyc2lvbiAiMC4zNi4xIikKKyAgICAoc291cmNlIChvcmln aW4KKyAgICAgICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgICAgICAgICh1cmkg KGNyYXRlLXVyaSAid2luZG93c19pNjg2X2dudSIgdmVyc2lvbikpCisgICAgICAgICAgICAgIChm aWxlLW5hbWUgKHN0cmluZy1hcHBlbmQgbmFtZSAiLSIgdmVyc2lvbiAiLnRhci5neiIpKQorICAg ICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgICAoYmFzZTMyCisgICAgICAgICAgICAg ICAgIjFkbTNzdnhmemFtcnY2a2tseWRhOWMzcXlsZ3duNW53ZHBzNnAwa2M5eDZzMDc3bnEzaHEi KSkpKSkpCisKIChkZWZpbmUtcHVibGljIHJ1c3Qtd2luZG93cy1hYXJjaDY0LW1zdmMtMC4yOAog ICAocGFja2FnZQogICAgIChuYW1lICJydXN0LXdpbmRvd3MtYWFyY2g2NC1tc3ZjIikKQEAgLTc0 MjMxLDYgKzc0MjgzLDE5IEBAIChkZWZpbmUtcHVibGljIHJ1c3Qtd2luZG93cy1hYXJjaDY0LW1z dmMtMC4zMgogY3JhdGUuIikKICAgICAobGljZW5zZSAobGlzdCBsaWNlbnNlOmV4cGF0IGxpY2Vu c2U6YXNsMi4wKSkpKQogCisoZGVmaW5lLXB1YmxpYyBydXN0LXdpbmRvd3MtYWFyY2g2NC1tc3Zj LTAuMzYKKyAgKHBhY2thZ2UKKyAgICAoaW5oZXJpdCBydXN0LXdpbmRvd3MtYWFyY2g2NC1tc3Zj LTAuMzIpCisgICAgKG5hbWUgInJ1c3Qtd2luZG93cy1hYXJjaDY0LW1zdmMiKQorICAgICh2ZXJz aW9uICIwLjM2LjEiKQorICAgIChzb3VyY2UgKG9yaWdpbgorICAgICAgICAgICAgICAobWV0aG9k IHVybC1mZXRjaCkKKyAgICAgICAgICAgICAgKHVyaSAoY3JhdGUtdXJpICJ3aW5kb3dzX2FhcmNo NjRfbXN2YyIgdmVyc2lvbikpCisgICAgICAgICAgICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBl bmQgbmFtZSAiLSIgdmVyc2lvbiAiLnRhci5neiIpKQorICAgICAgICAgICAgICAoc2hhMjU2Cisg ICAgICAgICAgICAgICAoYmFzZTMyCisgICAgICAgICAgICAgICAgIjBpeGF4czJjMzdsbDJzbXBy emgweHE1cDIzOHpuOHlsemIzbGsxemRkcW1kNzd5dzdmNHYiKSkpKSkpCisKIChkZWZpbmUtcHVi bGljIHJ1c3Qtd2luZG93cy1pbXBsZW1lbnQtMC4zMgogICAocGFja2FnZQogICAgIChuYW1lICJy dXN0LXdpbmRvd3MtaW1wbGVtZW50IikKQEAgLTc0MjgyLDYgKzc0MzQ3LDI3IEBAIChkZWZpbmUt cHVibGljIHJ1c3Qtd2luZG93cy1zeXMtMC4yOAogaWYgdGhleSB3ZXJlIGp1c3QgYW5vdGhlciBS dXN0IG1vZHVsZS4iKQogICAgIChsaWNlbnNlIChsaXN0IGxpY2Vuc2U6ZXhwYXQgbGljZW5zZTph c2wyLjApKSkpCiAKKyhkZWZpbmUtcHVibGljIHJ1c3Qtd2luZG93cy1zeXMtMC4zNgorICAocGFj a2FnZQorICAgIChpbmhlcml0IHJ1c3Qtd2luZG93cy1zeXMtMC4yOCkKKyAgICAobmFtZSAicnVz dC13aW5kb3dzLXN5cyIpCisgICAgKHZlcnNpb24gIjAuMzYuMSIpCisgICAgKHNvdXJjZSAob3Jp Z2luCisgICAgICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICAgICAgICAodXJp IChjcmF0ZS11cmkgIndpbmRvd3Mtc3lzIiB2ZXJzaW9uKSkKKyAgICAgICAgICAgICAgKGZpbGUt bmFtZSAoc3RyaW5nLWFwcGVuZCBuYW1lICItIiB2ZXJzaW9uICIudGFyLmd6IikpCisgICAgICAg ICAgICAgIChzaGEyNTYKKyAgICAgICAgICAgICAgIChiYXNlMzIKKyAgICAgICAgICAgICAgICAi MWxtcWFuZ3YwemcxbDQ2eGlxN3JmbnF3c3g4ZjhtNTJtcWJnZzJtcng3eDUycmQxYTE3YSIpKSkp CisgICAgKGJ1aWxkLXN5c3RlbSBjYXJnby1idWlsZC1zeXN0ZW0pCisgICAgKGFyZ3VtZW50cwor ICAgICBgKCM6c2tpcC1idWlsZD8gI3QKKyAgICAgICAjOmNhcmdvLWlucHV0cyAoKCJydXN0LXdp bmRvd3MtYWFyY2g2NC1tc3ZjIiAscnVzdC13aW5kb3dzLWFhcmNoNjQtbXN2Yy0wLjM2KQorICAg ICAgICAgICAgICAgICAgICAgICAoInJ1c3Qtd2luZG93cy1pNjg2LWdudSIgLHJ1c3Qtd2luZG93 cy1pNjg2LWdudS0wLjM2KQorICAgICAgICAgICAgICAgICAgICAgICAoInJ1c3Qtd2luZG93cy1p Njg2LW1zdmMiICxydXN0LXdpbmRvd3MtaTY4Ni1tc3ZjLTAuMzYpCisgICAgICAgICAgICAgICAg ICAgICAgICgicnVzdC13aW5kb3dzLXg4Ni02NC1nbnUiICxydXN0LXdpbmRvd3MteDg2LTY0LWdu dS0wLjM2KQorICAgICAgICAgICAgICAgICAgICAgICAoInJ1c3Qtd2luZG93cy14ODYtNjQtbXN2 YyIgLHJ1c3Qtd2luZG93cy14ODYtNjQtbXN2Yy0wLjM2KSkpKSkpCisKIChkZWZpbmUtcHVibGlj IHJ1c3Qtd2luZG93cy1nZW4tMC45CiAgIChwYWNrYWdlCiAgICAgKG5hbWUgInJ1c3Qtd2luZG93 cy1nZW4iKQotLSAKMi4zNy4zCgo= --000000000000446b8705e81d656f Content-Type: text/x-patch; charset="US-ASCII"; name="0002-rust-parking-lot-core-0.9-Updated-dependency-list-to.patch" Content-Disposition: attachment; filename="0002-rust-parking-lot-core-0.9-Updated-dependency-list-to.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l7s5uk9e1 RnJvbSAyOGQzZmYwZDI0N2ViMWI5NmFkNThlMTIwYTRlMDk5Y2I5YmEzOTdmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW4gVmFuIFNsZWVuIDxiZW52YW5zbGVlbkBnbWFpbC5jb20+ CkRhdGU6IFdlZCwgNyBTZXAgMjAyMiAxNjozNDoyNiAtMDUwMApTdWJqZWN0OiBbUEFUQ0ggMi80 XSBydXN0LXBhcmtpbmctbG90LWNvcmUtMC45OiBVcGRhdGVkIGRlcGVuZGVuY3kgbGlzdCB0bwog aW5jbHVkZSBydXN0LXdpbmRvd3Mtc3lzLTAuMzYgYXMgcmVxdWVzdGVkIGJ5IHBhY2thZ2UncyBj YXJnby50b21sCgotLS0KIGdudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtIHwgMyArKy0KIDEgZmls ZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9n bnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbSBiL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtCmlu ZGV4IGE5ZDhiZDU2NjkuLjQ0NDA5OTcyODcgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9jcmF0 ZXMtaW8uc2NtCisrKyBiL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtCkBAIC00MTczNSw3ICs0 MTczNSw4IEBAIChkZWZpbmUtcHVibGljIHJ1c3QtcGFya2luZy1sb3QtY29yZS0wLjkKICAgICAg ICAgKCJydXN0LXBldGdyYXBoIiAscnVzdC1wZXRncmFwaC0wLjYpCiAgICAgICAgICgicnVzdC1y ZWRveC1zeXNjYWxsIiAscnVzdC1yZWRveC1zeXNjYWxsLTAuMikKICAgICAgICAgKCJydXN0LXNt YWxsdmVjIiAscnVzdC1zbWFsbHZlYy0xKQotICAgICAgICAoInJ1c3QtdGhyZWFkLWlkIiAscnVz dC10aHJlYWQtaWQtNCkpKSkKKyAgICAgICAgKCJydXN0LXRocmVhZC1pZCIgLHJ1c3QtdGhyZWFk LWlkLTQpCisgICAgICAgICgicnVzdC13aW5kb3dzLXN5cyIgLHJ1c3Qtd2luZG93cy1zeXMtMC4z NikpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vQW1hbmlldS9wYXJraW5n X2xvdCIpCiAgICAgKHN5bm9wc2lzICJBUEkgZm9yIGNyZWF0aW5nIGN1c3RvbSBzeW5jaHJvbml6 YXRpb24gcHJpbWl0aXZlcyIpCiAgICAgKGRlc2NyaXB0aW9uICJUaGlzIHBhY2thZ2UgcHJvdmlk ZXMgYW4gYWR2YW5jZWQgQVBJIGZvciBjcmVhdGluZyBjdXN0b20KLS0gCjIuMzcuMwoK --000000000000446b8705e81d656f Content-Type: text/x-patch; charset="US-ASCII"; name="0004-rust-wayland-client-0.28-Moved-rust-wayland-scanner-.patch" Content-Disposition: attachment; filename="0004-rust-wayland-client-0.28-Moved-rust-wayland-scanner-.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l7s5ukal3 RnJvbSA3MGQ2MjIyZTY4OTE3NDM1MDZhNDJiNDI0MTJhNjM1ODQ0MWZlMTVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW4gVmFuIFNsZWVuIDxiZW52YW5zbGVlbkBnbWFpbC5jb20+ CkRhdGU6IFdlZCwgNyBTZXAgMjAyMiAxNjozODoxMSAtMDUwMApTdWJqZWN0OiBbUEFUQ0ggNC80 XSBydXN0LXdheWxhbmQtY2xpZW50LTAuMjg6IE1vdmVkIHJ1c3Qtd2F5bGFuZC1zY2FubmVyIHRv CiBjYXJnby1kZXBlbmRlbmN5IGFzIHNwZWNpZmllZCBieSBpdHMgY2FyZ28udG9tbAoKLS0tCiBn bnUvcGFja2FnZXMvY3JhdGVzLWdyYXBoaWNzLnNjbSB8IDQgKystLQogMSBmaWxlIGNoYW5nZWQs IDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2Fn ZXMvY3JhdGVzLWdyYXBoaWNzLnNjbSBiL2dudS9wYWNrYWdlcy9jcmF0ZXMtZ3JhcGhpY3Muc2Nt CmluZGV4IDM1ZTRmNGViNWIuLjE5YjM5NzIzNjUgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9j cmF0ZXMtZ3JhcGhpY3Muc2NtCisrKyBiL2dudS9wYWNrYWdlcy9jcmF0ZXMtZ3JhcGhpY3Muc2Nt CkBAIC0yNTUzLDcgKzI1NTMsOCBAQCAoZGVmaW5lLXB1YmxpYyBydXN0LXdheWxhbmQtY2xpZW50 LTAuMjgKICAgICAgICAgKCJydXN0LWRvd25jYXN0LXJzIiAscnVzdC1kb3duY2FzdC1ycy0xKQog ICAgICAgICAoInJ1c3QtbGliYyIgLHJ1c3QtbGliYy0wLjIpCiAgICAgICAgICgicnVzdC1uaXgi ICxydXN0LW5peC0wLjE4KQotICAgICAgICAoInJ1c3Qtc2NvcGVkLXRscyIgLHJ1c3Qtc2NvcGVk LXRscy0xKSkKKyAgICAgICAgKCJydXN0LXNjb3BlZC10bHMiICxydXN0LXNjb3BlZC10bHMtMSkK KyAgICAgICAgKCJydXN0LXdheWxhbmQtc2Nhbm5lciIgLHJ1c3Qtd2F5bGFuZC1zY2FubmVyLTAu MjgpKQogICAgICAgICM6Y2FyZ28tZGV2ZWxvcG1lbnQtaW5wdXRzCiAgICAgICAgKCgicnVzdC10 ZW1wZmlsZSIgLHJ1c3QtdGVtcGZpbGUtMykpKSkKICAgICAoaW5wdXRzCkBAIC0yNTYzLDcgKzI1 NjQsNiBAQCAoZGVmaW5lLXB1YmxpYyBydXN0LXdheWxhbmQtY2xpZW50LTAuMjgKICAgICAgICAg ICAgcnVzdC1uaXgtMC4xOAogICAgICAgICAgICBydXN0LXNjb3BlZC10bHMtMQogICAgICAgICAg ICBydXN0LXdheWxhbmQtY29tbW9ucy0wLjI4Ci0gICAgICAgICAgIHJ1c3Qtd2F5bGFuZC1zY2Fu bmVyLTAuMjgKICAgICAgICAgICAgcnVzdC13YXlsYW5kLXN5cy0wLjI4KSkpKQogCiAoZGVmaW5l LXB1YmxpYyBydXN0LXdheWxhbmQtY2xpZW50LTAuMjMKLS0gCjIuMzcuMwoK --000000000000446b8705e81d656f--