patch pix for build with jxl 0.9.0

3 files changed, 62 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb4c134f3b4b..1daefd58e6ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pix
 	pkgdesc = Image viewer and browser based on gthumb. X-Apps Project.
 	pkgver = 3.2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/linuxmint/pix
 	arch = i686
 	arch = x86_64
@@ -33,6 +33,8 @@ pkgbase = pix
 	provides = pix
 	conflicts = pix-git
 	source = pix-3.2.2.tar.gz::https://github.com/linuxmint/pix/archive/3.2.2.tar.gz
+	source = 0001-jxl-added-support-for-version-0.9.0.patch
 	md5sums = 450fed1003f786b7f904c65662115cdf
+	md5sums = 9e81ebbe9dbd6638b178189c1a5ab51b
 
 pkgname = pix
diff --git a/0001-jxl-added-support-for-version-0.9.0.patch b/0001-jxl-added-support-for-version-0.9.0.patch
new file mode 100644
index 000000000000..40e1ddce27df
--- /dev/null
+++ b/0001-jxl-added-support-for-version-0.9.0.patch
@@ -0,0 +1,50 @@
+From c87f60413a28da4a28f94f92680c6e4458cbe16b Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Fri, 29 Dec 2023 10:34:55 +0100
+Subject: [PATCH] jxl: added support for version 0.9.0
+
+---
+ extensions/cairo_io/cairo-image-surface-jxl.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/cairo_io/cairo-image-surface-jxl.c b/extensions/cairo_io/cairo-image-surface-jxl.c
+index 72365897..01ceaaa6 100644
+--- a/extensions/cairo_io/cairo-image-surface-jxl.c
++++ b/extensions/cairo_io/cairo-image-surface-jxl.c
+@@ -236,18 +236,30 @@ _cairo_image_surface_create_from_jxl(GInputStream  *istream,
+ 
+ 		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,
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
++			&pixel_format,
++#endif
++			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,
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
++				&pixel_format,
++#endif
++				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,
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
++				&pixel_format,
++#endif
++				JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) {
+ 					g_message("Could not get ICC profile.\n");
+ 					g_free(profile_data);
+ 					break;
+-- 
+2.43.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 7ce88f488840..6d95c091dd9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=pix
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Image viewer and browser based on gthumb. X-Apps Project."
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
@@ -39,9 +39,15 @@ provides=($pkgname)
 conflicts=('pix-git')
 url='https://github.com/linuxmint/pix'
 
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/${pkgname}/archive/${pkgver}.tar.gz")
-md5sums=('450fed1003f786b7f904c65662115cdf')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/${pkgname}/archive/${pkgver}.tar.gz"
+'0001-jxl-added-support-for-version-0.9.0.patch'
+)
+md5sums=('450fed1003f786b7f904c65662115cdf' '9e81ebbe9dbd6638b178189c1a5ab51b')
 
+prepare() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+    patch --forward --strip=1 --input="${srcdir}"/0001-jxl-added-support-for-version-0.9.0.patch
+}
 
 build() {
     mkdir -p "${srcdir}"/${pkgname}-${pkgver}/build