gentoo auto-resync : 16:12:2022 - 09:35:57

3 files changed, 39 insertions, 1 deletions

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index ad1698b94435..c7d3a6b78989 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,4 @@
+AUX colord-1.4.6-lcms2-corruption.patch 1183 BLAKE2B 67dae6de961d67cb7893087cf8e40a5ecbe37629decbfdb5803ae2c08078f1327ee53b5f4d61ae9d6290a87dbce19db8a26c838292f1f92fd6c66387e9b787ff SHA512 153c3cc2adacb1d9fb424f597cbfdd5c0bef80122efa00852ca26a3f3e603f977687e037f5e6afcc42b37469fd9cc5280afd8f76a772bed1d3246d9b125ccdcf
 DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
-EBUILD colord-1.4.6.ebuild 3428 BLAKE2B 196073c29858e89849df51ace37c45c9bb5345f89731e86f3110efdb4ae485a2ba52d153d288e0abefa6eceff6091d5123e723a793f1a621f3587e9010d48f20 SHA512 c351ad27e2efbb8e7bcdc54aa482d58ad2aabdb4a2cfee7c7dfb6227c887c6d382fb73195442c2369e92f842e85431f332aba9c1fa00d899392e3c8f8041b87e
+EBUILD colord-1.4.6-r1.ebuild 3484 BLAKE2B 848e36faa82117ddc33be226891dfee606eddbb55b9f707984946bd9304bf4ab31e8fca86ee26bf8e63509bf2174f809c1bf07b752b2c0f7005242d5bf2fe6fa SHA512 15f4042cc026f0443509816e689a2456aa35877969b0505924ff8783ed40a32305ce73ea6b9fd43f59dafb5c7f6d25bc198a15a9c705f9f787b77430a86d0dce
 MISC metadata.xml 538 BLAKE2B 314dc50e426cb4abb2cab8ea3f1ca221d1543820587fac02747c198c034ff468d13273ae573f30ee852489c22ebabf80b5d62d409b32bcedf9de45e768d6600c SHA512 10e907a1f38a40acebfb32ff8ecb58b074147ce29947a31272fca5de1d8de99935fab05dffbaa271aea0b4981c36ce0c8ef19879d3796360ecdf3b2143f7dbd4
diff --git a/x11-misc/colord/colord-1.4.6.ebuild b/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);
+ }
+