gentoo auto-resync : 02:12:2023 - 11:00:10

5 files changed, 205 insertions, 0 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f0a72f0a67ba..fc471cd6f701 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index c7d3a6b78989..a40d042ed277 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,4 +1,7 @@
+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
 DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
 EBUILD colord-1.4.6-r1.ebuild 3484 BLAKE2B 848e36faa82117ddc33be226891dfee606eddbb55b9f707984946bd9304bf4ab31e8fca86ee26bf8e63509bf2174f809c1bf07b752b2c0f7005242d5bf2fe6fa SHA512 15f4042cc026f0443509816e689a2456aa35877969b0505924ff8783ed40a32305ce73ea6b9fd43f59dafb5c7f6d25bc198a15a9c705f9f787b77430a86d0dce
+EBUILD colord-1.4.6-r2.ebuild 3581 BLAKE2B 96dd0794b87f742a46f92a633e4c750351370c7e63b7fbedaa2c5f4ab0873ef84e3f41e45306d127d606beff41237959a60363d9f7d4788967dc89f257fbb29e SHA512 2909fc31a795adc82e4c654a9b506ed7502ce26b7ab92f20aac784bf1bb9aedc8a1d21b686fb8b8766b3f80ba60bf0091b351c9f047f50738e04e6ee1d02a0df
 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
new file mode 100644
index 000000000000..20e350ceb6e5
--- /dev/null
+++ b/x11-misc/colord/colord-1.4.6-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 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
+)
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+
+	# 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
new file mode 100644
index 000000000000..c41f73e4eb8a
--- /dev/null
+++ b/x11-misc/colord/files/colord-1.4.6-FILE_OFFSET_BITS.patch
@@ -0,0 +1,38 @@
+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-time_t-ptr-truncation.patch b/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch
new file mode 100644
index 000000000000..687b595feca5
--- /dev/null
+++ b/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch
@@ -0,0 +1,35 @@
+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')
+ 
+