diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /x11-misc/colord/files | |
parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) |
gentoo resync : 04.05.2021
Diffstat (limited to 'x11-misc/colord/files')
-rw-r--r-- | x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch | 53 | ||||
-rw-r--r-- | x11-misc/colord/files/1.4.5-optional-introspection.patch | 64 |
2 files changed, 64 insertions, 53 deletions
diff --git a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch b/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch deleted file mode 100644 index cbf79a830c09..000000000000 --- a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2bbcefa35225ba836b1672449f1de59ce9a90078 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Sun, 18 Apr 2021 16:46:52 -0400 -Subject: [PATCH] build: Fix building without vapi - ---- - lib/colord/meson.build | 2 +- - lib/colorhug/meson.build | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/colord/meson.build b/lib/colord/meson.build -index dbb3d19..3126046 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('vapi') - libcolord_girtarget = gnome.generate_gir(colord, - sources : [ - 'cd-client.c', -@@ -203,7 +204,6 @@ libcolord_girtarget = gnome.generate_gir(colord, - libcolord_gir = libcolord_girtarget[0] - libcolord_typelib = libcolord_girtarget[1] - --if get_option('vapi') - gnome.generate_vapi('colord', - sources: libcolord_girtarget[0], - packages: ['gio-2.0'], -diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build -index 9526ea4..9f17553 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('vapi') - 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( --- -2.26.3 - 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 000000000000..8bc4580bebe3 --- /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.dm0@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') |