git: d53d9f30bbad - main - graphics/gthumb: switch to upstream fix after 11b08d733b7c

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 29 Dec 2023 12:58:29 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d53d9f30bbadef3a546ef321b209d1f50f92edb1

commit d53d9f30bbadef3a546ef321b209d1f50f92edb1
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-12-29 10:41:17 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-12-29 12:57:37 +0000

    graphics/gthumb: switch to upstream fix after 11b08d733b7c
---
 graphics/gthumb/Makefile                           |  1 +
 graphics/gthumb/distinfo                           |  2 ++
 ...-extensions_cairo__io_cairo-image-surface-jxl.c | 26 ----------------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index a7554cd0bb38..a36be29574f2 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -7,6 +7,7 @@ DIST_SUBDIR=	gnome
 
 PATCH_SITES=	https://gitlab.gnome.org/GNOME/gthumb/-/commit/
 PATCHFILES=	2133520496afd179702953a5d07aa99b5209f9cf.patch:-p1 #Fix build with libraw >= 0.21.0
+PATCHFILES+=	306d0eeca5ef.patch:-p1 # https://gitlab.gnome.org/GNOME/gthumb/-/issues/306
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Image viewer and browser for the GNOME environment
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 84132352c484..4900f97a69f1 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -3,3 +3,5 @@ SHA256 (gnome/gthumb-3.12.2.tar.xz) = 97f8afe522535216541ebbf1e3b546d12a6beb38a8
 SIZE (gnome/gthumb-3.12.2.tar.xz) = 7585700
 SHA256 (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 96c82ad7390d3c39e421f1e0e6b129492f07dc9239d54791ed41713659dd496a
 SIZE (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 2358
+SHA256 (gnome/306d0eeca5ef.patch) = db219738ed0c6349c9c60fee0df4d05b50304fbea5018aa145f9286840676b64
+SIZE (gnome/306d0eeca5ef.patch) = 2011
diff --git a/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c b/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c
deleted file mode 100644
index 02ff064ccc9a..000000000000
--- a/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c
+++ /dev/null
@@ -1,26 +0,0 @@
-https://gitlab.gnome.org/GNOME/gthumb/-/issues/306
-
---- extensions/cairo_io/cairo-image-surface-jxl.c.orig	2022-04-03 18:38:59 UTC
-+++ extensions/cairo_io/cairo-image-surface-jxl.c
-@@ -234,18 +234,18 @@ _cairo_image_surface_create_from_jxl(GInputStream  *is
- 
- 		case JXL_DEC_COLOR_ENCODING:
- #if HAVE_LCMS2
--			if (JxlDecoderGetColorAsEncodedProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, NULL) == JXL_DEC_SUCCESS)
-+			if (JxlDecoderGetColorAsEncodedProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, NULL) == JXL_DEC_SUCCESS)
- 				break;
- 
- 			{
- 				gsize profile_size;
--				if (JxlDecoderGetICCProfileSize(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, &profile_size) > 0) {
-+				if (JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA, &profile_size) > 0) {
- 					g_message("Could not get ICC profile size.\n");
- 					break;
- 				}
- 
- 				guchar *profile_data = g_new(guchar, profile_size);
--				if (JxlDecoderGetColorAsICCProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) {
-+				if (JxlDecoderGetColorAsICCProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) {
- 					g_message("Could not get ICC profile.\n");
- 					g_free(profile_data);
- 					break;