From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QBObJelIKV82fwAA0tVLHw (envelope-from ) for ; Tue, 04 Aug 2020 11:39:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4J1gIelIKV9gNwAAbx9fmQ (envelope-from ) for ; Tue, 04 Aug 2020 11:39:21 +0000 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 E855194005D for ; Tue, 4 Aug 2020 11:39:20 +0000 (UTC) Received: from localhost ([::1]:34604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2vHp-0003Lt-PV for larch@yhetil.org; Tue, 04 Aug 2020 07:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2vHa-0003Lb-VS for guix-patches@gnu.org; Tue, 04 Aug 2020 07:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2vHa-00012X-M8 for guix-patches@gnu.org; Tue, 04 Aug 2020 07:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k2vHa-0001Vi-G9 for guix-patches@gnu.org; Tue, 04 Aug 2020 07:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42695] [PATCH] gnu: sway: Attempt to update to 1.5 References: <87mu3cuhcn.fsf@gmail.com> In-Reply-To: <87mu3cuhcn.fsf@gmail.com> Resent-From: andremegafone@gmail.com (=?UTF-8?Q?Andr=C3=A9?= Alexandre Gomes) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Aug 2020 11:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42695@debbugs.gnu.org Received: via spool by 42695-submit@debbugs.gnu.org id=B42695.15965411135771 (code B ref 42695); Tue, 04 Aug 2020 11:39:02 +0000 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) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=LeGEIGJO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: osMl8OrJZqj1 --=-=-= 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 --=-=-=--