commit: 689aa6c6acd48d50fd6a85244f0264e9168f918e Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Mar 20 17:10:59 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 19:54:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689aa6c6
x11-misc/colord: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/24685 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../files/1.4.5-optional-introspection.patch | 64 ---------------------- ...on-t-use-exact-floating-point-comparisons.patch | 39 ------------- 2 files changed, 103 deletions(-) diff --git a/x11-misc/colord/files/1.4.5-optional-introspection.patch b/x11-misc/colord/files/1.4.5-optional-introspection.patch deleted file mode 100644 index 8bc4580bebe3..000000000000 --- a/x11-misc/colord/files/1.4.5-optional-introspection.patch +++ /dev/null @@ -1,64 +0,0 @@ -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') diff --git a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch b/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch deleted file mode 100644 index de56fe145440..000000000000 --- a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d68cd11cd31d379e4f3bb4c964b17fd50c8c54a6 Mon Sep 17 00:00:00 2001 -From: Christopher James Halse Rogers <r...@ubuntu.com> -Date: Wed, 11 Nov 2020 17:13:19 +1100 -Subject: [PATCH] tests: Don't use exact floating point comparisons. - -The tests asserting that cd_icc_get_version are exactly equal to 3.4 or -2.09 fail on (at least) i386, armel, and s390x because floating point is -hateful. - -Signed-off-by: Christopher James Halse Rogers <r...@ubuntu.com> ---- - lib/colord/cd-test-private.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c -index 4b16ca5..231c4ae 100644 ---- a/lib/colord/cd-test-private.c -+++ b/lib/colord/cd-test-private.c -@@ -1494,7 +1494,7 @@ colord_icc_func (void) - /* check profile properties */ - g_assert_cmpint (cd_icc_get_size (icc), ==, 25244); - g_assert_cmpstr (cd_icc_get_checksum (icc), ==, "9ace8cce8baac8d492a93a2a232d7702"); -- g_assert_cmpfloat (cd_icc_get_version (icc), ==, 3.4); -+ g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 3.4, 0.01); - g_assert (g_str_has_suffix (cd_icc_get_filename (icc), "ibm-t61.icc")); - g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_DISPLAY_DEVICE); - g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_RGB); -@@ -1727,7 +1727,7 @@ colord_icc_save_func (void) - g_object_unref (file); - - /* verify changed values */ -- g_assert_cmpfloat (cd_icc_get_version (icc), ==, 2.09); -+ g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 2.09, 0.001); - g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_OUTPUT_DEVICE); - g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_XYZ); - g_assert_cmpstr (cd_icc_get_metadata_item (icc, "SelfTest"), ==, "true"); --- -2.26.3 -
