git: 23d61c9d1dee - main - graphics/gimp[-app]: update to 2.10.32 release

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Tue, 14 Jun 2022 13:44:06 UTC
The branch main has been updated by fluffy:

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

commit 23d61c9d1dee6a3cb965d6aa68bcc4a3f6eedd58
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-06-14 13:43:22 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-06-14 13:43:22 +0000

    graphics/gimp[-app]: update to 2.10.32 release
---
 graphics/gimp-app/Makefile                         | 14 +++++++------
 graphics/gimp-app/distinfo                         |  6 +++---
 .../gimp-app/files/patch-app_core_gimptagcache_c   | 23 ++++++++++++++++++++++
 graphics/gimp-app/pkg-plist                        |  8 ++++++++
 graphics/gimp/Makefile                             |  2 +-
 5 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 299410b467a9..c23c8a8db9d0 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,8 +1,7 @@
 # Created by: erich@FreeBSD.org
 
 PORTNAME?=	gimp
-PORTVERSION=	2.10.30
-PORTREVISION=	5
+PORTVERSION=	2.10.32
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
@@ -84,7 +83,7 @@ PLIST_SUB+=	LIBVER=0.1000.${PORTVERSION:E}
 
 USES+=		desktop-file-utils
 
-OPTIONS_DEFINE?=	AALIB GHOSTSCRIPT \
+OPTIONS_DEFINE?=	AALIB GHOSTSCRIPT JXL \
 			LIBHEIF LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
 OPTIONS_DEFAULT=	AALIB LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
 OPTIONS_SUB=		yes
@@ -107,13 +106,16 @@ AALIB_DESC=		Ascii-art Plug-in
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_WITH=	aa
 
+GHOSTSCRIPT_USES=		ghostscript
+GHOSTSCRIPT_CONFIGURE_WITH=	gs
+
+JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
+JXL_CONFIGURE_WITH=	jpegxl
+
 LIBHEIF_DESC=		ISO/IEC 23008-12:2017 HEIF file format support
 LIBHEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 LIBHEIF_CONFIGURE_WITH=	libheif
 
-GHOSTSCRIPT_USES=		ghostscript
-GHOSTSCRIPT_CONFIGURE_WITH=	gs
-
 LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 LIBMNG_CONFIGURE_WITH=	libmng
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index b8eeff674180..9982e7f796d1 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640768851
-SHA256 (gimp-2.10.30.tar.bz2) = 88815daa76ed7d4277eeb353358bafa116cd2fcd2c861d95b95135c1d52b67dc
-SIZE (gimp-2.10.30.tar.bz2) = 31731327
+TIMESTAMP = 1655192953
+SHA256 (gimp-2.10.32.tar.bz2) = 3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25
+SIZE (gimp-2.10.32.tar.bz2) = 31397425
diff --git a/graphics/gimp-app/files/patch-app_core_gimptagcache_c b/graphics/gimp-app/files/patch-app_core_gimptagcache_c
new file mode 100644
index 000000000000..69da844b17a4
--- /dev/null
+++ b/graphics/gimp-app/files/patch-app_core_gimptagcache_c
@@ -0,0 +1,23 @@
+Index: app/core/gimptagcache.c
+--- app/core/gimptagcache.c.orig
++++ app/core/gimptagcache.c
+@@ -397,8 +397,8 @@ gimp_tag_cache_save (GimpTagCache *cache)
+ 
+       identifier_string = g_markup_escape_text (g_quark_to_string (cache_rec->identifier), -1);
+       g_string_append_printf (buf, "\n  <resource identifier=\"%s\" checksum=\"%s\">\n",
+-                              identifier_string,
+-                              g_quark_to_string (cache_rec->checksum));
++                              identifier_string ? identifier_string : "(NULL)",
++                              cache_rec->checksum ? g_quark_to_string (cache_rec->checksum) : "(NULL)");
+       g_free (identifier_string);
+ 
+       for (tag_iterator = cache_rec->tags;
+@@ -607,7 +607,7 @@ gimp_tag_cache_load_text (GMarkupParseContext  *contex
+       else
+         {
+           g_warning ("dropping invalid tag '%s' from '%s'\n", buffer,
+-                     g_quark_to_string (parse_data->current_record.identifier));
++                     parse_data->current_record.identifier ? g_quark_to_string (parse_data->current_record.identifier) : "(NULL)");
+         }
+     }
+ }
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 91e1d76f0b0c..51c4df333307 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -334,6 +334,7 @@ libexec/gimp/2.2/plug-ins/file-html-table/file-html-table
 libexec/gimp/2.2/plug-ins/file-ico/file-ico
 %%OPENJPEG%%libexec/gimp/2.2/plug-ins/file-jp2-load/file-jp2-load
 libexec/gimp/2.2/plug-ins/file-jpeg/file-jpeg
