gjdwebserver/gjdwebserver-overlay
4
0
Fork 0
Code Pull Requests Releases Activity

Added

Browse Source
This commit is contained in:
Gerben Jan Dijkman
2021-04-21 15:31:22 +02:00
parent 49d070baaa
commit 8ac610a82e
4 changed files with 230 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch Normal file
View File

@@ -0,0 +1,53 @@
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

39
x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch Normal file
View File

@@ -0,0 +1,39 @@
From d68cd11cd31d379e4f3bb4c964b17fd50c8c54a6 Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <raof@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 <raof@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