diff options
author | Celeste <20312-Celeste@users.gitlab.alpinelinux.org> | 2024-03-14 04:12:19 +0000 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2024-03-19 13:50:34 +0000 |
commit | bf6e31aa4dcfd1edd429d093ef379b800eaa2692 (patch) | |
tree | c526bb38aab1adccdd2b5a9a601078c73f780597 | |
parent | 5557415921156ef5df839367625b9203768c64ec (diff) |
-rw-r--r-- | community/gthumb/0001-jxl-added-support-for-version-0.9.0.patch | 50 | ||||
-rw-r--r-- | community/gthumb/APKBUILD | 11 |
2 files changed, 4 insertions, 57 deletions
diff --git a/community/gthumb/0001-jxl-added-support-for-version-0.9.0.patch b/community/gthumb/0001-jxl-added-support-for-version-0.9.0.patch deleted file mode 100644 index 40e1ddce27d..00000000000 --- a/community/gthumb/0001-jxl-added-support-for-version-0.9.0.patch +++ /dev/null @@ -1,50 +0,0 @@ -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/community/gthumb/APKBUILD b/community/gthumb/APKBUILD index 0f6224526d2..dfde2bc7288 100644 --- a/community/gthumb/APKBUILD +++ b/community/gthumb/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=gthumb -pkgver=3.12.4 -pkgrel=1 +pkgver=3.12.6 +pkgrel=0 pkgdesc="Image viewer and browser from GNOME" url="https://gitlab.gnome.org/GNOME/gthumb" # optional libjxl, but nobody uses this on s390x @@ -45,9 +45,7 @@ subpackages=" $pkgname-extra-formats:extra_formats $pkgname-full " -source="https://gitlab.gnome.org/GNOME/gthumb/-/archive/$pkgver/gthumb-$pkgver.tar.gz - 0001-jxl-added-support-for-version-0.9.0.patch - " +source="https://gitlab.gnome.org/GNOME/gthumb/-/archive/$pkgver/gthumb-$pkgver.tar.gz" # List of extensions splitted into subpackages. _extensions=" @@ -209,6 +207,5 @@ _rename() { } sha512sums=" -88eba83a42f3a20220904aa866cfb24e731b33d2567b2b7fcfcd9dd682fa7211004faa50b1824f1b0bd170af08f2d53b2dc4ede6a9e3a15fb76d5eb084ca45c6 gthumb-3.12.4.tar.gz -af4b98b81c1b6c586c2f91cbc5febe8de7d6d576cd2950c9306af6805bff0478b02045b01ae1de988209d109b2489a730b9334389204a8609ca974a3d8004b1c 0001-jxl-added-support-for-version-0.9.0.patch +162b8122413b6c1134436c1b33fa655e385f0a5d6095172fdb7bed32e900460550691996c7ad9d1130e4e860ea65026b4b1a5f71718f31bb577922dd54b96e06 gthumb-3.12.6.tar.gz " |