From 7afdd8da581c534d8fa9d780b30e50521d653139 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 19 Jan 2021 09:46:37 -0500
Subject: gnu: vala: Update to 0.50.3.

* gnu/packages/gnome.scm (vala): Update to 0.50.3.  Delete trailing #t.
[phases]{pre-check}: Adjust for file renaming.  No longer set the
DBUS_FATAL_WARNINGS environment variable.
(vala-0.50): Remove variable.
* gnu/packages/gnome-xyz.scm (vala-language-server): Adjust.
---
 gnu/packages/gnome-xyz.scm |  2 +-
 gnu/packages/gnome.scm     | 29 +++++++----------------------
 2 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index eb99fda78e..c8092483ac 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -850,7 +850,7 @@ track stocks, currencies and cryptocurrencies.")
        ("json-glib" ,json-glib)
        ("jsonrpc-glib" ,jsonrpc-glib)
        ("libgee" ,libgee)
-       ("vala" ,vala-0.50)))
+       ("vala" ,vala)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://github.com/benwaffle/vala-language-server")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a08cacbbcf..ca815b4861 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4264,15 +4264,15 @@ passwords in the GNOME keyring.")
 (define-public vala
   (package
     (name "vala")
-    (version "0.46.5")
+    (version "0.50.3")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/vala/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "vala-" version ".tar.xz"))
               (sha256
                (base32
-                "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s"))))
+                "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -4280,12 +4280,10 @@ passwords in the GNOME keyring.")
          (add-before 'check 'pre-check
                      (lambda _
                        (setenv "CC" "gcc")
-                       (substitute* "valadoc/tests/testrunner.sh"
+                       (substitute* "valadoc/tests/libvaladoc\
+/tests-extra-environment.sh"
                          (("export PKG_CONFIG_PATH=" m)
-                          (string-append m "$PKG_CONFIG_PATH:")))
-                       ;; For missing '/etc/machine-id'.
-                       (setenv "DBUS_FATAL_WARNINGS" "0")
-                       #t)))))
+                          (string-append m "$PKG_CONFIG_PATH:"))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("flex" ,flex)
@@ -4306,19 +4304,6 @@ requirements and without using a different ABI compared to applications and
 libraries written in C.")
     (license license:lgpl2.1+)))
 
-(define-public vala-0.50
-  (package
-    (inherit vala)
-    (version "0.50.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/vala/"
-                                  (version-major+minor version) "/"
-                                  "vala-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1nnf0x6vk0a9p2y6z7jwjfvmlxh3qhj581v381r0y1sxsv35s39c"))))))
-
 (define-public vte
   (package
     (name "vte")
-- 
cgit v1.2.3