[PATCH] sway bump to 1.5

  • Done
  • quality assurance status badge
Details
3 participants
  • André Alexandre Gomes
  • Oleg Pykhalov
  • Ludovic Courtès
Owner
unassigned
Submitted by
André Alexandre Gomes
Severity
normal
A
A
André Alexandre Gomes wrote on 3 Aug 2020 12:57
(address . guix-patches@gnu.org)
87mu3cuhcn.fsf@gmail.com
Toggle diff (22 lines)
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
--
André Alexandre Gomes
"Free Thought, Free World"
O
O
Oleg Pykhalov wrote on 3 Aug 2020 21:16
(name . André Alexandre Gomes)(address . andremegafone@gmail.com)(address . 42695@debbugs.gnu.org)
87y2mvr154.fsf@gmail.com
Hi,

andremegafone@gmail.com (André Alexandre Gomes) writes:

Toggle quote (11 lines)
> 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:
Toggle snippet (9 lines)
Subproject subprojects/wlroots is buildable: NO (disabling)
Dependency wlroots found: NO found 0.10.1 but need: '>=0.11.0' ; matched: '<0.12.0'
Run-time dependency wlroots found: NO

meson.build:75:1: ERROR: Invalid version of dependency, need 'wlroots' ['>=0.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

could you take a look on this, please?

[…]

Also, make sure your commit message follows project standarts for

Thanks,
Oleg.
-----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-----

A
A
André Alexandre Gomes wrote on 4 Aug 2020 13:38
[PATCH] gnu: sway: Attempt to update to 1.5
(address . 42695@debbugs.gnu.org)
87ft92hc9c.fsf@gmail.com
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
Toggle quote (2 lines)
>=0.54.0

But I don't understand why, since I update meson as well.

Thanks.

--
André Alexandre Gomes
"Free Thought, Free World"
O
O
Oleg Pykhalov wrote on 5 Aug 2020 17:49
(name . André Alexandre Gomes)(address . andremegafone@gmail.com)(address . 42695@debbugs.gnu.org)
87eeolqeia.fsf@gmail.com
Hi,

First of all thank you for your work on sway and meson!

andremegafone@gmail.com (André Alexandre Gomes) writes:

Toggle quote (2 lines)
> $ guix build -L ~/repos/guix/gnu/packages sway

As I know it's not enough. Intead you could use:
Toggle snippet (3 lines)
~/repos/guix/pre-inst-env guix build sway

Also, you could run a “make -j3” command before ‘./pre-inst-env’ to spot
some compilations errors after changing package recipes.

Toggle quote (5 lines)
> meson.build:1:0: ERROR: Meson version is 0.53.2 but project requires
>>=0.54.0
>
> But I don't understand why, since I update meson as well.

Did you set GUIX_PACKAGE_PATH? You could check with:
Toggle snippet (2 lines)
./pre-inst-env env | grep GUIX_PACKAGE_PATH
which should show GUIX_PACKAGE_PATH= or show nothing.

[…]

Toggle quote (24 lines)
> 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/")

It's OK to use ‘git-fetch’, and we switch to it in favour of ‘url-fetch’
because of GitHub could regenerate tarballs. But I think thats probably
not a ‘meson’ case.

Release tarball could differ from Git repository. Did you succeed to
build the ‘git-fetch’ way (via ‘pre-inst-env’)?

[…]

Toggle quote (20 lines)
> -(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)))))

Why do you comment ‘meson-for-build’? First of all don't comment things
which should be removed, because of Git. ;-) And it's used by:
Toggle snippet (4 lines)
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 module 'meson-for-build)))

Toggle quote (32 lines)
> (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:
Toggle snippet (4 lines)
error: https://gitlab.freedesktop.org/mesa/mesa/: unbound variable
hint: Did you forget a `use-modules' form?

Toggle quote (2 lines)
> + (commit (string-append name "-" version))))

I think we should use hard-coded "mesa-" as in source urls.

[…]

Toggle quote (14 lines)
> +;; (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"))))))

Same thing about commenting unused code. Just remove it.

Everything else looks OK, but could you split this big patch by “patch
per package upgrade”?

Thanks,
Oleg.
-----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-----

L
L
Ludovic Courtès wrote on 18 Dec 2020 16:11
control message for bug #42695
(address . control@debbugs.gnu.org)
873603b147.fsf@gnu.org
tags 42695 fixed
close 42695
quit
?