From unknown Sat Jun 21 05:06:08 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#42695 <42695@debbugs.gnu.org> To: bug#42695 <42695@debbugs.gnu.org> Subject: Status: [PATCH] sway bump to 1.5 Reply-To: bug#42695 <42695@debbugs.gnu.org> Date: Sat, 21 Jun 2025 12:06:08 +0000 retitle 42695 [PATCH] sway bump to 1.5 reassign 42695 guix-patches submitter 42695 andremegafone@gmail.com (Andr=C3=A9 Alexandre Gomes) severity 42695 normal tag 42695 patch fixed thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 03 06:57:57 2020 Received: (at submit) by debbugs.gnu.org; 3 Aug 2020 10:57:57 +0000 Received: from localhost ([127.0.0.1]:44428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2YAG-0005Vr-RV for submit@debbugs.gnu.org; Mon, 03 Aug 2020 06:57:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:57618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2YAC-0005Vh-5F for submit@debbugs.gnu.org; Mon, 03 Aug 2020 06:57:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2YAB-0003tm-5K for guix-patches@gnu.org; Mon, 03 Aug 2020 06:57:51 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:55332) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2YA9-0002Ab-9D for guix-patches@gnu.org; Mon, 03 Aug 2020 06:57:50 -0400 Received: by mail-wm1-x334.google.com with SMTP id 9so13905460wmj.5 for ; Mon, 03 Aug 2020 03:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=bqEx/sHPuRwNdnq+u1vnIhBv4WF/lnV5pGW5q+Mam0I=; b=UviFAaVaoMZaPS3EvXM8kdHprOK6m8QVQ5TvJDYDFa54w0JPLtQ7hFloq0UlRXLkbh 5kBUne6hubAOCx3osVHjN9xDxzOwhj8kZsl3sdIWvqD2e9C3IfvZqlM3U0l9/hkd6nby bs28TRE6EyXwFOCIqAbMxqrJzOgAI/Qb+h++N4r3gWrnjvItZrJEKivBaGE/bMo5KR9u Y9vAciqjkoSm5P3oH8+epKrneglz4qHuuWYGPatkx8SWKyTDotxlT0FvyxKTH3CbBN5g oJruAdD+1xAPtKgiYWiM+Z8XArt9EmCNLG99xM0EcUbwp3sWjJidc7OgQVDvbiCRT/bn 8Kgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=bqEx/sHPuRwNdnq+u1vnIhBv4WF/lnV5pGW5q+Mam0I=; b=ui/zE/H56NDt9F7bHP81n3EQmnyDwmITl4d828YHP9C6Ss4pD7YUua8Wnw6oI0Mspy uYfOwLNwtqI8ISqbceBourjETdkMonoyFHr6xDChVeVjOJlmy8mrMrHQk9R+bLOz3rq6 jKGtDdZicc7bEN0ZqNcSb9H0XHEU8KU0EGyJKFkJvRk+6iw3ow7dCyGvb8LJfjOC78AW k6JOzhRlEAju3G6Uv55lKVPYvgRdyr+qpJviImcnLcy3lqGuTg1r47fdasxFnhjWnRdi ezMDSopJbhqyAatbLIRqSkmpVHj69qgbGaMv/wSqhPoVovvwDMtSd/A40yy3ErzbXTfk 696w== X-Gm-Message-State: AOAM532NHbPY8F25EmTVn0dJwMaQaW09oshKjjCNcsygfErCHzc92Ota AkHLMBiBL11vDfspPToWkNcxZfZU X-Google-Smtp-Source: ABdhPJx3oU25+T2Z88sbuYlFlqkT+BIWScgAWPRGZHQgerZnNJR+vHA5cgCIpqya8UrhRuGwsZGKKw== X-Received: by 2002:a1c:3142:: with SMTP id x63mr14794816wmx.62.1596452265761; Mon, 03 Aug 2020 03:57:45 -0700 (PDT) Received: from guix-xps13 ([2001:818:daa9:6700:f523:99f8:1663:ebe2]) by smtp.gmail.com with ESMTPSA id s19sm27516652wrb.54.2020.08.03.03.57.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 03:57:45 -0700 (PDT) From: andremegafone@gmail.com (=?utf-8?Q?Andr=C3=A9?= Alexandre Gomes) To: guix-patches@gnu.org Subject: [PATCH] sway bump to 1.5 Date: Mon, 03 Aug 2020 11:57:44 +0100 Message-ID: <87mu3cuhcn.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=andremegafone@gmail.com; helo=mail-wm1-x334.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=guix-sway.patch diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index bc3c152627..04d76a7da9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1357,7 +1357,7 @@ modules for building a Wayland compositor.") (define-public sway (package (name "sway") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) @@ -1366,7 +1366,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja")))) + (base32 "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9")))) (build-system meson-build-system) (arguments `(#:phases --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Andr=C3=A9 Alexandre Gomes "Free Thought, Free World" --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 03 15:16:28 2020 Received: (at 42695) by debbugs.gnu.org; 3 Aug 2020 19:16:28 +0000 Received: from localhost ([127.0.0.1]:46054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2fwi-00042F-4B for submit@debbugs.gnu.org; Mon, 03 Aug 2020 15:16:28 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:39337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2fwf-000420-Hf for 42695@debbugs.gnu.org; Mon, 03 Aug 2020 15:16:26 -0400 Received: by mail-lj1-f194.google.com with SMTP id v9so6406027ljk.6 for <42695@debbugs.gnu.org>; Mon, 03 Aug 2020 12:16:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=QJeqWeN7t6hznSazuM9a95p4zWFslW+vXhFMy4D7+xg=; b=dtWG9Jfvi/p1ZEEjSGMydwZI4iyNwj0A4EF3DI2uao0rtdnZgt2XzTn5laEBXQl4v1 rvme1S24WGtOUPTkYI9xp5m+O10O7WEO3cG4JqnUTBGIc2PZEIfYY9AWuPZhThnRXk3N hNogXeN/qYBCsqnEKSlIUF9W3FqreL4Hzu0DDLYz6TZfzDdi4yA1rd+ikbgm7Dr2Qw03 7XnMdUH/cSSlYMSsSuXpUEelUVrUYcsBN8x7vRvmgC8EfR7HqgbgiaNBrp9ZXeYpcYki qrFG4nqAUOZgo2pOl9PrTdY6uuF0uQmnySyUl6a7Znm6eljJZ/Arw4hBUwjVpW0cE7R2 gHlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=QJeqWeN7t6hznSazuM9a95p4zWFslW+vXhFMy4D7+xg=; b=Ms7UoAYwVZXnH7lQeR0Pp5jPAG6KuH3jlEjhZWm+bxhKXQdfDNX9MdyFTk19lMXrnb Qy3F4hMEYxZ2NPzVsXrSzrVtpPIAvtmQvhFHOP82+q1Zinj16SgA7Fl55/gXp8Ycm1BH bU1G+a2PjrZDVhOOOCFqlLiYrTxEVkje4QSCipvhXjsvSYNNMsouKDIVNV8NNmqBOlS3 kx4f8FU/7E+KO5veC5iaiLmXjoSK3CEZRw/LunLvDJPnlc3xYsd4V6N6K4DtraRyM5aP qcD4MTH1wfYkAXlT5QFzBjfnb7jg/c8Ah8Gv0e05cFfwRaxRYwKa8YnGj96yReWnvvH6 rzCg== X-Gm-Message-State: AOAM532R6hmzc2Y9/5Ubpp70lxf4+eA+9EBbGlp/QRUoH2xrYQceYZJh yd5hIslVuZmdqfTBBi1t6kYjcXykWno= X-Google-Smtp-Source: ABdhPJwckQ5KBPnUyOYoCxD5AyEKUM/us704P0sJXysZ+VZxRFaZCJz70TzLa3Eu4S35Sy7CPM6IQQ== X-Received: by 2002:a2e:b0db:: with SMTP id g27mr2764776ljl.69.1596482178795; Mon, 03 Aug 2020 12:16:18 -0700 (PDT) Received: from guixsd (ppp91-122-98-213.pppoe.avangarddsl.ru. [91.122.98.213]) by smtp.gmail.com with ESMTPSA id b81sm5193270lfg.60.2020.08.03.12.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 12:16:17 -0700 (PDT) From: Oleg Pykhalov To: andremegafone@gmail.com (=?utf-8?Q?Andr=C3=A9?= Alexandre Gomes) Subject: Re: [bug#42695] [PATCH] sway bump to 1.5 References: <87mu3cuhcn.fsf@gmail.com> Date: Mon, 03 Aug 2020 22:16:07 +0300 In-Reply-To: <87mu3cuhcn.fsf@gmail.com> (=?utf-8?Q?=22Andr=C3=A9?= Alexandre Gomes"'s message of "Mon, 03 Aug 2020 11:57:44 +0100") Message-ID: <87y2mvr154.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 42695 Cc: 42695@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, andremegafone@gmail.com (Andr=C3=A9 Alexandre Gomes) writes: > diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm > index bc3c152627..04d76a7da9 100644 > --- a/gnu/packages/wm.scm > +++ b/gnu/packages/wm.scm > @@ -1357,7 +1357,7 @@ modules for building a Wayland compositor.") > (define-public sway > (package > (name "sway") > - (version "1.4") > + (version "1.5") Cannot build this version on a Guix master: =2D-8<---------------cut here---------------start------------->8--- Subproject subprojects/wlroots is buildable: NO (disabling) Dependency wlroots found: NO found 0.10.1 but need: '>=3D0.11.0' ; matched:= '<0.12.0' Run-time dependency wlroots found: NO meson.build:75:1: ERROR: Invalid version of dependency, need 'wlroots' ['>= =3D0.11.0'] found '0.10.1'. A full log can be found at /tmp/guix-build-sway-1.5.drv-0/build/meson-logs/= meson-log.txt =2D-8<---------------cut here---------------end--------------->8--- could you take a look on this, please? [=E2=80=A6] Also, make sure your commit message follows project standarts for patches https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAl8oYncACgkQFn+OpQAa +pyJLA/+OYk14lSMA2QZsm07sSNsUxBH55tnv0UA4ZFHrWbBsN7ebovs5cPHwfGr KN1RMd6i3tzaAeMXFpMmEUNxP9aPXYs4l1D0Hc/Gc0eaTHrDoE6LUViS0gfOeFWv YAQcAmAn+hBCtwU/CktgIAKSaorC9Rc5M7QWyHVKLlhsHasx3h4GIvAkXQtt6Oil S+psT11CgWzrsFBH23AAZKXnc/cvHPA4gP45r3N4aR6hhJQYFfg62eZBclVGQfAu pk+r5X4LbNGFVz5KwLZUn0t+QwpCy5CwkpoZDIdm8H4sKdOnBQkKjwhuk4c51MDH g0R4Zau3TD+YQ0D6qonNg6HFD46yYu+z/favywaZRChA/HDCQxGSgp9TFaQnFDbp Yb4XWOEYLGR/+6S2BRukiurJiRCCmvL4UdOk93jHh1ZgSPcZtDkwFqgzrRFXe5vf K9RfKaFdz1Bvb9jVCo5Pw9wZb9xPd8m4vyqlH+Z3pZePiTUZG3FswOkSNFPgDG3a ZptsVxp5RzECq2Akd+hm/wJxtgExEoJ94q2ZxuXyWi8ZfyaiI4qaMiVXcsjgQ34D aIBC9oV8r0+2H7I63BvaqFC7qNQxypghTmmaHiDxRTtfV/PKz6hh2J+Hh6Pv5ecx ywW5aBz1hj3cDxENZ8HjnR3qfHI3CayE8O0wZwn82stnaNe6hV0= =B/Lf -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 04 07:38:33 2020 Received: (at 42695) by debbugs.gnu.org; 4 Aug 2020 11:38:33 +0000 Received: from localhost ([127.0.0.1]:46983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2vH7-0001V1-A2 for submit@debbugs.gnu.org; Tue, 04 Aug 2020 07:38:33 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:33725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2vH5-0001Un-52 for 42695@debbugs.gnu.org; Tue, 04 Aug 2020 07:38:32 -0400 Received: by mail-wm1-f47.google.com with SMTP id f18so2010211wmc.0 for <42695@debbugs.gnu.org>; Tue, 04 Aug 2020 04:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=wnjH5bc70MRWWBoa5b0RZTSbGOxqTQ1wH3ztDj1r3mo=; b=LeGEIGJO3w1F/cCC+w3LPAQArF7H850cGYgHefFBvOAG7PC8IBAfYPM/d6wFmAnM5I BanQuIP5S1vjZA6ZxFSuLC2DKMCPCjQ0fjHlqOKGKxZvhZhd2CfeK2EWCIXkqAee0qgD 5wS4xiYpsKPs9BpiebxSYIsRND9K6hR31SHgQYEXKua5O7UWzzV4YPVHIpifqSkloICn t+CTzhwieDxokisIBAWBDr6bszC9iJaW9mQ2uJIgmA8a3cxpsQqm/ywUAzsgsKSnbHsr AyLw7/viXBl6p5A5D8gyrALd1WRilCoAF/PHhKAv87Yhux8dizRWuIh/Xh4CO63I6veY OCug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=wnjH5bc70MRWWBoa5b0RZTSbGOxqTQ1wH3ztDj1r3mo=; b=G37/xESVw3davujDjSctTkTr28jGU9C1KyjRlYhnwDeXGQI7fUA6jZrjAq4wsS8hiG e5jwrnyOtq7AcEdmlW20fOrYWHTTfI0WPn09zITuls/WcnB/I2hBbJ0o83638y8SHFR8 vp+GmTSrvcMnk4PncC2gGMH98fyLlgOfarz9pZfP9+zkrT4jq4+rnyv6+5BEIdZX9h31 wpIeHyqwJgoW7hlz0Xpx7qb8m2mXiwt36nXcz+KFsRZx5BpRjgMEkptUjBw8o5YPu2+A 7z65Pip8hWLcf7G+HNQwhe8M6zpomrPi0OJgLN6d5zyuj/7HVszBtYL8d3ziCHJK4i3/ cJeQ== X-Gm-Message-State: AOAM5321t7Iqo9V0V3HCf3Xqhchx2DihMciFVYXcBk5Cw/SAyTlyF4oV ZBcz5LlASwgDUXhkcY2jl2CocjK5 X-Google-Smtp-Source: ABdhPJwqFI0hQTpwD+7/xvFGJLYo45nobxTvbt9bFftq9oyAN9jyOT/mIwy3D8GKktU4VKMvBHH3nw== X-Received: by 2002:a1c:3886:: with SMTP id f128mr3650805wma.121.1596541104955; Tue, 04 Aug 2020 04:38:24 -0700 (PDT) Received: from guix-xps13 ([2001:818:daa9:6700:f523:99f8:1663:ebe2]) by smtp.gmail.com with ESMTPSA id w1sm4109278wmc.18.2020.08.04.04.38.23 for <42695@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 04:38:24 -0700 (PDT) From: andremegafone@gmail.com (=?utf-8?Q?Andr=C3=A9?= Alexandre Gomes) To: 42695@debbugs.gnu.org Subject: [PATCH] gnu: sway: Attempt to update to 1.5 Date: Tue, 04 Aug 2020 12:38:23 +0100 Message-ID: <87ft92hc9c.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42695 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Oleg, I am a complete beginner, and I was naive to think that doing this would be a breeze. Just to be clear, I never built anything in my life. I'd be happy to follow some instructions to get used to the process and learn lots of stuff in the process. You can find what I tried to do in the diff. $ guix build -L ~/repos/guix/gnu/packages sway meson.build:1:0: ERROR: Meson version is 0.53.2 but project requires >=3D0.54.0 But I don't understand why, since I update meson as well. Thanks. --=20 Andr=C3=A9 Alexandre Gomes "Free Thought, Free World" --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-sway-Attempt-to-update-to-1.5.patch Content-Description: [PATCH] gnu: sway: Attempt to update to 1.5 >From d41090157cde9df6ca9d0f1d33b59cfa42c9a9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Alexandre=20Gomes?= Date: Tue, 4 Aug 2020 12:34:24 +0100 Subject: [PATCH] gnu: sway: Attempt to update to 1.5 --- gnu/packages/build-tools.scm | 37 +++++++++++++-------------- gnu/packages/gl.scm | 48 ++++++++++++++---------------------- gnu/packages/wm.scm | 16 ++++++------ 3 files changed, 46 insertions(+), 55 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 7213c1bd0b..ecb3551b96 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -179,15 +179,16 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.53.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry")))) + (version "0.55.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mesonbuild/meson/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "172v6pp1safwm7d4li23lyajn6innqvmz77gsbwyrxqnbibbqpzf")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH @@ -211,16 +212,16 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that resembles Python.") (license license:asl2.0))) -(define-public meson-for-build - (package - (inherit meson) - (name "meson-for-build") - (source (origin - (inherit (package-source meson)) - (patches (search-patches "meson-for-build-rpath.patch")))) +;; (define-public meson-for-build +;; (package +;; (inherit meson) +;; (name "meson-for-build") +;; (source (origin +;; (inherit (package-source meson)) +;; (patches (search-patches "meson-for-build-rpath.patch")))) - ;; People should probably install "meson", not "meson-for-build". - (properties `((hidden? . #t))))) +;; ;; People should probably install "meson", not "meson-for-build". +;; (properties `((hidden? . #t))))) (define-public premake4 (package diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index fb33bd7f6d..60e5a9d395 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -233,26 +233,16 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "20.0.7") - - ;; Mesa 20.0.5 through 20.0.7 has problems with some graphic drivers, so - ;; we need this newer version. - ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882 - ;; https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861 - (replacement mesa-20.0.8) - + (version "20.1.4") (source (origin - (method url-fetch) - (uri (list (string-append "https://mesa.freedesktop.org/archive/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - version "/mesa-" version ".tar.xz"))) + (method git-fetch) + (uri (git-reference + (url https://gitlab.freedesktop.org/mesa/mesa/) + (commit (string-append name "-" version)))) (sha256 (base32 - "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy")) + "02z534lfcw4l6jyc84ld40i3y2ak7c4jc59vckbr24am6py2l61d")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -447,19 +437,19 @@ from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) ;; Replacement package to fix . -(define mesa-20.0.8 - (package - (inherit mesa) - (version "20.0.8") - (source (origin - (inherit (package-source mesa)) - (uri (list (string-append "https://mesa.freedesktop.org/archive/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz"))) - (sha256 - (base32 - "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c")))))) +;; (define mesa-20.0.8 +;; (package +;; (inherit mesa) +;; (version "20.0.8") +;; (source (origin +;; (inherit (package-source mesa)) +;; (uri (list (string-append "https://mesa.freedesktop.org/archive/" +;; "mesa-" version ".tar.xz") +;; (string-append "ftp://ftp.freedesktop.org/pub/mesa/" +;; "mesa-" version ".tar.xz"))) +;; (sha256 +;; (base32 +;; "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c")))))) (define-public mesa-opencl (package/inherit mesa diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index bc3c152627..f9bb30190e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1312,7 +1312,7 @@ functionality to display information about the most commonly used services.") (define-public wlroots (package (name "wlroots") - (version "0.10.1") + (version "0.11.0") (source (origin (method git-fetch) @@ -1321,7 +1321,7 @@ functionality to display information about the most commonly used services.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc")))) + (base32 "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind-provider=elogind") @@ -1357,7 +1357,7 @@ modules for building a Wayland compositor.") (define-public sway (package (name "sway") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) @@ -1366,7 +1366,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja")))) + (base32 "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9")))) (build-system meson-build-system) (arguments `(#:phases @@ -1409,7 +1409,7 @@ modules for building a Wayland compositor.") (define-public swayidle (package (name "swayidle") - (version "1.5") + (version "1.6") (source (origin (method git-fetch) @@ -1418,7 +1418,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n")))) + (base32 "1s44crk2jsv8yba19593d9w77x0s5z980y6qdvqc8w7m9g68jkg5")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind-provider=elogind"))) @@ -1435,7 +1435,7 @@ modules for building a Wayland compositor.") (define-public swaylock (package (name "swaylock") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) @@ -1444,7 +1444,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ii9ql1mxkk2z69dv6bg1x22nl3a46iww764wqjiv78x08xpk982")))) + (base32 "03n1zzn234jsq8l3b4c1y3v3d9vmwj4vb0cqqbjmxhmlrw684c09")))) (build-system meson-build-system) (inputs `(("cairo" ,cairo) ("gdk-pixbuf" ,gdk-pixbuf) -- 2.28.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 05 11:49:49 2020 Received: (at 42695) by debbugs.gnu.org; 5 Aug 2020 15:49:49 +0000 Received: from localhost ([127.0.0.1]:52025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3Lfp-0003XD-3N for submit@debbugs.gnu.org; Wed, 05 Aug 2020 11:49:49 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:46063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3Lfk-0003Wv-91 for 42695@debbugs.gnu.org; Wed, 05 Aug 2020 11:49:48 -0400 Received: by mail-lj1-f196.google.com with SMTP id w25so12798729ljo.12 for <42695@debbugs.gnu.org>; Wed, 05 Aug 2020 08:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=RTKK9RUXEG56pj0bP1ENbxpwMKweI6zl1qfgMkwe3JA=; b=oBWkfzTyJ+znWmDIcY+tj+yOlUjqVCcTxGscDBHAuVsCweK7VKreSIFleXbcNGDV0W 6mw8O9hv3WlKUwMxmQqHsT1p2a3SohaA0C53tDo4g+6V12Y0d8vEoEfdlPHEi9mQC+nJ l79DwMoHOYayWNh9OfNzn0jECYK8eDzKe+oOwHU49Vzwju5kyEHfDXK/PG4iOhpMZDrG IAzYWgHvHdLghtUbgBLnHKlWVUEXVzix/oW5DV/l6UMvCsR6D5ZZQCNaTiBi/bp+m2bN NvBa1ta8ak2pKMvqPK4e2zgJZoUlRXuuTNPPXsOv0n+rxs2mzc7tsuMkwWCN2hJQycwW PLAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=RTKK9RUXEG56pj0bP1ENbxpwMKweI6zl1qfgMkwe3JA=; b=hfB5mqaSaJG1fYZhseoPf+nFvKna/6txNTcFV2fFaavnKTZc1wJEyV+3o9gfreGg5K 71f838Xseh2jU2NkSoOXiVfM9yQhbLqX0EhLOID51wswGbRYZv67l1fEBbraTSjPjjWG wR/ZuINBwQQlfzwyulybdcHlLXTlABFmrj+YvgVhTJwLS3867yPKmM9e1tS1tVvN35W/ 4fvVS+6+AcGs89sp8mwjiIrKRg2AOfW57oErTS6PllkNYfsNaiQlsRe55u9sDpIM0MEl 1iZQH2IM32E8ZzTdyLWPP0lN3GgqA1UaK7mfOIkmmIiw+q0z5Gs7sp9RSgA7abGn5Pq+ gqtg== X-Gm-Message-State: AOAM532yA7R2eG3pybTBqDNW/9TTP21mLQV0nyVCNq9szXq8OYQ2Rt1g wz6+j4+2xwdgk2p0KwIP/UEIagfY X-Google-Smtp-Source: ABdhPJw/z6bfDWhmmGnyItPceTu1im6zPTJ452b4CmnXTktwbg3wLbI0y2OTegMry19Dmc/ZTrySkg== X-Received: by 2002:a05:651c:1213:: with SMTP id i19mr1746574lja.191.1596642577461; Wed, 05 Aug 2020 08:49:37 -0700 (PDT) Received: from guixsd (ppp91-122-98-213.pppoe.avangarddsl.ru. [91.122.98.213]) by smtp.gmail.com with ESMTPSA id z18sm608159lji.107.2020.08.05.08.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 08:49:36 -0700 (PDT) From: Oleg Pykhalov To: andremegafone@gmail.com (=?utf-8?Q?Andr=C3=A9?= Alexandre Gomes) Subject: Re: [bug#42695] [PATCH] gnu: sway: Attempt to update to 1.5 References: <87mu3cuhcn.fsf@gmail.com> <87ft92hc9c.fsf@gmail.com> Date: Wed, 05 Aug 2020 18:49:33 +0300 In-Reply-To: <87ft92hc9c.fsf@gmail.com> (=?utf-8?Q?=22Andr=C3=A9?= Alexandre Gomes"'s message of "Tue, 04 Aug 2020 12:38:23 +0100") Message-ID: <87eeolqeia.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 42695 Cc: 42695@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, First of all thank you for your work on sway and meson! andremegafone@gmail.com (Andr=C3=A9 Alexandre Gomes) writes: > $ guix build -L ~/repos/guix/gnu/packages sway As I know it's not enough. Intead you could use: =2D-8<---------------cut here---------------start------------->8--- ~/repos/guix/pre-inst-env guix build sway =2D-8<---------------cut here---------------end--------------->8--- Also, you could run a =E2=80=9Cmake -j3=E2=80=9D command before =E2=80=98./= pre-inst-env=E2=80=99 to spot some compilations errors after changing package recipes. > meson.build:1:0: ERROR: Meson version is 0.53.2 but project requires >>=3D0.54.0 > > But I don't understand why, since I update meson as well. Did you set GUIX_PACKAGE_PATH? You could check with: =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env env | grep GUIX_PACKAGE_PATH =2D-8<---------------cut here---------------end--------------->8--- which should show GUIX_PACKAGE_PATH=3D or show nothing. [=E2=80=A6] > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm > index 7213c1bd0b..ecb3551b96 100644 > --- a/gnu/packages/build-tools.scm > +++ b/gnu/packages/build-tools.scm > @@ -179,15 +179,16 @@ files and generates build instructions for the Ninj= a build system.") > (define-public meson > (package > (name "meson") > - (version "0.53.2") > - (source (origin > - (method url-fetch) > - (uri (string-append "https://github.com/mesonbuild/meson/" > - "releases/download/" version "/meson-" > - version ".tar.gz")) > - (sha256 > - (base32 > - "07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry"))= )) > + (version "0.55.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/mesonbuild/meson/") It's OK to use =E2=80=98git-fetch=E2=80=99, and we switch to it in favour o= f =E2=80=98url-fetch=E2=80=99 because of GitHub could regenerate tarballs. But I think thats probably not a =E2=80=98meson=E2=80=99 case. Release tarball could differ from Git repository. Did you succeed to build the =E2=80=98git-fetch=E2=80=99 way (via =E2=80=98pre-inst-env=E2=80= =99)? [=E2=80=A6] > -(define-public meson-for-build > - (package > - (inherit meson) > - (name "meson-for-build") > - (source (origin > - (inherit (package-source meson)) > - (patches (search-patches "meson-for-build-rpath.patch")))) > +;; (define-public meson-for-build > +;; (package > +;; (inherit meson) > +;; (name "meson-for-build") > +;; (source (origin > +;; (inherit (package-source meson)) > +;; (patches (search-patches "meson-for-build-rpath.patch")= ))) >=20=20 > - ;; People should probably install "meson", not "meson-for-build". > - (properties `((hidden? . #t))))) > +;; ;; People should probably install "meson", not "meson-for-build". > +;; (properties `((hidden? . #t))))) Why do you comment =E2=80=98meson-for-build=E2=80=99? First of all don't c= omment things which should be removed, because of Git. ;-) And it's used by: =2D-8<---------------cut here---------------start------------->8--- oleg@guixsd ~/src/guix-master$ grep -RF meson-for-build ~/src/guix-master |= grep '.scm' /home/oleg/src/guix-master/guix/build-system/meson.scm: (module-ref modu= le 'meson-for-build))) =2D-8<---------------cut here---------------end--------------->8--- > (define-public premake4 > (package > diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm > index fb33bd7f6d..60e5a9d395 100644 > --- a/gnu/packages/gl.scm > +++ b/gnu/packages/gl.scm > @@ -233,26 +233,16 @@ also known as DXTn or DXTC) for Mesa.") > (define-public mesa > (package > (name "mesa") > - (version "20.0.7") > - > - ;; Mesa 20.0.5 through 20.0.7 has problems with some graphic drivers= , so > - ;; we need this newer version. > - ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882 > - ;; https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861 > - (replacement mesa-20.0.8) > - > + (version "20.1.4") > (source > (origin > - (method url-fetch) > - (uri (list (string-append "https://mesa.freedesktop.org/archive/" > - "mesa-" version ".tar.xz") > - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" > - "mesa-" version ".tar.xz") > - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" > - version "/mesa-" version ".tar.xz"))) > + (method git-fetch) > + (uri (git-reference > + (url https://gitlab.freedesktop.org/mesa/mesa/) That url should be a string: =2D-8<---------------cut here---------------start------------->8--- error: https://gitlab.freedesktop.org/mesa/mesa/: unbound variable hint: Did you forget a `use-modules' form? =2D-8<---------------cut here---------------end--------------->8--- > + (commit (string-append name "-" version)))) I think we should use hard-coded "mesa-" as in source urls. [=E2=80=A6] > +;; (define mesa-20.0.8 > +;; (package > +;; (inherit mesa) > +;; (version "20.0.8") > +;; (source (origin > +;; (inherit (package-source mesa)) > +;; (uri (list (string-append "https://mesa.freedesktop.org= /archive/" > +;; "mesa-" version ".tar.xz") > +;; (string-append "ftp://ftp.freedesktop.org/pu= b/mesa/" > +;; "mesa-" version ".tar.xz"))) > +;; (sha256 > +;; (base32 > +;; "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c= ")))))) Same thing about commenting unused code. Just remove it. Everything else looks OK, but could you split this big patch by =E2=80=9Cpa= tch per package upgrade=E2=80=9D? Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAl8q1Q0ACgkQFn+OpQAa +pyB/Q//fv2nYvkkiYaxN4ExmEverxU+aya3d0giBUptaZc6IxNOCCBGlURk8k2g Wy1h4PeFH7SDJpehzutPvBsCGEnssJQPATToM5bYqhkQ3cMocl2rmjf1tZlinC8C 3dS19Wp4wAl9Cld96PgM4ZqbcytTE1KYGhbMmYQK+HePGKzhjy/JFunkvJz2sTXA HcLfydF2qbzxMiz9Bj43yYmWKYQoNHPOGE4ip3yeEPrBoWF8rRJBKKK8TZ6Trcwh jO/t42AwscT7sfSRXvYblW/LzdN4+6u/0mB7RMQCePIuAwfLlJKm2NoenPXzOj+2 w4RWU8wZGQnENmRMqu3W/CUj3I2MmR7pLXy+bVeUAqBI2Ey2oY01l72ZldSJ5Xj4 tU6MjSuvLbgyHywPeIlU+yn857e+fGV6p0HK9awYqP2vx2tEVRUJJZ35OizGOvNx BzMMA9oQlY7t40gUuaZKWAwIAJ5s/UxbGAWETDEMSioTw1f5N59L+STCicA0lRBy dVuSuK1wRn4ISMMR4dSZPCZsueRkS47MZDDSg+xX2IJ+u8Dv1SHA8htxSypLExmR C3m3Ss/fQg/ox2dpZceaXDEmZVPIL5Cmh0Ml+ua4Okc0+oW+cfB2vkrjbDpus8GO Wu0MLqZTEXjPbI0K2jpncvQ8ZcVix4mS9ljV50BEDoP8O7XTg6w= =v0sB -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 18 10:11:28 2020 Received: (at control) by debbugs.gnu.org; 18 Dec 2020 15:11:28 +0000 Received: from localhost ([127.0.0.1]:39614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqHPk-000232-Bn for submit@debbugs.gnu.org; Fri, 18 Dec 2020 10:11:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqHPj-00022r-3G for control@debbugs.gnu.org; Fri, 18 Dec 2020 10:11:27 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33578) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqHPd-0004fv-Vc for control@debbugs.gnu.org; Fri, 18 Dec 2020 10:11:21 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=53320 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kqHPd-0006jB-Gn for control@debbugs.gnu.org; Fri, 18 Dec 2020 10:11:21 -0500 Date: Fri, 18 Dec 2020 16:11:20 +0100 Message-Id: <873603b147.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #42695 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) tags 42695 fixed close 42695 quit From unknown Sat Jun 21 05:06:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 16 Jan 2021 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator