From nobody Tue Jun 14 13:44:06 2022 X-Original-To: dev-commits-ports-main@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 BA8F384206C; Tue, 14 Jun 2022 13:44:07 +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 4LMqRC14Kxz4Wmb; Tue, 14 Jun 2022 13:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655214247; 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=nu0VRjbiPheXGPhuz9lXqtWMHX3LrJWRXFZPI6tsXYU=; b=Yzc2azbb+6Rkgz6Ne8bbg15vxwPFJ5rip19FvlNgwqMuZ1xiY8wjTqud8bSXMwBKb1HmOj IlSUK0Z9BFL2MGi+iPimTle2KWR0alyfui3a4Xwq0GEd2r37yF4ZStSdtHodZIaZUjez3L GIz+ovjb8qbV24kglfFFhgpVHl4KEeSLXa7Ti7h8sPh/CUG6LnFg7HZTFlaV+Mv7eIXCGB m0k/wBwi+czDb4TTYKVtadnQyqHl/KOuF1b9fAKzG+GYTT9qd9xGPaRxTK/pua1gC0m6tC 4qpRzALSQ+uaKdS/8/TLRhmsTw2mJiwVEqmo4k+Ka+Q59fniWwhp4Mwtj+9RwA== 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 60B6630BC; Tue, 14 Jun 2022 13:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25EDi6rp095384; Tue, 14 Jun 2022 13:44:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25EDi6Qm095383; Tue, 14 Jun 2022 13:44:06 GMT (envelope-from git) Date: Tue, 14 Jun 2022 13:44:06 GMT Message-Id: <202206141344.25EDi6Qm095383@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: 23d61c9d1dee - main - graphics/gimp[-app]: update to 2.10.32 release List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 23d61c9d1dee6a3cb965d6aa68bcc4a3f6eedd58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655214247; 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=nu0VRjbiPheXGPhuz9lXqtWMHX3LrJWRXFZPI6tsXYU=; b=rXQpbXFshDNuF1eyuvjkfgIXmsECsHb7uB+ZVq9V/Fo2D97hl3N8+KGAN11+gtFQPJc+vE QbccVxvh7JdC8qMW/7DIgM+qifVWRLEEu1iALFEOm4vEpA3BpL4sfJXgogSJ5si8O3f2UD TjvvRfGeYVWduKv8l6ITo0Bg7qSw9LL1Id2PTg9V9m21VEY3Du+HafyAIs8pUEyAxFCmip VUU3v0cnIs426Or0wpoeYWFBA9l8yG+QiM9YdXeFHZZCNoUT8t1tM3EQZ4vnD2yUqHOJli QkS+m8WmH9sQ44qtXHeRvWPqY7A6gcYmAGgzCyPNH8UWfGf+v2hRCcr4WiEHYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655214247; a=rsa-sha256; cv=none; b=egzr/s6ldXbAxEOlxeMS9LMrvleZz+x5Wyev5owLL3/LLo1iH8hJoh0Gz11I+Imh79jXuL AKj8eAQVkjkQ/kf37nAWtsmlmJd4k0nX3isKmZYHoPoL7jG5oEqg3yFbaTKzZWbH4KDorn Xj+v0pUPYaz/tpcpoHPEQkbCwXjkG/QJ00elyiSEQpouhexoGcWtqabP/F17YhclpIJ9Ny BU5cy7pVyRGVb79DgppFCY56hwPMnpFgCWm0nem9vJGTWX0BUim8jq5q8wLNutFhAtHRAy 8lOjmgsDC6SwJ7Z94hC+4/8XOD04MBRiTntFTghLaJjpqgHfEI1MWLDeeA9AhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=23d61c9d1dee6a3cb965d6aa68bcc4a3f6eedd58 commit 23d61c9d1dee6a3cb965d6aa68bcc4a3f6eedd58 Author: Dima Panov AuthorDate: 2022-06-14 13:43:22 +0000 Commit: Dima Panov 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 \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