[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/, x11-misc/colord/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/, x11-misc/colord/files/

[Sam James]

commit:     67eefb25d66a312e6d4ecdf3ff6bb4c7f4847137
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 02:16:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 02:52:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67eefb25

x11-misc/colord: backport lcms 2 fix

Closes: https://bugs.gentoo.org/880865
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...{colord-1.4.6.ebuild => colord-1.4.6-r1.ebuild} |  4 +++
 .../files/colord-1.4.6-lcms2-corruption.patch      | 33 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/x11-misc/colord/colord-1.4.6.ebuild b/x11-misc/colord/colord-1.4.6-r1.ebuild
similarity index 98%
rename from x11-misc/colord/colord-1.4.6.ebuild
rename to x11-misc/colord/colord-1.4.6-r1.ebuild
index 6b1521b25a0a..58918a6d770d 100644
--- a/x11-misc/colord/colord-1.4.6.ebuild
+++ b/x11-misc/colord/colord-1.4.6-r1.ebuild
@@ -57,6 +57,10 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-lcms2-corruption.patch
+)
+
 src_prepare() {
 	default
 	use vala && vala_src_prepare

diff --git a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch b/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
new file mode 100644
index 000000000000..4df6773cfb4b
--- /dev/null
+++ b/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/880865
+
+https://github.com/mm2/Little-CMS/issues/344
+https://github.com/hughsie/colord/issues/145
+
+https://github.com/hughsie/colord/commit/91a3cc2e994be587def3b70762f15461101d43a1
+
+From 91a3cc2e994be587def3b70762f15461101d43a1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Nov 2022 17:03:37 +0000
+Subject: [PATCH] lib: avoid destructing LCMS plugin twice with lcms 2.14
+
+lcms 2.14 contains a change to avoid a memory leak, but that change
+assumes correct API usage. It's not necessary to both cmsUnregisterPluginsTHR()
+and then cmsDeleteContext() -- we can just straight up delete the LCMS
+context instead (cmsDeleteContext()).
+
+So, follow upstream's suggestion & do that. This fixes memory corruption
+when building colord on x86, for example.
+
+Bug: https://github.com/mm2/Little-CMS/issues/344
+Fixes: https://github.com/hughsie/colord/issues/145
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/lib/colord/cd-context-lcms.c
++++ b/lib/colord/cd-context-lcms.c
+@@ -163,7 +163,6 @@ cd_context_lcms_free (gpointer ctx)
+ 	g_clear_error (error_ctx);
+ 	g_free (error_ctx);
+ 
+-	cmsUnregisterPluginsTHR (ctx);
+ 	cmsDeleteContext (ctx);
+ }
+ 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/, x11-misc/colord/files/

[Mart Raudsepp]

commit:     57e56f51b1a8ce0b14075424466cb90c5b90b409
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 10:24:04 2024 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 10:24:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e56f51

x11-misc/colord: drop 1.4.6-r2

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 x11-misc/colord/Manifest                           |   1 -
 x11-misc/colord/colord-1.4.6-r2.ebuild             | 132 ---------------------
 .../files/colord-1.4.6-FILE_OFFSET_BITS.patch      |  38 ------
 .../files/colord-1.4.6-lcms2-corruption.patch      |  33 ------
 .../files/colord-1.4.6-time_t-ptr-truncation.patch |  35 ------
 5 files changed, 239 deletions(-)

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index ea9fabb83268..d4d19bcb59ed 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,2 +1 @@
-DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
 DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be

