| 1 |
commit: 2a99448fde4dd9e790ae7381a466d332bc3812ec |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 29 01:48:46 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 29 01:56:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a99448f |
| 7 |
|
| 8 |
x11-misc/colord: Drop unnecessary (???) build patch |
| 9 |
|
| 10 |
I wrote this patch to fix a failure in the configure stage, but I now |
| 11 |
cannot reproduce the failure without the patch, and the patch made |
| 12 |
USE=vala control whether introspection files were generated and |
| 13 |
installed. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/784272 |
| 16 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 17 |
|
| 18 |
...{colord-1.4.5.ebuild => colord-1.4.5-r1.ebuild} | 1 - |
| 19 |
.../1.4.5-build-Fix-building-without-vapi.patch | 53 ---------------------- |
| 20 |
2 files changed, 54 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-misc/colord/colord-1.4.5.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild |
| 23 |
similarity index 98% |
| 24 |
rename from x11-misc/colord/colord-1.4.5.ebuild |
| 25 |
rename to x11-misc/colord/colord-1.4.5-r1.ebuild |
| 26 |
index deeb744abd9..b1f278d89fb 100644 |
| 27 |
--- a/x11-misc/colord/colord-1.4.5.ebuild |
| 28 |
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild |
| 29 |
@@ -63,7 +63,6 @@ BDEPEND="${BDEPEND} |
| 30 |
|
| 31 |
PATCHES=( |
| 32 |
"${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch |
| 33 |
- "${FILESDIR}"/${PV}-build-Fix-building-without-vapi.patch |
| 34 |
) |
| 35 |
|
| 36 |
src_prepare() { |
| 37 |
|
| 38 |
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 |
| 39 |
deleted file mode 100644 |
| 40 |
index cbf79a830c0..00000000000 |
| 41 |
--- a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,53 +0,0 @@ |
| 44 |
-From 2bbcefa35225ba836b1672449f1de59ce9a90078 Mon Sep 17 00:00:00 2001 |
| 45 |
-From: Matt Turner <mattst88@×××××.com> |
| 46 |
-Date: Sun, 18 Apr 2021 16:46:52 -0400 |
| 47 |
-Subject: [PATCH] build: Fix building without vapi |
| 48 |
- |
| 49 |
---- |
| 50 |
- lib/colord/meson.build | 2 +- |
| 51 |
- lib/colorhug/meson.build | 2 ++ |
| 52 |
- 2 files changed, 3 insertions(+), 1 deletion(-) |
| 53 |
- |
| 54 |
-diff --git a/lib/colord/meson.build b/lib/colord/meson.build |
| 55 |
-index dbb3d19..3126046 100644 |
| 56 |
---- a/lib/colord/meson.build |
| 57 |
-+++ b/lib/colord/meson.build |
| 58 |
-@@ -146,6 +146,7 @@ pkgg.generate( |
| 59 |
- description : 'colord is a system daemon for managing color devices', |
| 60 |
- ) |
| 61 |
- |
| 62 |
-+if get_option('vapi') |
| 63 |
- libcolord_girtarget = gnome.generate_gir(colord, |
| 64 |
- sources : [ |
| 65 |
- 'cd-client.c', |
| 66 |
-@@ -203,7 +204,6 @@ libcolord_girtarget = gnome.generate_gir(colord, |
| 67 |
- libcolord_gir = libcolord_girtarget[0] |
| 68 |
- libcolord_typelib = libcolord_girtarget[1] |
| 69 |
- |
| 70 |
--if get_option('vapi') |
| 71 |
- gnome.generate_vapi('colord', |
| 72 |
- sources: libcolord_girtarget[0], |
| 73 |
- packages: ['gio-2.0'], |
| 74 |
-diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build |
| 75 |
-index 9526ea4..9f17553 100644 |
| 76 |
---- a/lib/colorhug/meson.build |
| 77 |
-+++ b/lib/colorhug/meson.build |
| 78 |
-@@ -73,6 +73,7 @@ pkgg.generate( |
| 79 |
- description : 'ColorHug is a simple display hardware colorimeter', |
| 80 |
- ) |
| 81 |
- |
| 82 |
-+if get_option('vapi') |
| 83 |
- libcolorhug_gir = gnome.generate_gir(colorhug, |
| 84 |
- sources : [ |
| 85 |
- 'ch-common.c', |
| 86 |
-@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug, |
| 87 |
- ], |
| 88 |
- install : true |
| 89 |
- ) |
| 90 |
-+endif |
| 91 |
- |
| 92 |
- if get_option('tests') |
| 93 |
- e = executable( |
| 94 |
--- |
| 95 |
-2.26.3 |
| 96 |
- |
Archives