From nobody Fri Dec 29 12:58:29 2023 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 4T1lmj5cF3z56489; Fri, 29 Dec 2023 12:58:29 +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 4T1lmj58PFz3YYf; Fri, 29 Dec 2023 12:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703854709; 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=pRvDF2Mbbz5KsDPEz/v/tNAdDtqWwFqA28srZtjptd0=; b=skyAMGIF2bOaCUwnyfeTG1w30VualL1fE84pE6E9Yqe4dMYyo1zXxzbwtY5nYmL/lJ/2oJ a7JiHHhOmD7q/ltvxdVVvZNgkpOgkhuxWytAKRLQXZLlGdyjcandNRFrprG/tPdvauB7d1 Tojx8AelnMlO7HVQbna8cY8qfYz7pPxzpCmwi/dVZZsjgjz9JO/TTXhtvssv9kADf5Dx0i cNnyf+WHKCMkASnCT9OyQWyCFKpS12fTs4WiYTupCz+L7WwguVS6RpT1ofxSaRmbOdTM6C FzuPSiCFzbgdr/tscO2TpNfk1dUVUKfeienjzltnpPMVXk3ds/KhnNAiVOhwMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703854709; a=rsa-sha256; cv=none; b=mS31iR6oeRXU25aabDLJVN/M4U0BJ05iUIZKbOG9G1YSPmuIXRaZt1MzgqG58Wa4byTWku 1C2OMtbqgi6UrCnz0k9qn96X+VLvY3U1REXp2h/UJ0T6wj6ZwoP4PUVV+wu4i/bZ4LxzdF tj3bkU4FHD5MxfEkZHKCHvzUgVg/h1tC5a4fgNaXRcQp9B/amyOJhpzTN/jPpBnJffwGgi Dh+vgU8gt4Zna5o9o8FsboeQJFdgOHKItI67vV3m7dIUnz2n9iJ5EfqjDavTpfnuwTy7vf F6zcSim2dCaKFcvaerGqfCgaqXeqr2Iqlj5vH8c7sOOWnjGkSBG8MPw10tUS/w== 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=1703854709; 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=pRvDF2Mbbz5KsDPEz/v/tNAdDtqWwFqA28srZtjptd0=; b=NeALfZCRdoD/tJHSmTjNJKvW5qm0CrmkTjjSNlYG+WtMeiHG+F1ndPcjoElfQo+5V2QHrr 0kH62XT+gssouzidYlLsinRMpUw4CLE7TuvK9dltQAF10IEr+3qtYEyqMQEskW39ETDH1h ZPXprrW8K/127hKqSfMzLuNqxpH1wCgeuOYJo/Py6BiscunQNHWwyamQwmwJQdHKMX+PlI soBFdIihKVbjHgtrSNUN/wyhdg0wuIxkov3NevFbtOeLF5mOwke+cjJn32W+cQaGHQIRVv gwI9ITw2QsLxotJEIJ2ALIxcWORxm7t+gyDRLr8AhbKk3T2EGiohNY9hnPJH2A== 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 4T1lmj4F3Tz16M5; Fri, 29 Dec 2023 12:58:29 +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 3BTCwTJW049857; Fri, 29 Dec 2023 12:58:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTCwTt2049854; Fri, 29 Dec 2023 12:58:29 GMT (envelope-from git) Date: Fri, 29 Dec 2023 12:58:29 GMT Message-Id: <202312291258.3BTCwTt2049854@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d53d9f30bbad - main - graphics/gthumb: switch to upstream fix after 11b08d733b7c 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d53d9f30bbadef3a546ef321b209d1f50f92edb1 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d53d9f30bbadef3a546ef321b209d1f50f92edb1 commit d53d9f30bbadef3a546ef321b209d1f50f92edb1 Author: Jan Beich AuthorDate: 2023-12-29 10:41:17 +0000 Commit: Jan Beich CommitDate: 2023-12-29 12:57:37 +0000 graphics/gthumb: switch to upstream fix after 11b08d733b7c --- graphics/gthumb/Makefile | 1 + graphics/gthumb/distinfo | 2 ++ ...-extensions_cairo__io_cairo-image-surface-jxl.c | 26 ---------------------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index a7554cd0bb38..a36be29574f2 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -7,6 +7,7 @@ DIST_SUBDIR= gnome PATCH_SITES= https://gitlab.gnome.org/GNOME/gthumb/-/commit/ PATCHFILES= 2133520496afd179702953a5d07aa99b5209f9cf.patch:-p1 #Fix build with libraw >= 0.21.0 +PATCHFILES+= 306d0eeca5ef.patch:-p1 # https://gitlab.gnome.org/GNOME/gthumb/-/issues/306 MAINTAINER= gnome@FreeBSD.org COMMENT= Image viewer and browser for the GNOME environment diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo index 84132352c484..4900f97a69f1 100644 --- a/graphics/gthumb/distinfo +++ b/graphics/gthumb/distinfo @@ -3,3 +3,5 @@ SHA256 (gnome/gthumb-3.12.2.tar.xz) = 97f8afe522535216541ebbf1e3b546d12a6beb38a8 SIZE (gnome/gthumb-3.12.2.tar.xz) = 7585700 SHA256 (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 96c82ad7390d3c39e421f1e0e6b129492f07dc9239d54791ed41713659dd496a SIZE (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 2358 +SHA256 (gnome/306d0eeca5ef.patch) = db219738ed0c6349c9c60fee0df4d05b50304fbea5018aa145f9286840676b64 +SIZE (gnome/306d0eeca5ef.patch) = 2011 diff --git a/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c b/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c deleted file mode 100644 index 02ff064ccc9a..000000000000 --- a/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c +++ /dev/null @@ -1,26 +0,0 @@ -https://gitlab.gnome.org/GNOME/gthumb/-/issues/306 - ---- extensions/cairo_io/cairo-image-surface-jxl.c.orig 2022-04-03 18:38:59 UTC -+++ extensions/cairo_io/cairo-image-surface-jxl.c -@@ -234,18 +234,18 @@ _cairo_image_surface_create_from_jxl(GInputStream *is - - 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, 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, 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, JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) { - g_message("Could not get ICC profile.\n"); - g_free(profile_data); - break;