From dfd6ca1908bae66eaa12ecd02bc9133e73055a77 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 May 2021 09:25:11 +0200 Subject: gnu: Meson: Remove special versions. * gnu/packages/audio.scm (lv2-speech-denoiser, libaudec)[arguments]: Remove #:meson. * gnu/packages/build-tools.scm (meson): Update to 0.57.2. (meson-0.55, meson-next): Remove variables. * gnu/packages/datastructures.scm (tllist)[arguments]: Remove. * gnu/packages/fontutils.scm (fcft)[arguments]: Likewise. * gnu/packages/gimp.scm (babl, gegl)[arguments]: Remove #:meson. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]: Likewise. * gnu/packages/lua.scm (emilua)[arguments]: Likewise. * gnu/packages/music.scm (zrythm)[arguments]: Likewise. * gnu/packages/terminals.scm (foot)[arguments]: Likewise. * gnu/packages/virtualization.scm (qemu)[native-inputs]: Change from MESON-NEXT to MESON. (libvirt)[arguments]: Remove #:meson. * gnu/packages/wm.scm (wlroots, sway)[arguments]: Likewise. --- gnu/packages/audio.scm | 6 ++---- gnu/packages/build-tools.scm | 32 ++------------------------------ gnu/packages/datastructures.scm | 2 -- gnu/packages/fontutils.scm | 2 -- gnu/packages/gimp.scm | 6 ++---- gnu/packages/gtk.scm | 3 +-- gnu/packages/lua.scm | 3 +-- gnu/packages/music.scm | 1 - gnu/packages/terminals.scm | 3 +-- gnu/packages/virtualization.scm | 4 +--- gnu/packages/wm.scm | 4 +--- 11 files changed, 11 insertions(+), 55 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6ccecef3c0..f677d46a7f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4225,8 +4225,7 @@ the following features: (base32 "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - ;; Using a "release" build is recommended for performance + `(;; Using a "release" build is recommended for performance #:build-type "release" #:phases (modify-phases %standard-phases @@ -4809,8 +4808,7 @@ in the package.") "1570m2dfia17dbkhd2qhx8jjihrpm7g8nnyg6n4wif4vv229s7dz")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - #:configure-flags + `(#:configure-flags ;; Build the tests. `("-Dtests=true"))) (inputs diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 88247cc911..91e774f692 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -264,7 +264,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.56.2") + (version "0.57.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -272,7 +272,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "1x47vc7023w8w90r6jda5hk2jsh68i66x49gckdgixw32fwvvf1w")))) + "1iac7p99zfgkznq4qlnkk7b8xwwlilcrnkf33sczm56yqnqyg0rs")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs and patching many @@ -295,34 +295,6 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that resembles Python.") (license license:asl2.0))) -;; Added temporarily for packages that need it. -;; TODO: Remove when core-updates is merged. -(define-public meson-0.55 - (package - (inherit meson) - (version "0.55.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb")))))) - -(define-public meson-next - (package - (inherit meson) - (version "0.57.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "1iac7p99zfgkznq4qlnkk7b8xwwlilcrnkf33sczm56yqnqyg0rs")))))) - (define-public premake4 (package (name "premake") diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index f10a54d376..5eca507a18 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -296,8 +296,6 @@ equivalent succinct data structure are (most of the time) identical.") (base32 "061mkg6hc9x89zya3bw18ymxlzd8fbhjipxpva8x01lh2vp1d4f0")))) (build-system meson-build-system) - (arguments - `(#:meson ,meson-0.55)) (synopsis "Typed link list for C") (description "@code{tllist} is a @dfn{typed linked list} C header file only library diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index e688f2a513..dbce5beba8 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -843,8 +843,6 @@ maintain the Noto Fonts project.") (base32 "0314r038jl17hrhc9nrbx30jk0pz8ckbdnizws4r46b1rf4h0b1f")))) (build-system meson-build-system) - (arguments - `(#:meson ,meson-0.55)) (native-inputs `(("check" ,check) ("gcc" ,gcc-10) ;TODO: Remove when the default compiler is > GCC 7. diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 12399e2e1f..a0490e5421 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -185,8 +185,7 @@ of a larger interface.") "1w68h81kqkqnziixrx21qs0gfv2z79651h19sxn226xdb58mjgqb")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - #:configure-flags + `(#:configure-flags (list "-Denable-gir=false"))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -225,8 +224,7 @@ provided, as well as a framework to add new color models and data types.") "1pd8xkx70k0fsi1hrzrmaify7112wjmxzk0p6bi6js89yhn7h4n1")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - #:configure-flags + `(#:configure-flags (list "-Dintrospection=false") #:phases (modify-phases %standard-phases diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index deb3ee537c..9a1e26ed3a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -602,8 +602,7 @@ highlighting and other features typical of a source code editor.") "0k9f9177qxaryaxprwrhqnv5p2gdq4a8i6y05gm98qa8izc5v77y")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags '("-Dinstalled_tests=false" "-Djasper=true") #:phases (modify-phases %standard-phases diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 54d2ba400d..ad36ef1ca2 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1127,8 +1127,7 @@ shell command executions.") "124fj73722c03znwdyqp1i0jygwv3s11f6s1j9rzym513qrf7fnd")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - ;; Tests are disabled for now due to an issue that affecs guix: + `(;; Tests are disabled for now due to an issue that affecs guix: ;; #:configure-flags (list "-Denable_http=true" diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a01fc7382c..e4120e79f5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6181,7 +6181,6 @@ and as an LV2 plugin.") (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t - #:meson ,meson-0.55 #:configure-flags `("-Dtests=true" "-Dmanpage=true" diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 37636c7cdc..690bc19434 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -714,8 +714,7 @@ eye-candy, customizable, and reasonably lightweight.") "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - ;; Using a "release" build is recommended both for performance, and + `(;; Using a "release" build is recommended both for performance, and ;; also to address a GCC 10 issue when doing PGO builds. #:build-type "release" ;; Enable LTO as recommended by INSTALL.md. diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3b0708414b..efecf4f8cb 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -357,8 +357,7 @@ exec smbd $@"))) ("perl" ,perl) ("flex" ,flex) ("bison" ,bison) - ;; Using meson 0.57.1 enables reproducible QEMU builds. - ("meson" ,meson-next) + ("meson" ,meson) ("ninja" ,ninja) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) @@ -1057,7 +1056,6 @@ manage system or application containers.") (string-append "-Dinstall_prefix=" (assoc-ref %outputs "out")) "--sysconfdir=/etc" "--localstatedir=/var") - #:meson ,meson-0.55 #:phases (modify-phases %standard-phases (add-before 'configure 'disable-broken-tests diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e5314e1a03..f7fcb18309 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1404,7 +1404,6 @@ functionality to display information about the most commonly used services.") (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind-provider=elogind") - #:meson ,meson-next #:phases (modify-phases %standard-phases (add-before 'configure 'hardcode-paths @@ -1451,8 +1450,7 @@ modules for building a Wayland compositor.") (base32 "0vnplva11yafhbijrk68wy7pw0psn9jm0caaymswq1s951xsn1c8")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-next - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'hardcode-paths (lambda* (#:key inputs #:allow-other-keys) -- cgit 1.4.1