diff --git a/x11-misc/colord/colord-1.4.6-r2.ebuild b/x11-misc/colord/colord-1.4.6-r2.ebuild
deleted file mode 100644
index f15ba9e3d9ee..000000000000
--- a/x11-misc/colord/colord-1.4.6-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 meson-multilib tmpfiles udev vala
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="https://www.freedesktop.org/software/colord/"
-SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner selinux systemd test vala"
-RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
-REQUIRED_USE="vala? ( introspection )"
-
-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[introspection?,${MULTILIB_USEDEP}]
-
-	dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	virtual/udev
-
-	systemd? ( >=sys-apps/systemd-44:0= )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus
-	)
-	>=sys-auth/polkit-0.114
-	argyllcms? ( media-gfx/argyllcms )
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/colord
-	acct-user/colord
-	selinux? ( sec-policy/selinux-colord )
-"
-BDEPEND="
-	acct-group/colord
-	acct-user/colord
-	app-text/docbook-xsl-ns-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	extra-print-profiles? ( media-gfx/argyllcms )
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lcms2-corruption.patch
-	"${FILESDIR}"/${P}-time_t-ptr-truncation.patch
-	"${FILESDIR}"/${P}-FILE_OFFSET_BITS.patch
-)
-
-pkg_setup() {
-	use vala && vala_setup
-}
-
-src_prepare() {
-	default
-
-	# Test requires a running session
-	# https://github.com/hughsie/colord/issues/94
-	sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die
-
-	# Adapt to Gentoo paths
-	sed -i \
-		-e "s|find_program('spotread'|find_program('argyll-spotread'|" \
-		-e "s|find_program('colprof'|find_program('argyll-colprof'|" \
-		meson.build || die
-
-	# meson gnome.generate_vapi properly handles VAPIGEN and other vala
-	# environment variables. It is counter-productive to check for an
-	# unversioned vapigen, as that breaks versioned VAPIGEN usages.
-	sed -i -e "/find_program('vapigen')/d" meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_true daemon)
-		-Dbash_completion=false
-		$(meson_native_true udev_rules) # Install udev rules only from native build
-		$(meson_native_use_bool systemd)
-		-Dlibcolordcompat=true
-		$(meson_native_use_bool argyllcms argyllcms_sensor)
-		$(meson_native_use_bool scanner sane)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool extra-print-profiles print_profiles)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddaemon_user=colord
-		$(meson_native_true man)
-		$(meson_use gtk-doc docs)
-		--localstatedir="${EPREFIX}"/var
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	newbashcomp data/colormgr colormgr
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-	tmpfiles_process colord.conf
-}
-
-pkg_postrm() {
-	udev_reload
-}

diff --git a/x11-misc/colord/files/colord-1.4.6-FILE_OFFSET_BITS.patch b/x11-misc/colord/files/colord-1.4.6-FILE_OFFSET_BITS.patch
deleted file mode 100644
index c41f73e4eb8a..000000000000
--- a/x11-misc/colord/files/colord-1.4.6-FILE_OFFSET_BITS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/hughsie/colord/pull/159
-
-From 72cc7bb299de09ec53aa4ce125af370158127d0e Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 2 Dec 2023 05:07:46 +0000
-Subject: [PATCH] meson.build: set FILE_OFFSET_BITS explicitly
-
-This is needed if building introspection because:
-a) Meson's own setting of FILE_OFFSET_BITS (which it does by default) doesn't
-affect the introspection tooling;
-
-b) glibc's headers seem to react poorly to _just_ _TIME_BITS being set, even
-though in this cas, the failure was for a 64-bit ABI anyway.
-
-Fixes: ce9732a87bc2a0ddca841b49b9b9e24351ea78c8
-Signed-off-by: Sam James <sam@gentoo.org>
----
- meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 072a612..b0b1af8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -215,7 +215,9 @@ add_project_arguments('-DCD_COMPILATION', language: 'c')
- # Needed for realpath() and PATH_MAX
- add_project_arguments('-D_XOPEN_SOURCE=700', language : 'c')
- # Needed to opt-in to 64-bit time_t on glibc. We pass 64-bit pointers into
--# gmtime_r.
-+# gmtime_r. We have to set F_O_B here despite Meson defaulting to it because
-+# it doesn't get passed down to introspection otherwise.
-+add_project_arguments('-D_FILE_OFFSET_BITS=64', language : 'c')
- add_project_arguments('-D_TIME_BITS=64', language : 'c')
- 
- prefix = get_option('prefix')
--- 
-2.43.0
-

