colord: enable gir

srcpkgs/colord/patches/fix-gir-cross.patch

@@ -0,0 +1,28 @@
+diff --git a/lib/colord/meson.build b/lib/colord/meson.build
+index d0f412b..49139dd 100644
+--- lib/colord/meson.build
++++ lib/colord/meson.build
+@@ -187,6 +187,7 @@ if get_option('introspection')
+ 	  export_packages : 'colord',
+ 	  extra_args : [
+ 		'--c-include=colord.h',
++		'-DCD_COMPILATION',
+ 		],
+ 	  link_with : colordprivate,
+ 	  dependencies : [
+
+diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
+index e177ef3..f88e8e4 100644
+--- lib/colorhug/meson.build
++++ lib/colorhug/meson.build
+@@ -102,6 +102,9 @@ if get_option('introspection')
+ 		'GUsb-1.0',
+ 		libcolord_gir,
+ 	  ],
++      extra_args : [
++        '-DCD_COMPILATION',
++      ],
+ 	  install : true
+ 	)
+ endif
+

srcpkgs/colord/template

@@ -1,38 +1,41 @@
 # Template file for 'colord'
 pkgname=colord
 version=1.4.3
-revision=1
+revision=2
 build_style=meson
+build_helper="gir"
 # man pages fail to generate
 configure_args="-Dsystemd=false -Dsane=true -Dargyllcms_sensor=false -Dman=false
  -Ddaemon_user=colord -Ddocs=false $(vopt_bool gir introspection)
  $(vopt_bool vala vapi)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gir gobject-introspection)"
+hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)"
 makedepends="bash-completion lcms2-devel libgudev-devel libgusb-devel
- polkit-devel sane-devel sqlite-devel $(vopt_if vala vala-devel)"
+ polkit-devel sane-devel sqlite-devel"
+short_desc="System daemon for managing color devices"
+maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://www.freedesktop.org/software/colord"
+distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
+checksum=9a8e669ee1ea31632bee636cc57353f703c2ea9b64cd6e02bbaabe9a1e549df7
+
 system_accounts="colord"
 colord_homedir="/var/lib/colord"
 make_dirs="
  /var/lib/colord 0755 colord colord
  /var/lib/colord/icc 0755 colord colord"
-short_desc="System daemon for managing color devices"
-maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
-homepage="https://www.freedesktop.org/software/colord"
-license="GPL-2.0-only"
-distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=9a8e669ee1ea31632bee636cc57353f703c2ea9b64cd6e02bbaabe9a1e549df7
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+="colord glib-devel"
+	hostmakedepends+=" colord"
 fi
 
 # Package build options
 build_options="gir vala"
 
-# Disable gir and gusb for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir vala"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 do_check() {
 	# assertion failed (cd_edid_get_vendor_name (edid) == "LG"): (NULL == "LG")