diff mbox series

[meta-oe,05/36] colord-native: upgrade 1.4.6 -> 1.4.7

Message ID 1717664795-13902-5-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/36] atkmm-2.36: upgrade 2.36.2 -> 2.36.3 | expand

Commit Message

Mingyu Wang (Fujitsu) June 6, 2024, 9:06 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
refreshed for 1.4.7

Changelog:
===========
- Add various hardenings to the systemd service
- Always close the ICC profile when loading fails
- Avoid destructing LCMS plugin twice with lcms 2.14
- Do not make state files executable in tmpfiles.d/colord.conf
- Fix a double free spotted by Coverity
- Fix an error check when parsing the DTP94 data
- Fix a -Wincompatible-pointer-types warning
- Fix potential crash when reading from broken Huey hardware
- Set FILE_OFFSET_BITS explicitly
- Use a 64-bit time_t
- Use thread context for Gamut Alarm codes

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...the-function-cd_icc_create_from_edid-to-avoid-u.patch | 9 +++------
 meta-oe/recipes-support/colord/colord.inc                | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
index aae2be8c1..a120b7311 100644
--- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
+++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
@@ -1,4 +1,4 @@ 
-From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001
+From d16aed3118bee1e0a7d0bc9e0f34c427a405a6d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 12 May 2019 21:58:02 +0200
 Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev
@@ -89,10 +89,10 @@  index a5e2328..dec509a 100644
 +}
 +
 diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
-index 8beec43..398ff7a 100644
+index 3937d8a..daf6f4d 100644
 --- a/lib/colord/cd-icc.c
 +++ b/lib/colord/cd-icc.c
-@@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error)
+@@ -3117,68 +3117,6 @@ cd_icc_create_default (CdIcc *icc, GError **error)
  	return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error);
  }
  
@@ -161,6 +161,3 @@  index 8beec43..398ff7a 100644
  /**
   * cd_icc_create_from_edid:
   * @icc: A valid #CdIcc
--- 
-2.20.1
-
diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc
index 0ae1a30fe..cafbaaa69 100644
--- a/meta-oe/recipes-support/colord/colord.inc
+++ b/meta-oe/recipes-support/colord/colord.inc
@@ -6,7 +6,7 @@  LIC_FILES_CHKSUM = " \
     file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \
 "
 
-PV = "1.4.6"
+PV = "1.4.7"
 SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f"
+SRC_URI[sha256sum] = "de02d9910634ae159547585cec414e450f711c27235453b4f9b38a9f2361a653"