From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1439247-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 50352158095
for <garchives@archives.gentoo.org>; Sun, 25 Sep 2022 01:27:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 388BEE0B9D;
Sun, 25 Sep 2022 01:27:55 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1EC7BE0B9D
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Sep 2022 01:27:55 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3EA66340E8D
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Sep 2022 01:27:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AC6BE5C0
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Sep 2022 01:27:52 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1664069234.8aaa2563f26699b3c1564fb29e99e1d9ef2b122c.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/, media-gfx/gimp/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch media-gfx/gimp/gimp-2.99.12.ebuild
X-VCS-Directories: media-gfx/gimp/ media-gfx/gimp/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 8aaa2563f26699b3c1564fb29e99e1d9ef2b122c
X-VCS-Branch: master
Date: Sun, 25 Sep 2022 01:27:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 90cb5471-6beb-4f25-adeb-60bd9e8a518d
X-Archives-Hash: 9e99f217b77e2c3a29cd9242bec86cf7
commit: 8aaa2563f26699b3c1564fb29e99e1d9ef2b122c
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Sep 5 14:38:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 01:27:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aaa2563
media-gfx/gimp: 2.99.12 fix build against libheif-1.13
Thanks-to: Daniel Novomesky <dnovomesky <AT> gmail.com>
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/27155
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gimp-2.99.12_fix_libheif-1.13_build.patch | 78 ++++++++++++++++++++++
media-gfx/gimp/gimp-2.99.12.ebuild | 2 +
2 files changed, 80 insertions(+)
diff --git a/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
new file mode 100644
index 000000000000..672a9ef7217e
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
@@ -0,0 +1,78 @@
+Upstream issue: "GIMP fails to build with libheif >= 1.13.0"
+https://gitlab.gnome.org/GNOME/gimp/-/issues/8570
+
+From a61299ddb184babca015a846c72bf3e1a57faf2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
+Date: Sat, 3 Sep 2022 13:19:33 +0200
+Subject: [PATCH] plug-ins: fix builing with libheif 1.13.0+
+
+---
+ plug-ins/common/file-heif.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c
+index 76bc41f44d..36899bcf5f 100644
+--- a/plug-ins/common/file-heif.c
++++ b/plug-ins/common/file-heif.c
+@@ -56,24 +56,24 @@ typedef enum _HeifpluginExportFormat
+ HEIFPLUGIN_EXPORT_FORMAT_YUV420 = 3
+ } HeifpluginExportFormat;
+
+-typedef struct _Heif Heif;
+-typedef struct _HeifClass HeifClass;
++typedef struct _GimpHeif GimpHeif;
++typedef struct _GimpHeifClass GimpHeifClass;
+
+-struct _Heif
++struct _GimpHeif
+ {
+ GimpPlugIn parent_instance;
+ };
+
+-struct _HeifClass
++struct _GimpHeifClass
+ {
+ GimpPlugInClass parent_class;
+ };
+
+
+-#define HEIF_TYPE (heif_get_type ())
+-#define HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HEIF_TYPE, Heif))
++#define GIMP_HEIF_TYPE (gimp_heif_get_type ())
++#define GIMP_HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_HEIF_TYPE, GimpHeif))
+
+-GType heif_get_type (void) G_GNUC_CONST;
++GType gimp_heif_get_type (void) G_GNUC_CONST;
+
+ static GList * heif_init_procedures (GimpPlugIn *plug_in);
+ static GimpProcedure * heif_create_procedure (GimpPlugIn *plug_in,
+@@ -123,14 +123,14 @@ static gboolean save_dialog (GimpProcedure *procedure,
+ GimpImage *image);
+
+
+-G_DEFINE_TYPE (Heif, heif, GIMP_TYPE_PLUG_IN)
++G_DEFINE_TYPE (GimpHeif, gimp_heif, GIMP_TYPE_PLUG_IN)
+
+-GIMP_MAIN (HEIF_TYPE)
++GIMP_MAIN (GIMP_HEIF_TYPE)
+ DEFINE_STD_SET_I18N
+
+
+ static void
+-heif_class_init (HeifClass *klass)
++gimp_heif_class_init (GimpHeifClass *klass)
+ {
+ GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass);
+
+@@ -140,7 +140,7 @@ heif_class_init (HeifClass *klass)
+ }
+
+ static void
+-heif_init (Heif *heif)
++gimp_heif_init (GimpHeif *heif)
+ {
+ }
+
+--
+GitLab
+
diff --git a/media-gfx/gimp/gimp-2.99.12.ebuild b/media-gfx/gimp/gimp-2.99.12.ebuild
index 5a97b3f4724a..fc46f29d2a4a 100644
--- a/media-gfx/gimp/gimp-2.99.12.ebuild
+++ b/media-gfx/gimp/gimp-2.99.12.ebuild
@@ -111,6 +111,8 @@ BDEPEND="
DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
+PATCHES=( "${FILESDIR}/${P}_fix_libheif-1.13_build.patch" )
+
pkg_setup() {
use lua && lua-single_pkg_setup