+%%JXL%%libexec/gimp/2.2/plug-ins/file-jpegxl/file-jpegxl
 %%LIBMNG%%libexec/gimp/2.2/plug-ins/file-mng/file-mng
 libexec/gimp/2.2/plug-ins/file-pat/file-pat
 libexec/gimp/2.2/plug-ins/file-pcx/file-pcx
@@ -4718,8 +4719,11 @@ share/applications/gimp.desktop
 %%DATADIR%%/themes/Dark/ui/notebook.png
 %%DATADIR%%/themes/Dark/ui/null.png
 %%DATADIR%%/themes/Dark/ui/option1.png
+%%DATADIR%%/themes/Dark/ui/option1-prelight.png
 %%DATADIR%%/themes/Dark/ui/option2.png
+%%DATADIR%%/themes/Dark/ui/option2-prelight.png
 %%DATADIR%%/themes/Dark/ui/option3.png
+%%DATADIR%%/themes/Dark/ui/option3-prelight.png
 %%DATADIR%%/themes/Dark/ui/plus.png
 %%DATADIR%%/themes/Dark/ui/progressbar-trough.png
 %%DATADIR%%/themes/Dark/ui/progressbar.png
@@ -4739,6 +4743,7 @@ share/applications/gimp.desktop
 %%DATADIR%%/themes/Dark/ui/spin.png
 %%DATADIR%%/themes/Dark/ui/toolbar.png
 %%DATADIR%%/themes/Dark/ui/transparent.png
+%%DATADIR%%/themes/Dark/ui/treeview-item-prelight.png
 %%DATADIR%%/themes/Gray/gtkrc
 %%DATADIR%%/themes/Gray/ui/arrow-down-insens.png
 %%DATADIR%%/themes/Gray/ui/arrow-down-prelight.png
@@ -4862,6 +4867,7 @@ share/applications/gimp.desktop
 %%DATADIR%%/themes/Gray/ui/spin.png
 %%DATADIR%%/themes/Gray/ui/toolbar.png
 %%DATADIR%%/themes/Gray/ui/transparent.png
+%%DATADIR%%/themes/Gray/ui/treeview-item-prelight.png
 %%DATADIR%%/themes/Light/gtkrc
 %%DATADIR%%/themes/Light/ui/arrow-down-insens.png
 %%DATADIR%%/themes/Light/ui/arrow-down-prelight.png
@@ -4987,6 +4993,7 @@ share/applications/gimp.desktop
 %%DATADIR%%/themes/Light/ui/spin.png
 %%DATADIR%%/themes/Light/ui/toolbar.png
 %%DATADIR%%/themes/Light/ui/transparent.png
+%%DATADIR%%/themes/Light/ui/treeview-item-prelight.png
 %%DATADIR%%/themes/System/gtkrc
 %%DATADIR%%/tips/gimp-tips.xml
 %%DATADIR%%/tool-presets/Crop/16_10.gtp
@@ -5205,6 +5212,7 @@ share/locale/ja/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ja/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ja/LC_MESSAGES/gimp20.mo
 share/locale/ka/LC_MESSAGES/gimp20.mo
+share/locale/ka/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/kab/LC_MESSAGES/gimp20-python.mo
 share/locale/kab/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/kk/LC_MESSAGES/gimp20-libgimp.mo
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index b3957cf408d0..7eefa6b4a8df 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
 # Created by: erich@FreeBSD.org
 
 PORTNAME=	gimp
-DISTVERSION?=	2.10.28
+DISTVERSION?=	2.10.32
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome