From nobody Tue Feb 13 16:53:28 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TZ6pc5blTz59F7k; Tue, 13 Feb 2024 16:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ6pc3lcwz4sV9; Tue, 13 Feb 2024 16:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707843208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXKJw4b3xhCRd1CWcN9cFvN0AF8nLMHVCpqdKbXcksk=; b=Hymtnc6zIgFtmKJlr+HHCn1AbaY3kznkJhs9/F2bc2PNucWQuqEMDW0UuRQcd9YgNHKqXB hYvRgik9qUI8dMin8IhfzI3nE45QoEIwvbxp+5IR/2DCS5pTOhwK6q8J7DH7CXL0BAC+sd LEbBxGbi1Wh+PGz/2FQ0ZEMXQhwCg+LFpNp58yQTm0jJ1tvXLv8+gbfCxowN7MIfjmxPOw c9b3TgD5OcN7zuM72HJEgnuhAIoIr+MGp1cgSOqJZtWgW8NJH1ovx/jtOD/wI8bIFRqVGu sVEJkhjENOYy2N/j4XkPoih/iPS4l/Gqr6AUonIPp56QqIFizMHihjBY3YJfXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707843208; a=rsa-sha256; cv=none; b=w70SKcKkUh3sdLEMOnpJMbVnh5U652j1m68HgmV5dsPUFkYpJeKZsMe3qOl1w9ODERCih5 MXBLSxDHz81vXhykWdp4D3O6+tUlVnzmpt1FdUXROPfJ/qF1qvdcIuBEoVnTXMzWnP7eaE KbpzDzLXFDD46/oiXwsGmEn37OPZiAZpO+00QqGut6w4TFh0Dccq5eMauGACFH5bS+mZbG CHopV1KO2GI6hGWzPuNPGuf2kVVlceMrhWxsZB7PnS+B5EvS+oR0eoLP7W8bA2htG6/gzZ EQjq6LPMLZiYGA7tAmioVFT/lXPtIBBs0Ce31kVrpZGTU/2LdZdBLEPFJ7cK2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707843208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXKJw4b3xhCRd1CWcN9cFvN0AF8nLMHVCpqdKbXcksk=; b=obkPm3KyCxbp6wyzDalhcD0E05qXAor5bTH18/aPsnBvmNKPbAmO5Y1rka69skvDiWLU2G EbbUWN+Tmf/zXyR1O/wM+9q9Et/hTkwu1i3JpYCkFQXlhHs7jpNUuwRArydOLbki2DYi2n OaOCErMKg8mbAKNfPKvUDTul0SA4747jYuINOrBjuOrD9hnbiisUchZD/wHW0YxSi/3TSz lG1CBSHOotKuJkk4lkgWRCSC7fTfaldg07YS7zpqVAprsQuOOC1Ywo+QGPZJFQgvKODYXd EkuGBC3EEUJ+cGz2rXuWsTbbD9wByItt+8efsM3wf0D+XovSzlo/zawXCs0RMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ6pc2pm8zNZT; Tue, 13 Feb 2024 16:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DGrSuE053696; Tue, 13 Feb 2024 16:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DGrSvX053693; Tue, 13 Feb 2024 16:53:28 GMT (envelope-from git) Date: Tue, 13 Feb 2024 16:53:28 GMT Message-Id: <202402131653.41DGrSvX053693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: ba21ee1e0eb0 - main - graphics/gimp-app: update to 2.10.36 release (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba21ee1e0eb0308f0add0810beabb524dece5180 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba21ee1e0eb0308f0add0810beabb524dece5180 commit ba21ee1e0eb0308f0add0810beabb524dece5180 Author: Dima Panov AuthorDate: 2024-02-13 16:50:29 +0000 Commit: Dima Panov CommitDate: 2024-02-13 16:53:19 +0000 graphics/gimp-app: update to 2.10.36 release (+) New features and improvements: * ASE and ACB palettes support * New Gradient: FG to Transparent (Hardedge) * GIF: non-square ratio support * More enhancements Security and bug fixes: * Fixed Vulnerabilities * Broken Graphics Tablets with recent linuxwacom driver Read more: https://www.gimp.org/news/2023/11/07/gimp-2-10-36-released/ --- graphics/gimp-app/Makefile | 8 +++-- graphics/gimp-app/distinfo | 6 ++-- ...imptagcache_c => patch-app_core_gimptagcache.c} | 3 +- graphics/gimp-app/files/patch-configure | 10 +++--- graphics/gimp-app/files/patch-libgimp_gimp.c | 6 ++-- .../files/patch-plug-ins_common_file-jpegxl.c | 41 ---------------------- .../files/patch-plug-ins_pygimp_Makefile.in | 30 ++++++++-------- graphics/gimp-app/pkg-plist | 2 ++ 8 files changed, 34 insertions(+), 72 deletions(-) diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index f017a2627ea2..011c2896ece4 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -1,6 +1,6 @@ PORTNAME?= gimp -PORTVERSION= 2.10.34 -PORTREVISION= 12 +PORTVERSION= 2.10.36 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} @@ -45,7 +45,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes -USES+= compiler:c++14-lang cpe gettext gmake gnome jpeg libtool \ +USES+= cpe compiler:c++14-lang gettext gmake gnome jpeg libtool \ localbase pkgconfig shebangfix tar:bzip2 xorg CPE_VENDOR= gimp CPE_PRODUCT= gimp @@ -144,6 +144,8 @@ WMF_CONFIGURE_WITH= wmf .endif +.include + post-patch: @${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \ s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \ diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo index 3ff79eb56022..ccc648368da5 100644 --- a/graphics/gimp-app/distinfo +++ b/graphics/gimp-app/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677611111 -SHA256 (gimp-2.10.34.tar.bz2) = 84004642d351b398a4293cd7fd3592044a944f05bb52850ee6068f247c657aa3 -SIZE (gimp-2.10.34.tar.bz2) = 31405329 +TIMESTAMP = 1707563571 +SHA256 (gimp-2.10.36.tar.bz2) = 3d3bc3c69a4bdb3aea9ba2d5385ed98ea03953f3857aafd1d6976011ed7cdbb2 +SIZE (gimp-2.10.36.tar.bz2) = 31532334 diff --git a/graphics/gimp-app/files/patch-app_core_gimptagcache_c b/graphics/gimp-app/files/patch-app_core_gimptagcache.c similarity index 94% rename from graphics/gimp-app/files/patch-app_core_gimptagcache_c rename to graphics/gimp-app/files/patch-app_core_gimptagcache.c index 69da844b17a4..e390071f9fa7 100644 --- a/graphics/gimp-app/files/patch-app_core_gimptagcache_c +++ b/graphics/gimp-app/files/patch-app_core_gimptagcache.c @@ -1,5 +1,4 @@ -Index: app/core/gimptagcache.c ---- app/core/gimptagcache.c.orig +--- app/core/gimptagcache.c.orig 2023-11-05 23:49:04 UTC +++ app/core/gimptagcache.c @@ -397,8 +397,8 @@ gimp_tag_cache_save (GimpTagCache *cache) diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure index a5c08c91f121..d641b49a766a 100644 --- a/graphics/gimp-app/files/patch-configure +++ b/graphics/gimp-app/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig 2013-02-03 09:15:30.000000000 +0000 -+++ configure 2013-02-03 09:15:31.000000000 +0000 -@@ -23307,9 +23307,9 @@ - fi - +--- configure.orig 2023-11-05 23:51:29 UTC ++++ configure +@@ -34797,9 +34797,9 @@ esac + ;; + esac -gimpdatadir="$datadir/$PACKAGE/2.0" -gimpplugindir="$libdir/$PACKAGE/2.0" diff --git a/graphics/gimp-app/files/patch-libgimp_gimp.c b/graphics/gimp-app/files/patch-libgimp_gimp.c index cd695da587e1..04826609962c 100644 --- a/graphics/gimp-app/files/patch-libgimp_gimp.c +++ b/graphics/gimp-app/files/patch-libgimp_gimp.c @@ -1,7 +1,7 @@ Why is this patch needed? ---- libgimp/gimp.c.orig 2018-03-25 14:35:18.000000000 +0200 -+++ libgimp/gimp.c 2018-04-14 18:55:00.422346000 +0200 +--- libgimp/gimp.c.orig 2023-11-05 23:49:05 UTC ++++ libgimp/gimp.c @@ -28,6 +28,7 @@ #include #include @@ -10,7 +10,7 @@ Why is this patch needed? #ifdef HAVE_SYS_TIME_H #include -@@ -425,6 +426,9 @@ gimp_main (const GimpPlugInInfo *info, +@@ -450,6 +451,9 @@ gimp_main (const GimpPlugInInfo *info, gimp_env_init (TRUE); progname = argv[ARG_PROGNAME]; diff --git a/graphics/gimp-app/files/patch-plug-ins_common_file-jpegxl.c b/graphics/gimp-app/files/patch-plug-ins_common_file-jpegxl.c deleted file mode 100644 index 88442fda0428..000000000000 --- a/graphics/gimp-app/files/patch-plug-ins_common_file-jpegxl.c +++ /dev/null @@ -1,41 +0,0 @@ -https://gitlab.gnome.org/GNOME/gimp/-/commit/a4f02398188b - ---- plug-ins/common/file-jpegxl.c.orig 2023-02-21 19:56:19 UTC -+++ plug-ins/common/file-jpegxl.c -@@ -335,7 +335,10 @@ load_image (const gchar *filename, - result_size = channel_depth * pixel_format.num_channels - * (size_t) basicinfo.xsize * (size_t) basicinfo.ysize; - -- if (JxlDecoderGetColorAsEncodedProfile (decoder, &pixel_format, -+ if (JxlDecoderGetColorAsEncodedProfile (decoder, -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) -+ &pixel_format, -+#endif - JXL_COLOR_PROFILE_TARGET_DATA, - &color_encoding) == JXL_DEC_SUCCESS) - { -@@ -379,7 +382,10 @@ load_image (const gchar *filename, - - if (! profile) - { -- if (JxlDecoderGetICCProfileSize (decoder, &pixel_format, -+ if (JxlDecoderGetICCProfileSize (decoder, -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) -+ &pixel_format, -+#endif - JXL_COLOR_PROFILE_TARGET_DATA, - &icc_size) == JXL_DEC_SUCCESS) - { -@@ -387,7 +393,11 @@ load_image (const gchar *filename, - { - gpointer raw_icc_profile = g_malloc (icc_size); - -- if (JxlDecoderGetColorAsICCProfile (decoder, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, -+ if (JxlDecoderGetColorAsICCProfile (decoder, -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) -+ &pixel_format, -+#endif -+ JXL_COLOR_PROFILE_TARGET_DATA, - raw_icc_profile, icc_size) - == JXL_DEC_SUCCESS) - { diff --git a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in index e185c83ab9f4..62e85f99f16f 100644 --- a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in +++ b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in @@ -1,6 +1,6 @@ ---- plug-ins/pygimp/Makefile.in.orig 2018-08-19 18:48:46.000000000 +0200 -+++ plug-ins/pygimp/Makefile.in 2018-10-14 17:48:35.278550000 +0200 -@@ -140,7 +140,7 @@ am__installdirs = "$(DESTDIR)$(pygimpdir)" "$(DESTDIR) +--- plug-ins/pygimp/Makefile.in.orig 2023-11-05 23:51:28 UTC ++++ plug-ins/pygimp/Makefile.in +@@ -139,7 +139,7 @@ am__DEPENDENCIES_1 = "$(DESTDIR)$(pygimpdir)" LTLIBRARIES = $(pygimp_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -9,7 +9,7 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am__gimpenums_la_OBJECTS = gimpenumsmodule.lo -@@ -152,17 +152,16 @@ am__v_lt_1 = +@@ -151,17 +151,16 @@ _gimpenums_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $( _gimpenums_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(_gimpenums_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -31,7 +31,7 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_gimp_la_OBJECTS = gimpmodule.lo pygimp-item.lo pygimp-display.lo \ pygimp-drawable.lo pygimp-image.lo pygimp-parasite.lo \ -@@ -171,14 +170,14 @@ gimp_la_OBJECTS = $(am_gimp_la_OBJECTS) +@@ -170,14 +169,14 @@ gimp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIB gimp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(gimp_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -48,7 +48,7 @@ $(am__DEPENDENCIES_1) am_gimpthumb_la_OBJECTS = gimpthumbmodule.lo gimpthumb.lo gimpthumb_la_OBJECTS = $(am_gimpthumb_la_OBJECTS) -@@ -766,10 +765,7 @@ gimp_la_LDFLAGS = -module -avoid-version $(no_undefine +@@ -772,10 +771,7 @@ gimp_la_LIBADD = \ -export-symbols-regex initgimp gimp_la_LIBADD = \ @@ -56,31 +56,31 @@ - $(libgimpcolor) \ - $(libgimpbase) \ - $(libgimpui) \ -+ %%GIMP_UI_LIBS%% \ ++ \ $(GLIB_LIBS) \ $(GEGL_LIBS) \ $(PYLINK_LIBS) \ -@@ -782,9 +778,7 @@ _gimpenums_la_LDFLAGS = -module -avoid-version $(no_un +@@ -788,9 +784,7 @@ _gimpenums_la_LIBADD = \ -export-symbols-regex init_gimpenums _gimpenums_la_LIBADD = \ - $(libgimp) \ - $(libgimpcolor) \ - $(libgimpbase) \ -+ %%GIMP_LIBS%% \ ++ \ $(GLIB_LIBS) \ $(PYLINK_LIBS) \ $(RT_LIBS) -@@ -799,7 +793,7 @@ gimpcolor_la_LDFLAGS = -module -avoid-version $(no_und +@@ -805,7 +799,7 @@ gimpcolor_la_LIBADD = \ -export-symbols-regex initgimpcolor gimpcolor_la_LIBADD = \ - $(libgimpcolor) \ -+ %%GIMP_LIBS%% \ ++ \ $(GLIB_LIBS) \ $(PYLINK_LIBS) -@@ -811,13 +805,7 @@ _gimpui_la_LDFLAGS = -module -avoid-version $(no_undef +@@ -817,13 +811,7 @@ _gimpui_la_LIBADD = \ -export-symbols-regex init_gimpui _gimpui_la_LIBADD = \ @@ -91,16 +91,16 @@ - $(libgimp) \ - $(libgimpcolor) \ - $(libgimpbase) \ -+ %%GIMP_UI_LIBS%% \ ++ \ $(GTK_LIBS) \ $(PYLINK_LIBS) \ $(RT_LIBS) \ -@@ -831,7 +819,7 @@ gimpthumb_la_LDFLAGS = -module -avoid-version $(no_und +@@ -837,7 +825,7 @@ gimpthumb_la_LIBADD = \ -export-symbols-regex initgimpthumb gimpthumb_la_LIBADD = \ - $(libgimpthumb) \ -+ %%GIMP_THUMB_LIBS%% \ ++ \ $(GDK_PIXBUF_LIBS) \ $(PYLINK_LIBS) diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index ab232384657e..22e82127df33 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -4706,6 +4706,8 @@ share/applications/gimp.desktop %%DATADIR%%/themes/Dark/ui/gimp-handle-v.png %%DATADIR%%/themes/Dark/ui/gimp-line-h.png %%DATADIR%%/themes/Dark/ui/gimp-line-v.png +%%DATADIR%%/themes/Dark/ui/gimp-lock-button-active.png +%%DATADIR%%/themes/Dark/ui/gimp-lock-button-prelight.png %%DATADIR%%/themes/Dark/ui/gimp-menu-line-h.png %%DATADIR%%/themes/Dark/ui/gimp-tooltip-bg.png %%DATADIR%%/themes/Dark/ui/list_header-pressed.png