Add gee 0.20.6 to releases.json

Author: hrxi

ci_config.json

@@ -154,6 +154,21 @@
       "windows": false
     }
   },
+  "gee": {
+    "_comment": "- needs valac, not easy to install on Windows",
+    "build_on": {
+      "windows": false
+    },
+    "brew_packages": [
+      "vala"
+    ],
+    "debian_packages": [
+      "valac"
+    ],
+    "msys_packages": [
+      "vala"
+    ]
+  },
   "giflib": {
     "_comment": "Unnecessary <unistd.h> include in gif_hash.h breaks the build",
     "build_on": {

releases.json

@@ -726,6 +726,14 @@
       "1.14.1-1"
     ]
   },
+  "gee": {
+    "dependency_names": [
+      "gee-0.8"
+    ],
+    "versions": [
+      "0.20.6-1"
+    ]
+  },
   "giflib": {
     "dependency_names": [
       "giflib"

subprojects/packagefiles/gee/gee/meson.build

@@ -79,7 +79,7 @@ gee_files = files(
 gee_name = 'gee-'+api_version
 gee_gir = 'Gee-'+api_version+'.gir'
 gee_typelib = 'Gee-'+api_version+'.typelib'
-gee_deps = [glib_dep, gobject_dep, gio_dep, gio_dep_vala]
+gee_deps = [glib_dep, gobject_dep, gio_dep]
 gee_c_args = []
 if host_machine.system() == 'windows'
     gee_c_args += meson.get_compiler('c').get_supported_arguments([

subprojects/packagefiles/gee/meson.build

@@ -5,9 +5,11 @@ glib_minimal_version = '2.36'
 glib_dep = dependency('glib-2.0', version: '>='+glib_minimal_version)
 gobject_dep = dependency('gobject-2.0', version: '>='+glib_minimal_version)
 gio_dep = dependency('gio-2.0', version: '>='+glib_minimal_version)
-gio_dep_vala = meson.get_compiler('vala').find_library('gio-2.0')
 m_dep = meson.get_compiler('c').find_library('m', required : false)
 
+# Work around https://github.com/mesonbuild/meson/issues/2103.
+gio_dep = [gio_dep, meson.get_compiler('vala').find_library('gio-2.0')]
+
 add_project_arguments([
         '--hide-internal',
         '--target-glib='+glib_minimal_version,

tools/sanity_checks.py

@@ -408,6 +408,9 @@ def check_new_release(self, name: str, builddir: str = '_build', deps=None, prog
                     if 'not found' in error:
                         print('cannot verify in wrapdb due to missing dependency')
                         return
+                elif 'ERROR: Could not execute Vala compiler: valac' in error:
+                    print('cannot verify in wrapdb due to missing dependency')
+                    return
             raise Exception(f'Wrap {name} failed to configure due to bugs in the wrap, rather than due to being unsupported')
         subprocess.check_call(['meson', 'compile', '-C', builddir], env=meson_env)
         if not ci.get('skip_tests', False):