diff --git a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch b/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
deleted file mode 100644
index 4df6773cfb4b..000000000000
--- a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/880865
-
-https://github.com/mm2/Little-CMS/issues/344
-https://github.com/hughsie/colord/issues/145
-
-https://github.com/hughsie/colord/commit/91a3cc2e994be587def3b70762f15461101d43a1
-
-From 91a3cc2e994be587def3b70762f15461101d43a1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 15 Nov 2022 17:03:37 +0000
-Subject: [PATCH] lib: avoid destructing LCMS plugin twice with lcms 2.14
-
-lcms 2.14 contains a change to avoid a memory leak, but that change
-assumes correct API usage. It's not necessary to both cmsUnregisterPluginsTHR()
-and then cmsDeleteContext() -- we can just straight up delete the LCMS
-context instead (cmsDeleteContext()).
-
-So, follow upstream's suggestion & do that. This fixes memory corruption
-when building colord on x86, for example.
-
-Bug: https://github.com/mm2/Little-CMS/issues/344
-Fixes: https://github.com/hughsie/colord/issues/145
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/lib/colord/cd-context-lcms.c
-+++ b/lib/colord/cd-context-lcms.c
-@@ -163,7 +163,6 @@ cd_context_lcms_free (gpointer ctx)
- 	g_clear_error (error_ctx);
- 	g_free (error_ctx);
- 
--	cmsUnregisterPluginsTHR (ctx);
- 	cmsDeleteContext (ctx);
- }
- 

diff --git a/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch b/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch
deleted file mode 100644
index 687b595feca5..000000000000
--- a/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/918990
-https://github.com/hughsie/colord/issues/157
-https://github.com/hughsie/colord/commit/ce9732a87bc2a0ddca841b49b9b9e24351ea78c8
-
-From ce9732a87bc2a0ddca841b49b9b9e24351ea78c8 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 1 Dec 2023 22:20:17 +0000
-Subject: [PATCH] meson.build: use 64-bit time_t
-
-We call `gmtime_r` (which expects `time_t`) with a 64-bit pointer (`gint64*`).
-
-On 32-bit systems, `time_t` is 32-bit unless you opt-in to a 64-bit wide version
-(at least on glibc). To avoid truncation and -Wincompatible-pointer-types,
-opt-in to 64-bit `time_t` for glibc with `-D_TIME_BITS=64` in meson.
-
-This should be fine ABI wise because the time is only passed down into lcms2
-into `_cmsEncodeDateTimeNumber` where it seems to decompose it and it worked already
-for 64-bit systems. Plus, they use their own types like `cmsUInt16Number` to ensure
-they're wide enough.
-
-Fixes: https://github.com/hughsie/colord/issues/157
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/meson.build
-+++ b/meson.build
-@@ -214,6 +214,9 @@ add_project_arguments('-DCD_COMPILATION', language: 'c')
- 
- # Needed for realpath() and PATH_MAX
- add_project_arguments('-D_XOPEN_SOURCE=700', language : 'c')
-+# Needed to opt-in to 64-bit time_t on glibc. We pass 64-bit pointers into
-+# gmtime_r.
-+add_project_arguments('-D_TIME_BITS=64', language : 'c')
- 
- prefix = get_option('prefix')
- 
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/, x11-misc/colord/files/

[Matt Turner]

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.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')

[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/, x11-misc/colord/files/

[Matt Turner]

commit:     2a99448fde4dd9e790ae7381a466d332bc3812ec
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 01:48:46 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 01:56:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a99448f

x11-misc/colord: Drop unnecessary (???) build patch

I wrote this patch to fix a failure in the configure stage, but I now
cannot reproduce the failure without the patch, and the patch made
USE=vala control whether introspection files were generated and
installed.

Closes: https://bugs.gentoo.org/784272
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...{colord-1.4.5.ebuild => colord-1.4.5-r1.ebuild} |  1 -
 .../1.4.5-build-Fix-building-without-vapi.patch    | 53 ----------------------
 2 files changed, 54 deletions(-)

diff --git a/x11-misc/colord/colord-1.4.5.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild
similarity index 98%
rename from x11-misc/colord/colord-1.4.5.ebuild
rename to x11-misc/colord/colord-1.4.5-r1.ebuild
index deeb744abd9..b1f278d89fb 100644
--- a/x11-misc/colord/colord-1.4.5.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -63,7 +63,6 @@ BDEPEND="${BDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch
-	"${FILESDIR}"/${PV}-build-Fix-building-without-vapi.patch
 )
 
 src_prepare() {

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 cbf79a830c0..00000000000
--- 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
-