commit: 6b0890de6628081a72295a74c84622bc2042b1fc Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Fri Apr 30 20:25:51 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat May 1 18:25:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0890de
x11-misc/colord: make introspection optional in meson Closes: https://bugs.gentoo.org/786873 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-misc/colord/colord-1.4.5-r1.ebuild | 9 +-- .../files/1.4.5-optional-introspection.patch | 64 ++++++++++++++++++++++ 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/x11-misc/colord/colord-1.4.5-r1.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild index b1f278d89fb..a3b707ebd6d 100644 --- a/x11-misc/colord/colord-1.4.5-r1.ebuild +++ b/x11-misc/colord/colord-1.4.5-r1.ebuild @@ -25,7 +25,7 @@ DEPEND=" >=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}] >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] dev-db/sqlite:3=[${MULTILIB_USEDEP}] - >=dev-libs/libgusb-0.2.7[${MULTILIB_USEDEP}] + >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] udev? ( dev-libs/libgudev:=[${MULTILIB_USEDEP}] virtual/libudev:=[${MULTILIB_USEDEP}] @@ -55,14 +55,10 @@ BDEPEND=" extra-print-profiles? ( media-gfx/argyllcms ) vala? ( $(vala_depend) ) " -# These dependencies are required to build native build-time programs. -BDEPEND="${BDEPEND} - dev-libs/glib:2 - media-libs/lcms -" PATCHES=( "${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch + "${FILESDIR}"/${PV}-optional-introspection.patch ) src_prepare() { @@ -96,6 +92,7 @@ multilib_src_configure() { -Dargyllcms_sensor=$(multilib_native_usex argyllcms true false) -Dreverse=false -Dsane=$(multilib_native_usex scanner true false) + -Dintrospection=$(multilib_native_usex introspection true false) -Dvapi=$(multilib_native_usex vala true false) -Dprint_profiles=$(multilib_native_usex extra-print-profiles true false) $(meson_use test tests) diff --git a/x11-misc/colord/files/1.4.5-optional-introspection.patch b/x11-misc/colord/files/1.4.5-optional-introspection.patch new file mode 100644 index 00000000000..8bc4580bebe --- /dev/null +++ b/x11-misc/colord/files/1.4.5-optional-introspection.patch @@ -0,0 +1,64 @@ +From e73723cabe4d5a2e2b281d2f1ea751b2d75bccc6 Mon Sep 17 00:00:00 2001 +From: David Michael <fedora....@gmail.com> +Date: Fri, 30 Apr 2021 16:28:17 -0400 +Subject: [PATCH] build: Make introspection optional in meson + +It defaults to enabled to preserve existing behavior. +--- + lib/colord/meson.build | 2 ++ + lib/colorhug/meson.build | 2 ++ + meson_options.txt | 1 + + 3 files changed, 5 insertions(+) + +diff --git a/lib/colord/meson.build b/lib/colord/meson.build +index dbb3d196..fe9d1cdb 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 a/lib/colorhug/meson.build b/lib/colorhug/meson.build +index 9526ea4d..c0ce2887 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') + e = executable( +diff --git a/meson_options.txt b/meson_options.txt +index c184898e..10517622 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -7,6 +7,7 @@ option('systemd', type : 'boolean', value : true, description : 'Enable systemd + option('argyllcms_sensor', type : 'boolean', value : true, description : 'Enable ArgllCMS sensor') + option('reverse', type : 'boolean', value : false, description : 'Enable reverse engineering tools') + option('sane', type : 'boolean', value : false, description : 'Enable SANE support') ++option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files') + option('vapi', type : 'boolean', value : false, description : 'Build vala bindings') + option('print_profiles', type : 'boolean', value : false, description : 'Build extra print profiles') + option('tests', type : 'boolean', value : true, description : 'Build self tests')
