5 files changed, 0 insertions, 243 deletions
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index dec8ff9bffb0..880da29ef660 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,9 +1,4 @@
-AUX colord-1.4.6-FILE_OFFSET_BITS.patch 1390 BLAKE2B 9b6050d23e5b9ee17a04c29dc599012b114c6581922d907e08398c6e67efdf918b2de678a9b81ae93fcf9d43ccff3a33684e6c28aee73536b99abc72d5dd41a3 SHA512 f327f2f2709057b32b74ce2460ef81ee7a2fddca4fcdd39bfbf27f76756b3244d29c718eb2f2c2bd2e412f3526e0324572a13927cbd0617f536dc8378a3a808f
-AUX colord-1.4.6-lcms2-corruption.patch 1183 BLAKE2B 67dae6de961d67cb7893087cf8e40a5ecbe37629decbfdb5803ae2c08078f1327ee53b5f4d61ae9d6290a87dbce19db8a26c838292f1f92fd6c66387e9b787ff SHA512 153c3cc2adacb1d9fb424f597cbfdd5c0bef80122efa00852ca26a3f3e603f977687e037f5e6afcc42b37469fd9cc5280afd8f76a772bed1d3246d9b125ccdcf
-AUX colord-1.4.6-time_t-ptr-truncation.patch 1415 BLAKE2B b5b71b785fd2c966366efa7c05322a0704f447c644fe6469600018a219414f2c51ebfbd625d08aa18ffc8b789efa8e33afa2da9a1675c4bc1fdc7bee9bdc8eae SHA512 3004a789c3e78e87457434077c6d762e824b0c4b4f0b1adf2f66373f6854b81a48697610b76f593b44e9cd8de48a37bed97659011872416d3957ec9374252931
 AUX colord-1.4.7-systemd-permissions.patch 2163 BLAKE2B 72989d782458153d7bb8356d9c7c8179b61e2be31b59d73fe49d9a0c6bfcfc0d18dfe021547eea1ee2cbf54dce9d98b875a5adf9ea23ac8cc5b757d98afac16a SHA512 3aecb442c68669ad0b297d621c5ea845652b021585b3fa6554eba5ec7ad80f149a4cef5f081ae7f029819c919453e7f34e64907fb8015d023c338cc8d5896d8e
-DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
 DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be
-EBUILD colord-1.4.6-r2.ebuild 3586 BLAKE2B ddfee20fe98bb069a5d61d5a88fabe156145ddb33bf47fd933f3f55330a11142de1018055e0b713a0a7d4ae02533d5a53a93ddca24d2ffa52c08120ced86256a SHA512 6d44b8683e4335c7bf09eae166024562b8d676e4027a6437f0ba90632ab3b8438ff1e643d1d81707661069b07ae88af56eb8421e4b232b1ba6c4d22f4f04946d
 EBUILD colord-1.4.7-r1.ebuild 3505 BLAKE2B 668be20a1519ca1bbe5ef7ce730fb83f30f74080f34772555a63ba46f3dca409e057dfa9ac683e1711618ada23a00ae2e9fa8d6f838d33da84c17a0b882f695f SHA512 fdcf6e2fa274f5e5f12e6144e004117f44f9297ab6e9d31f6ac79eca51e7db565dea37236bbe3749a8be805b488c01d67c4f42d9d8ab8ce59b6b0c67f4896e2a
 MISC metadata.xml 538 BLAKE2B 314dc50e426cb4abb2cab8ea3f1ca221d1543820587fac02747c198c034ff468d13273ae573f30ee852489c22ebabf80b5d62d409b32bcedf9de45e768d6600c SHA512 10e907a1f38a40acebfb32ff8ecb58b074147ce29947a31272fca5de1d8de99935fab05dffbaa271aea0b4981c36ce0c8ef19879d3796360ecdf3b2143f7dbd4
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')
- 
-