diff --git a/0001-Fix-Wincompatible-pointer-types.patch b/0001-Fix-Wincompatible-pointer-types.patch new file mode 100644 index 0000000..30dda91 --- /dev/null +++ b/0001-Fix-Wincompatible-pointer-types.patch @@ -0,0 +1,33 @@ +From b22d2a5b0eabeafd1dbcf1db1e0e191bd2d5434c Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 22 Jan 2024 12:08:33 +0000 +Subject: [PATCH] Fix -Wincompatible-pointer-types + +--- + lib/colord/cd-icc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c +index 39e2ac1..3937d8a 100644 +--- a/lib/colord/cd-icc.c ++++ b/lib/colord/cd-icc.c +@@ -1711,6 +1711,7 @@ cd_icc_save_data (CdIcc *icc, + */ + struct tm creation_time; + cmsICCHeader *header; ++ time_t creation_time_timet = priv->creation_time; + g_autoptr(GByteArray) mutable_data = NULL; + + data = cd_icc_serialize_profile (icc, error); +@@ -1720,7 +1721,7 @@ cd_icc_save_data (CdIcc *icc, + mutable_data = g_bytes_unref_to_array (data); + data = NULL; + +- if (!gmtime_r (&priv->creation_time, &creation_time)) { ++ if (!gmtime_r (&creation_time_timet, &creation_time)) { + g_set_error (error, + CD_ICC_ERROR, + CD_ICC_ERROR_FAILED_TO_SAVE, +-- +2.43.0 + diff --git a/colord.spec b/colord.spec index fdf7d8a..6a1229d 100644 --- a/colord.spec +++ b/colord.spec @@ -10,12 +10,14 @@ Summary: Color daemon Name: colord Version: 1.4.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://www.freedesktop.org/software/colord/ Source0: https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz Source1: colord.sysusers +Patch0: 0001-Fix-Wincompatible-pointer-types.patch + %if !0%{?rhel} BuildRequires: bash-completion %endif @@ -256,6 +258,9 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db %{_datadir}/installed-tests/colord/* %changelog +* Mon Jan 22 2024 Richard Hughes 1.4.6-9 +- Fix a mass-rebuild failure by backporting a patch from upstream + * Fri Jan 19 2024 Fedora Release Engineering - 1.4.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild