diff --git a/srcpkgs/colord/patches/add-introspection-switch.patch b/srcpkgs/colord/patches/add-introspection-switch.patch deleted file mode 100644 index 6a995c79859..00000000000 --- a/srcpkgs/colord/patches/add-introspection-switch.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git lib/colord/meson.build lib/colord/meson.build -index 61f0518..9f7a246 100644 ---- a/lib/colord/meson.build -+++ b/lib/colord/meson.build -@@ -146,6 +146,7 @@ pkgg.generate( - description : 'colord is a system daemon for managing color devices', - ) - -+if get_option('introspection') - libcolord_girtarget = gnome.generate_gir(colord, - sources : [ - 'cd-client.c', -@@ -202,6 +203,7 @@ libcolord_girtarget = gnome.generate_gir(colord, - ) - libcolord_gir = libcolord_girtarget[0] - libcolord_typelib = libcolord_girtarget[1] -+endif - - if get_option('vapi') - gnome.generate_vapi('colord', -diff --git lib/colorhug/meson.build lib/colorhug/meson.build -index 03aefb7..b6d2624 100644 ---- a/lib/colorhug/meson.build -+++ b/lib/colorhug/meson.build -@@ -73,6 +73,7 @@ pkgg.generate( - description : 'ColorHug is a simple display hardware colorimeter', - ) - -+if get_option('introspection') - libcolorhug_gir = gnome.generate_gir(colorhug, - sources : [ - 'ch-common.c', -@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug, - ], - install : true - ) -+endif - - if get_option('tests') - testdatadir = join_paths(meson.source_root(), 'data', 'tests') -diff --git meson_options.txt meson_options.txt -index 52af113..6661e16 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -15,3 +15,4 @@ option('daemon_user', type : 'string', value : 'root', description : 'User for r - option('pnp_ids', type : 'string', value : '', description : 'Location of pnp.ids if hwdb is not available') - option('man', type : 'boolean', value : true, description : 'Generate man pages') - option('docs', type : 'boolean', value : true, description : 'Generate documentation') -+option('introspection', type : 'boolean', value : true, description : 'Generation gobject-introspection related files') - diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index 98739d4802b..fc57c727ec0 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -1,14 +1,14 @@ # Template file for 'colord' pkgname=colord -version=1.4.5 -revision=2 +version=1.4.6 +revision=1 build_style=meson build_helper="gir" -# man pages fail to generate -configure_args="-Dsystemd=false -Dsane=true -Dargyllcms_sensor=false -Dman=false +configure_args="-Dsystemd=false -Dsane=true -Dargyllcms_sensor=false -Ddaemon_user=colord -Ddocs=false $(vopt_bool gir introspection) $(vopt_bool vala vapi)" -hostmakedepends="gettext glib-devel pkg-config $(vopt_if vala vala)" +hostmakedepends="docbook-xsl-ns gettext glib-devel libxslt pkg-config + $(vopt_if vala vala)" makedepends="bash-completion lcms2-devel libgudev-devel libgusb-devel polkit-devel sane-devel sqlite-devel" short_desc="System daemon for managing color devices" @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://www.freedesktop.org/software/colord" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" -checksum=b774ea443d239f4a2ee1853bd678426e669ddeda413dcb71cea1638c4d6c5e17 +checksum=7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f system_accounts="colord" colord_homedir="/var/lib/colord"